ooo-build r13744 - in trunk: . bin/piece patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Mon Sep  1 14:58:30 2008
New Revision: 13744
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13744&view=rev

Log:
2008-09-01  Petr Mladek  <pmladek suse cz>

	* patches/dev300/piece-target.diff: update for x86_64, ppc, and s390

	* bin/piece/install-generic: fix some more permissions; allow
	  to call peice-specific post-inst-<piece> scripts
	* bin/piece/post-inst-components, bin/piece/Makefile.am:
	  remove the duplicated setup_native/source/packinfo to avoid
	  conflists with bootstrap
	
	* bin/piece/sys-setup.in: add also the LD_LIBRARY_PATH and SOLARLIB
	  from the upstream profile; they include correct (arch-independent)
	  java paths

	* bin/piece/build-generic: do not try to start build inside solver;
	  it does not include sources ;-)



Added:
   trunk/bin/piece/post-inst-components   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/bin/piece/Makefile.am
   trunk/bin/piece/build-generic
   trunk/bin/piece/install-generic
   trunk/bin/piece/sys-setup.in
   trunk/patches/dev300/piece-target.diff

Modified: trunk/bin/piece/Makefile.am
==============================================================================
--- trunk/bin/piece/Makefile.am	(original)
+++ trunk/bin/piece/Makefile.am	Mon Sep  1 14:58:30 2008
@@ -7,4 +7,5 @@
 	install-bootstrap \
 	${wildcard env-*} \
 	${wildcard build-*} \
-	${wildcard inst-*}
+	${wildcard inst-*} \
+	${wildcard post-inst-*}

Modified: trunk/bin/piece/build-generic
==============================================================================
--- trunk/bin/piece/build-generic	(original)
+++ trunk/bin/piece/build-generic	Mon Sep  1 14:58:30 2008
@@ -27,5 +27,5 @@
 	--distro=System --distro=Sdk --distro=swext \
 	 `pwd` || exit 1;
 
-dirs=`/bin/ls | grep -v 'applied_patches' | tr '\n' ':'`
+dirs=`/bin/ls | grep -v -e 'applied_patches' -e 'solver'  | tr '\n' ':'`
 perl $SOLARENV/bin/build.pl --subdirs:$dirs $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;

