GNOME.org
 

ooo-build r13523 - in trunk: . bin/piece doc patches/dev300 scratch/split

Author: michael
Date: Mon Aug 11 21:43:19 2008
New Revision: 13523
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13523&view=rev

Log:
2008-08-11  Michael Meeks  <michael meeks novell com>

        * patches/dev300/piece-postprocess.diff,
        * patches/dev300/piece-packimages.diff,
        * patches/dev300/apply: fix up the last modules.



Added:
   trunk/patches/dev300/piece-packimages.diff
   trunk/patches/dev300/piece-postprocess.diff
   trunk/scratch/split/ant   (contents, props changed)
   trunk/scratch/split/ooo3.spec
Modified:
   trunk/ChangeLog
   trunk/bin/piece/install-generic
   trunk/doc/split.txt
   trunk/patches/dev300/apply
   trunk/scratch/split/rpmbuild

Modified: trunk/bin/piece/install-generic
==============================================================================
--- trunk/bin/piece/install-generic	(original)
+++ trunk/bin/piece/install-generic	Mon Aug 11 21:43:19 2008
@@ -41,6 +41,7 @@
 DEST="$DESTDIR$OO_SOLVERDIR"
 echo "Copy / install remaining devel pieces ..."
 filelist="$DESTDIR/all_filelist.txt"
