ooo-build r13194 - in trunk: bin/piece patches/dev300 scratch/split

[michael svn gnome org]

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

Log:
more work ...


Added:
   trunk/bin/piece/env-libs_gui
Removed:
   trunk/bin/piece/build-libs_gui
   trunk/bin/piece/install-libs_gui
Modified:
   trunk/bin/piece/build-generic
   trunk/bin/piece/sys-setup
   trunk/patches/dev300/piece-target.diff
   trunk/scratch/split/ooo3_libs_extern.spec
   trunk/scratch/split/ooo3_libs_gui.spec
   trunk/scratch/split/ooo3_ure.spec

Modified: trunk/bin/piece/build-generic
==============================================================================
--- trunk/bin/piece/build-generic	(original)
+++ trunk/bin/piece/build-generic	Mon Jul 14 12:26:02 2008
@@ -1,2 +1,8 @@
+custom_env="$OO_TOOLSDIR/piece/env-$1"
+if test -f $custom_env; then
+   source $custom_env
+   echo "merged custom environment: $custom_env"
+fi
+
 dirs=`/bin/ls | grep -v 'applied_patches' | tr '\n' ':'`
 perl $SOLARENV/bin/build.pl --subdirs:$dirs $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;

Added: trunk/bin/piece/env-libs_gui
==============================================================================
--- (empty file)
+++ trunk/bin/piece/env-libs_gui	Mon Jul 14 12:26:02 2008
@@ -0,0 +1,2 @@
+# psprint needs to link to vcl's main .so ...
+export STDOBJVCL=$SOLARPIECE/$INPATH/lib/salmain.o

Modified: trunk/bin/piece/sys-setup
==============================================================================
--- trunk/bin/piece/sys-setup	(original)
+++ trunk/bin/piece/sys-setup	Mon Jul 14 12:26:02 2008
@@ -34,7 +34,7 @@
 export UNOINCLUDES="$DEV_DIR/inc/offuh"
 
 export LD_LIBRARY_PATH=".:$DEV_DIR/lib:$URE_DIR/lib:$INSTALL_DIR:$SOLARPIECE/$INPATH/lib:$SOLARENV/$INPATH/lib:$JAVA_HOME/jre/lib/i386:$JAVA_HOME/jre/lib/i386/xawt:$JAVA_HOME/jre/lib/i386/client:$JAVA_HOME/jre/lib/i386/native_threads:../lib:$SOLARVER/$INPATH/lib:/opt/OpenOffice/HEAD/build/lib:/opt/mozilla/lib:"
-export PATH="$SOLARPIECE/bin:$URE_DIR/bin:$JAVA_HOME/bin:.:$SOLARVER/$INPATH/bin:$SOLARENV/$OUTPATH/bin:$SOLARENV/bin:$PRESERVE_PATH"
+export PATH="$SOLARPIECE/$INPATH/bin:$URE_DIR/bin:$JAVA_HOME/bin:.:$SOLARVER/$INPATH/bin:$SOLARENV/$OUTPATH/bin:$SOLARENV/bin:$PRESERVE_PATH"
 SOLARINC=" -I. -I$SOLARVER/$INPATH/inc/stl -I$SOLARVER/$INPATH/inc/external -I$SOLARVER/$INPATH/inc -I$SOLARENV/$OUTPATH/inc -I$DEV_DIR/inc -I$SOLARENV/inc -I$SRC_ROOT/res -I$SOLARENV/inc/Xp31"
 SOLARINC="$SOLARINC -I$SOLARPIECE/$INPATH/inc/stl -I$SOLARPIECE/$INPATH/inc/external -I$SOLARPIECE/$INPATH/inc -I$SOLARPIECE/$OUTPATH/inc"
 SOLARINC="$SOLARINC -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -I$JAVA_HOME/include/native_threads/include -I/usr/include"

Modified: trunk/patches/dev300/piece-target.diff
==============================================================================
--- trunk/patches/dev300/piece-target.diff	(original)
+++ trunk/patches/dev300/piece-target.diff	Mon Jul 14 12:26:02 2008
@@ -14,3 +14,14 @@
  .ENDIF			# "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
  SOLARINC+=$(JDKINCS)
  # make sure INCLUDE isn't set
+--- solenv/inc/unxlngi6.mk
++++ solenv/inc/unxlngi6.mk
+@@ -182,7 +182,7 @@
+ STDLIBCPP=-lstdc++
+ 
+ # default objectfilenames to link
+-STDOBJVCL=$(L)$/salmain.o
++STDOBJVCL*=$(L)$/salmain.o
+ STDOBJGUI=
+ STDSLOGUI=
+ STDOBJCUI=

Modified: trunk/scratch/split/ooo3_libs_extern.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_extern.spec	(original)
+++ trunk/scratch/split/ooo3_libs_extern.spec	Mon Jul 14 12:26:02 2008
@@ -52,7 +52,7 @@
 
 $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-generic
+$OO_TOOLSDIR/piece/build-generic %piece
 
 %install
 
@@ -63,7 +63,7 @@
 export DESTDIR=$RPM_BUILD_ROOT
 
 source $OO_TOOLSDIR/piece/sys-setup
-$OO_TOOLSDIR/piece/install-generic
+$OO_TOOLSDIR/piece/install-generic %piece
 
 %clean
 %post

Modified: trunk/scratch/split/ooo3_libs_gui.spec
==============================================================================
--- trunk/scratch/split/ooo3_libs_gui.spec	(original)
+++ trunk/scratch/split/ooo3_libs_gui.spec	Mon Jul 14 12:26:02 2008
@@ -54,7 +54,8 @@
 source $OO_TOOLSDIR/piece/sys-setup
 
 export VERBOSE=1
-$OO_TOOLSDIR/piece/build-generic
+# export EXTRA_BUILD_FLAGS="-P2"
+$OO_TOOLSDIR/piece/build-generic %piece
 
 %install
 
@@ -65,7 +66,7 @@
 export DESTDIR=$RPM_BUILD_ROOT
 
 source $OO_TOOLSDIR/piece/sys-setup
-$OO_TOOLSDIR/piece/install-generic
+$OO_TOOLSDIR/piece/install-generic %piece
 
 %clean
 %post

Modified: trunk/scratch/split/ooo3_ure.spec
==============================================================================
--- trunk/scratch/split/ooo3_ure.spec	(original)
+++ trunk/scratch/split/ooo3_ure.spec	Mon Jul 14 12:26:02 2008
@@ -52,7 +52,7 @@
 
 $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-generic
+$OO_TOOLSDIR/piece/build-generic %piece
 
 %install
 
@@ -63,7 +63,7 @@
 export DESTDIR=$RPM_BUILD_ROOT
 
 source $OO_TOOLSDIR/piece/sys-setup
-$OO_TOOLSDIR/piece/install-generic
+$OO_TOOLSDIR/piece/install-generic %piece
 
 %clean
 %post