Modified: trunk/bin/piece/install-generic
==============================================================================
--- trunk/bin/piece/install-generic	(original)
+++ trunk/bin/piece/install-generic	Mon Sep  1 14:58:30 2008
@@ -44,3 +44,14 @@
 $OO_TOOLSDIR/piece/copyexcept -x $filelist $SRCDIR/* $DEST
 rm -f $filelist
 
+find $DEST -depth -name "CVS" -type d -exec rm -rf {} \;
+find $DEST -name "*.orig" -exec rm -rf {} \;
+find $DEST -type f -exec chmod go-w {} \;
+find $DEST -name "*.h" -exec chmod a-x {} \;
+
+# custom post install stuff
+custom_post_install="$OO_TOOLSDIR/piece/post-inst-$piece"
+echo test -f $custom_post_install
+if test -f $custom_post_install; then
+    $custom_post_install $piece $ooo_build_tag $DISTRO
+fi

Added: trunk/bin/piece/post-inst-components
==============================================================================
--- (empty file)
+++ trunk/bin/piece/post-inst-components	Mon Sep  1 14:58:30 2008
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+piece=$1
+ooo_build_tag=$2
+
+source $OO_TOOLSDIR/piece/sys-setup
+
+# remove bits from setup_native/source/packinfo to avoid
+# conflists with bootstrap
+
+DEST="$DESTDIR$OO_SOLVERDIR"
+
+echo "Removing duplicated packinfo..."
+for file in `ls $SRC_ROOT/setup_native/source/packinfo | grep -v CVS` ; do
+    rm -f $DEST/bin/$file
+done

Modified: trunk/bin/piece/sys-setup.in
==============================================================================
--- trunk/bin/piece/sys-setup.in	(original)
+++ trunk/bin/piece/sys-setup.in	Mon Sep  1 14:58:30 2008
@@ -51,15 +51,18 @@
 export DMAKEROOT="$SOLARENVINC/startup"
 export UNOINCLUDES="-I$DEV_DIR/inc/offuh -I$SOLARPIECE/$INPATH/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/lib:/opt/OpenOffice/HEAD/build/lib:/opt/mozilla/lib:"
+# FIXME: the older LD_LIBRARY_PATH is necessary to build bean module; it adds the Java paths detected by config_office/configure
+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/lib:/opt/OpenOffice/HEAD/build/lib:/opt/mozilla/lib:$LD_LIBRARY_PATH"
 export PATH="$SOLARPIECE/$INPATH/bin:$URE_DIR/bin:$JAVA_HOME/bin:.:$SOLARVER/bin:$SOLARENV/$OUTPATH/bin:$SOLARENV/bin:$PRESERVE_PATH"
 SOLARINC=" -I. -I$SOLARVER/inc/stl -I$SOLARVER/inc/external -I$SOLARVER/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"
 
+SOLARLIB_SYSTEM="$SOLARLIB" # FIXME: this is necessary to build bean module; it adds the Java paths detected by config_office/configure
 SOLARLIB=" -L../lib -L$SOLARPIECE/$INPATH/lib -L$SOLARENV/$OUTPATH/lib -L$SOLARENV/$OUTPATH/lib"
 SOLARLIB="$SOLARLIB -L$URE_DIR/lib -L$INSTALL_DIR "
 SOLARLIB="$SOLARLIB -L$JAVA_HOME/lib -L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client -L$JAVA_HOME/jre/lib/i386/native_threads -L/usr/lib -L/usr/lib/xulrunner-1.9"
 SOLARLIB="$SOLARLIB -L$SOLARVER/lib" # NB. at the end - it has static libraries in there we don't prefer.
+SOLARLIB="$SOLARLIB $SOLARLIB_SYSTEM"
 export SOLARLIB SOLARINC
 export SOLARIDLINC="-I$SOLARVERSION/$INPATH/idl$EXT_UPDMINOR -I$SOLARPIECE/$INPATH/idl$EXT_UPDMINOR"

Modified: trunk/patches/dev300/piece-target.diff
==============================================================================
--- trunk/patches/dev300/piece-target.diff	(original)
+++ trunk/patches/dev300/piece-target.diff	Mon Sep  1 14:58:30 2008
@@ -49,6 +49,39 @@
  STDSLOGUI=
  STDOBJCUI=
 
+--- solenv/inc/unxlngppc4.mk.old	2008-08-29 18:53:19.000000000 +0200
++++ solenv/inc/unxlngppc4.mk	2008-08-30 10:28:17.000000000 +0200
+@@ -168,7 +168,7 @@ SONAME_SWITCH=-Wl,-h
+ STDLIBCPP=-lstdc++
+ 
+ # default objectfilenames to link
+-STDOBJVCL=$(L)$/salmain.o
++STDOBJVCL*=$(L)$/salmain.o
+ STDOBJGUI=
+ STDSLOGUI=
+ STDOBJCUI=
+--- solenv/inc/unxlngs3904.mk.old	2008-08-29 18:53:19.000000000 +0200
++++ solenv/inc/unxlngs3904.mk	2008-08-30 10:28:41.000000000 +0200
+@@ -168,7 +168,7 @@ SONAME_SWITCH=-Wl,-h
+ STDLIBCPP=-lstdc++
+ 
+ # default objectfilenames to link
+-STDOBJVCL=$(L)$/salmain.o
++STDOBJVCL*=$(L)$/salmain.o
+ STDOBJGUI=
+ STDSLOGUI=
+ STDOBJCUI=
+--- solenv/inc/unxlngx6.mk.old	2008-08-29 18:53:19.000000000 +0200
++++ solenv/inc/unxlngx6.mk	2008-08-30 10:22:07.000000000 +0200
+@@ -193,7 +193,7 @@ SONAME_SWITCH=-Wl,-h
+ STDLIBCPP=-lstdc++
+ 
+ # default objectfilenames to link
+-STDOBJVCL=$(L)$/salmain.o
++STDOBJVCL*=$(L)$/salmain.o
+ STDOBJGUI=
+ STDSLOGUI=
+ STDOBJCUI=
 --- solenv/inc/settings.mk
 +++ solenv/inc/settings.mk
 @@ -764,6 +764,7 @@