+touch $filelist
 $OO_TOOLSDIR/piece/copyexcept -x $filelist $SRCDIR/* $DEST
 rm -f $filelist
 

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Mon Aug 11 21:43:19 2008
@@ -313,3 +313,22 @@
 
 find BUILD/dev300-m25-filters -name 'build.xml'
 
+
+* Final missing pieces:
+	+ services.rdb
+		+ needed *both* basis3.0 and ure ...
+		+ can we hack the installer, to build one services.rdb
+		  per module ? [ might be easier ! ].
+	+ need images & themes:
+		+ built / installed from postprocess [!] ...
+
+* FIXME:
+	+ split Makefile.shared image installation out
+	  into custom scripts to do that - per piece...
+		+ we have src/ installed anyway ...
+
+	+ done in the cleanup section ?
+		+ packimages [etc.]
+
+
+

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Aug 11 21:43:19 2008
@@ -2443,6 +2443,10 @@
 piece-forms.diff
 piece-reportdesign.diff
 piece-sc.diff
+piece-xmerge.diff
+piece-postprocess.diff
+piece-packimages.diff
+
 
 [ BFFixes ]
 fit-list-to-size-binfilter.diff, thorsten

Added: trunk/patches/dev300/piece-packimages.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-packimages.diff	Mon Aug 11 21:43:19 2008
@@ -0,0 +1,55 @@
+--- packimages/pack/makefile.mk
++++ packimages/pack/makefile.mk
+@@ -38,16 +38,17 @@
+ RSCCUSTOMIMG*=$(PRJ)
+ .INCLUDE: target.mk
+ 
++IMGSRC=$(SOLARVER)
+ IMAGES := $(COMMONBIN)$/images.zip
+ SORTED_LIST=$(RES)$/img$/sorted.lst
+ # Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially
+ CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango classic
+ CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
+-CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango
+-CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
++CUSTOM_PREFERRED_FALLBACK_1*=-c $(IMGSRC)$/ooo_custom_images$/tango
++CUSTOM_PREFERRED_FALLBACK_2*=-c $(IMGSRC)$/ooo_custom_images$/industrial
+ 
+-CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz
+-CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
++CRYSTAL_TARBALL=$(IMGSRC)$/external_images$/ooo_crystal_images-1.tar.gz
++CLASSIC_TARBALL=$(IMGSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
+ 
+ ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip
+ 
+@@ -61,17 +62,17 @@
+ 	@@-$(MKDIR) $(RES)$/img
+ #+-$(RM) $@ $  $(INPATH)
+ .IF "$(use_shell)"!="4nt"
+-	$(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(SOLARSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $  $(INPATH)
++	$(FIND) $(IMGSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(IMGSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $  $(INPATH)
+ .ELSE			# "$(use_shell)"!="4nt"
+-	$(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s/$(SOLARSRC:s/\/./).$(RSCDEFIMG)\/res/%%GLOBALRES%%/" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $  $(INPATH)
++	$(FIND) $(IMGSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s/$(IMGSRC:s/\/./).$(RSCDEFIMG)\/res/%%GLOBALRES%%/" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $  $(INPATH)
+ .ENDIF			# "$(use_shell)"!="4nt"
+ 	$(PERL) $(SOLARENV)$/bin$/diffmv.pl $  $(INPATH) $@
+ 
+ $(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst
+-	$(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@
++	$(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(IMGSRC)$/$(RSCDEFIMG) -m $(IMGSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@
+ 
+ images_% : $(RES)$/img$/commandimagelist.ilst
+-	$(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SOLARSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$  zip
++	$(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(IMGSRC)$/$(RSCDEFIMG) -m $(IMGSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(IMGSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$  zip
+ 
+ # make sure to have one to keep packing happy
+ $(COMMONBIN)$/images_brand.zip:
+@@ -79,7 +80,7 @@
+ 
+ # generate the HiContrast icon set
+ $(MISC)$/hicontrast.flag .PHONY :
+-	$(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(SOLARSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@
++	$(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(IMGSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@
+ 
+ # unpack the Crystal icon set
+ $(MISC)$/crystal.flag : $(CRYSTAL_TARBALL)

Added: trunk/patches/dev300/piece-postprocess.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-postprocess.diff	Mon Aug 11 21:43:19 2008
@@ -0,0 +1,11 @@
+--- postprocess/prj/build.lst	2008-08-11 22:23:25.000000000 +0100
++++ postprocess/prj/build.lst	2008-08-11 22:23:25.000000000 +0100
+@@ -1,7 +1,6 @@
+ po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTDESIGN:reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
+ po	postprocess			    	usr1	-	all	po_mkout NULL
+ po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
+-po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
+ po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
+-po	postprocess\rebase	    	nmake	-	w	po_rebase po_checkdlv NULL
++po	postprocess\rebase	    	nmake	-	w	po_rebase NULL
+ po	postprocess\signing	    	nmake	-	w,sign	po_signing po_rebase.w NULL

Added: trunk/scratch/split/ant
==============================================================================
--- (empty file)
+++ trunk/scratch/split/ant	Mon Aug 11 21:43:19 2008
@@ -0,0 +1,11 @@
+#!/usr/bin/perl -pi.bak
+
+s|\$\{solar.jar\}/juh.jar|\$\{split.ure\}/share/java/juh.jar|g;
+s|\$\{solar.jar\}/ridl.jar|\$\{split.ure\}/share/java/ridl.jar|g;
+s|\$\{solar.jar\}/jurt.jar|\$\{split.ure\}/share/java/jurt.jar|g;
+
+s|\$\{solar.jar\}/jaxp.jar|\$\{split.dev\}/bin/jaxp.jar|g;
+s|\$\{solar.jar\}/parser.jar|\$\{split.dev\}/bin/parser.jar|g;
+
+s|\$\{solar.jar\}/unoil.jar|\$\{split.install\}/classes/unoil.jar|g;
+s|\$\{solar.jar\}/sandbox.jar|\$\{split.install\}/classes/sandbox.jar|g;

Added: trunk/scratch/split/ooo3.spec
==============================================================================
--- (empty file)
+++ trunk/scratch/split/ooo3.spec	Mon Aug 11 21:43:19 2008
@@ -0,0 +1,64 @@
+#
+# spec file for package OpenOffice_org (Version 2.4.1.7)
+#
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
+%define         distro     SUSE
+%define         piece      postprocess
+Name:           ooo3
+Requires:       ooo3_libs_core ooo3_ure ooo3_libs_gui ooo3_l10n
+BuildRequires:  ooo3_bootstrap ooo3_base ooo3_bootstrap ooo3_calc ooo3_components ooo3_impress ooo3_l10n ooo3_libs_core ooo3_libs_extern ooo3_libs_gui ooo3_ure ooo3_writer ooo3_filters
+%define	      ooo_prefix	%_libdir
+%define	      ooo_home		ooo-3
+%define	      ooo_build_tag     ooo300-m1
+License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
+Group:          Productivity/Office/Suite
+Version:        3
+Release:        8
+AutoReqProv:    on
+Summary:        A Free Office Suite (Framework)
+Url:            http://www.openoffice.org/
+Source:         %ooo_build_tag-%piece.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+ure
+
+%prep
+%setup -q -n %ooo_build_tag-%piece
+
+%build
+
+# setup env.
+export OO_INSTDIR=%{_libdir}/%ooo_home
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+export VERBOSE=1
+export EXTRA_BUILD_FLAGS=%{?jobs:-P%jobs}
+export EXTRA_DMAKE_FLAGS="%{?jobs:-- -P%jobs}"
+$OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %distro
+
+%install
+
+# setup env.
+export OO_INSTDIR=%{_libdir}/%ooo_home
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+export DESTDIR=$RPM_BUILD_ROOT
+
+$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag %distro
+
+%clean
+%post
+
+%files
+%defattr(-,root,root)
+%dir %ooo_prefix/%ooo_home/basis3.0
+%ooo_prefix/%ooo_home/basis3.0/*
+
+%changelog

Modified: trunk/scratch/split/rpmbuild
==============================================================================
--- trunk/scratch/split/rpmbuild	(original)
+++ trunk/scratch/split/rpmbuild	Mon Aug 11 21:43:19 2008
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export PATH="/opt/icecream/bin:$PATH"
-modules="bootstrap ure libs_extern artwork libs_gui libs_core components l10n impress writer calc base filters"
+modules="bootstrap ure libs_extern artwork libs_gui libs_core components l10n impress writer calc base filters %%"
 if test "z$1" != "z"; then
    buildfrom=$1
    modules=`echo $modules | sed s/.*$buildfrom/$buildfrom/`;
@@ -14,10 +14,15 @@
 verstr=3-8
 cd /usr/src/packages
 for module in $modules; do
-    sudo bash -l -c "/usr/bin/rpmbuild --eval '%define jobs 8' -ba SPECS/ooo3_$module.spec" || exit 1
+    if test "$module" == "%%"; then
+	suffix=""
+    else
+	suffix="_$module"
+    fi
+    sudo bash -l -c "/usr/bin/rpmbuild --eval '%define jobs 8' -ba SPECS/ooo3$suffix.spec" || exit 1
     echo "Installing $module RPM(s)"
-    sudo rpm -U --force RPMS/i586/ooo3_$module-$verstr.i586.rpm || exit 1
-    if test -f RPMS/i586/ooo3_$module-devel-$verstr.i586.rpm; then
-        sudo rpm -U --force RPMS/i586/ooo3_$module-devel-$verstr.i586.rpm || exit 1
+    sudo rpm -U --force RPMS/i586/ooo3$suffix-$verstr.i586.rpm || exit 1
+    if test -f RPMS/i586/ooo3$suffix-devel-$verstr.i586.rpm; then
+        sudo rpm -U --force RPMS/i586/ooo3$suffix-devel-$verstr.i586.rpm || exit 1
     fi
 done
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]