GNOME.org
 

ooo-build r13202 - in trunk: doc patches/dev300 scratch/split

Author: michael
Date: Mon Jul 14 16:56:26 2008
New Revision: 13202
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13202&view=rev

Log:
more piece-ing work ...


Added:
   trunk/patches/dev300/piece-basic.diff
   trunk/patches/dev300/piece-desktop.diff
   trunk/patches/dev300/piece-scripting.diff
   trunk/patches/dev300/piece-svx.diff
Modified:
   trunk/doc/split.txt
   trunk/patches/dev300/apply
   trunk/patches/dev300/piece-target.diff
   trunk/scratch/split/ooo3_libs_core.spec

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Mon Jul 14 16:56:26 2008
@@ -241,9 +241,11 @@
 
 Build order:
 	+ bootstrap
-	+ ure | libs-extern
+	+ ure | libs_extern
+	+ libs_gui
+	+ 
+
 	+ artwork
-	+ libs-gui
 
 
 build.pl:

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul 14 16:56:26 2008
@@ -2461,6 +2461,10 @@
 piece-target.diff
 piece-rsc.diff
 piece-startup.diff
+piece-basic.diff
+piece-svx.diff
+# zipintro is not kind to us ...
+piece-desktop.diff
 
 [ BFFixes ]
 fit-list-to-size-binfilter.diff, thorsten

Added: trunk/patches/dev300/piece-basic.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-basic.diff	Mon Jul 14 16:56:26 2008
@@ -0,0 +1,14 @@
+--- /usr/src/packages/BUILD/dev300-m21-libs_core/basic/source/classes/makefile.mk	2008-07-14 15:27:47.000000000 +0100
++++ /tmp/makefile.mk	2008-07-14 15:26:21.000000000 +0100
+@@ -45,9 +45,8 @@
+         $(MISC)$/$(TARGET).don \
+         $(SLOTARGET)
+ 
+-OOVBADIR=$(SOLARPIECE)$/$(INPATH)$/bin
+-$(MISC)$/$(TARGET).don : $(OOVBADIR)$/oovbaapi.rdb
+-        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(OOVBADIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
++$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
++        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+         echo $@
+ 
+ # --- Allgemein -----------------------------------------------------------

Added: trunk/patches/dev300/piece-desktop.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-desktop.diff	Mon Jul 14 16:56:26 2008
@@ -0,0 +1,7 @@
+--- desktop/prj/build.lst
++++ desktop/prj/build.lst
+@@ -37,4 +37,3 @@
+ dt	desktop\source\deployment\registry\executable		nmake	-	all	dt_dp_registry_executable dt_inc NULL
+ dt	desktop\scripts 						nmake	-	u	dt_scripts dt_inc NULL
+ dt	desktop\util							nmake	-	all	dt_util dt_app dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_migr NULL
+-dt	desktop\zipintro							nmake	-	all	dt_zipintro NULL

Added: trunk/patches/dev300/piece-scripting.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-scripting.diff	Mon Jul 14 16:56:26 2008
@@ -0,0 +1,14 @@
+--- scripting/source/vbaevents/makefile.mk
++++ scripting/source/vbaevents/makefile.mk
+@@ -23,8 +23,9 @@
+         $(MISC)$/$(TARGET).don \
+         $(SLOTARGET)
+ 
+-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
+-        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
++OOVBADIR=$(SOLARPIECE)$/$(INPATH)$/bin
++$(MISC)$/$(TARGET).don : $(OOVBADIR)$/oovbaapi.rdb
++        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(OOVBADIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+         echo $@
+ # ------------------------------------------------------------------
+ 

Added: trunk/patches/dev300/piece-svx.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-svx.diff	Mon Jul 14 16:56:26 2008
@@ -0,0 +1,36 @@
+--- svx/sdi/makefile.mk
++++ svx/sdi/makefile.mk
+@@ -48,7 +48,7 @@
+         svxitems.sdi \
+ 	fmslots.sdi \
+ 	svx.sdi	\
+-	$(SOLARPIECE)$/$(INPATH)$/inc$/sfxslots.ilb	\
++	$(SOLARINCXDIR)$/sfxslots.ilb	\
+ 	xoitems.sdi \
+ 	svxitems.sdi
+ 
+--- /svx/util/makefile.mk
++++ /svx/util/makefile.mk
+@@ -206,7 +206,7 @@
+                 $(SRS)$/svxlink.srs \
+                 $(SRS)$/accessibility.srs \
+                 $(SRS)$/toolbars.srs \
+-                $(SOLARCOMMONRESDIR)$/sfx.srs
++		$(SOLARPIECE)$/$(INPATH)$/res$/sfx.srs
+ 
+ RESLIB1NAME=svx
+ RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/svdraw
+
+--- svx/source/src/makefile.mk
++++ svx/source/src/makefile.mk
+@@ -44,8 +44,8 @@
+ RES1FILELIST=\
+ 	$(SRS)$/app.srs \
+ 	$(SOLARCOMMONRESDIR)$/svtools.srs \
+-	$(SOLARCOMMONRESDIR)$/sfx.srs 	\
+-	$(SOLARCOMMONRESDIR)$/basic.srs
++	$(SOLARPIECE)$/$(INPATH)$/res$/sfx.srs \
++	$(SOLARPIECE)$/$(INPATH)$/res$/basic.srs
+ 
+ RESLIB1NAME=$(TARGET)
+ RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/src

Modified: trunk/patches/dev300/piece-target.diff
==============================================================================
--- trunk/patches/dev300/piece-target.diff	(original)
+++ trunk/patches/dev300/piece-target.diff	Mon Jul 14 16:56:26 2008
@@ -25,3 +25,11 @@
  STDOBJGUI=
  STDSLOGUI=
  STDOBJCUI=
+@@ -218,6 +218,7 @@
+ LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)$/$i)
+ NEWCLASS:=$(LOCALJARS)
+ NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARBINDIR)$/$i $(NULL)))
++NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARPIECE)$/$(INPATH)$/bin/$i $(NULL)))
+ .ENDIF			# "$(JARFILES)"!=""
+ .IF "$(EXTRAJARFILES)"!=""
+ NEWCLASS+=$(foreach,i,$(EXTRAJARFILES) $(COMMON_BUILD_TOOLS)$/$i)

Modified: trunk/scratch/split/ooo3_libs_core.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_core.spec	(original)
+++ trunk/scratch/split/ooo3_libs_core.spec	Mon Jul 14 16:56:26 2008
@@ -12,7 +12,8 @@
 
 %define         piece      libs_core
 Name:           ooo3_%piece
-BuildRequires:  ooo3_bootstrap-devel
+Requires:       ooo3_libs_gui
+BuildRequires:  ooo3_libs_gui-devel
 %define	      ooo_prefix	%_libdir
 %define	      ooo_home		ooo-3
 %define	      ooo_build_tag     dev300-m21
@@ -30,6 +31,7 @@
 ure
 
 %package devel
+Requires:       ooo3_ure-devel ooo3_libs_extern-devel
 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
 Summary:        A Free Office Suite (Framework)
 Group:          Productivity/Office/Suite
@@ -50,7 +52,10 @@
 
 $OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces --tag=%ooo_build_tag --distro=SUSE --distro=Piece `pwd` 
 source $OO_TOOLSDIR/piece/sys-setup
-$OO_TOOLSDIR/piece/build-%piece
+
+export VERBOSE=1
+# export EXTRA_BUILD_FLAGS="-P2"
+$OO_TOOLSDIR/piece/build-generic %piece
 
 %install
 
@@ -61,7 +66,7 @@
 export DESTDIR=$RPM_BUILD_ROOT
 
 source $OO_TOOLSDIR/piece/sys-setup
-$OO_TOOLSDIR/piece/install-%piece
+$OO_TOOLSDIR/piece/install-generic %piece
 
 %clean
 %post
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]