GNOME.org
 

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

Author: michael
Date: Mon Jul 14 11:44:11 2008
New Revision: 13190
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13190&view=rev

Log:
2008-07-14  Michael Meeks  <michael meeks novell com>

        * patches/dev300/piece-solarbindir.diff,
        * patches/dev300/apply: drop.

        * bin/unpack, download.in: adapt to new split names,
        and move src into place in the old layout.

        * patches/dev300/piece-startup.diff,
        * patches/dev300/apply: fix 



Added:
   trunk/patches/dev300/piece-startup.diff   (contents, props changed)
Removed:
   trunk/patches/dev300/piece-solarbindir.diff
Modified:
   trunk/ChangeLog
   trunk/bin/package-ooo
   trunk/bin/piece/install-generic
   trunk/bin/piece/sys-setup
   trunk/bin/unpack
   trunk/download.in
   trunk/patches/dev300/apply
   trunk/scratch/split/ooo3_libs_gui.spec

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Mon Jul 14 11:44:11 2008
@@ -20,7 +20,7 @@
     DEST=$OOINSTDIR/solver
     mkdir -p $DEST
     cp -R $SRCDIR/* $DEST
-    ln -sf $OOBUILDDIR/solver/$INPATH .
+#    ln -sf $OOBUILDDIR/solver/$UPD/$INPATH .
     if test -f "$TOOLSDIR/bin/piece/install-$PIECE"; then
 	echo "$PIECE specific install"
 	. $TOOLSDIR/bin/piece/install-$PIECE

Modified: trunk/bin/piece/install-generic
==============================================================================
--- trunk/bin/piece/install-generic	(original)
+++ trunk/bin/piece/install-generic	Mon Jul 14 11:44:11 2008
@@ -1,4 +1,4 @@
-SRCDIR="$SOLARPIECEVERSION/$UPD/$INPATH"
+SRCDIR="$SOLARPIECEVERSION/$INPATH"
 DEST="$DESTDIR$OO_SOLVERDIR"
 mkdir -p $DEST
 cp -R $SRCDIR/* $DEST

Modified: trunk/bin/piece/sys-setup
==============================================================================
--- trunk/bin/piece/sys-setup	(original)
+++ trunk/bin/piece/sys-setup	Mon Jul 14 11:44:11 2008
@@ -16,7 +16,7 @@
 
 #  new local solver
 export SOLARPIECEVERSION="$SRC_ROOT/solver"
-export SOLARPIECE="$SOLARPIECEVERSION/$UPD"
+export SOLARPIECE="$SOLARPIECEVERSION"
 
 # system solver bits ...
 export SOLARVER="$DEV_DIR"
@@ -33,13 +33,13 @@
 export DMAKEROOT="$SOLARENVINC/startup"
 export UNOINCLUDES="$DEV_DIR/inc/offuh"
 
-export LD_LIBRARY_PATH=".:$DEV_DIR/lib:$URE_DIR/lib:$INSTALL_DIR:$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 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"
 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"
 SOLARLIB=" -L../lib -L$SOLARENV/$OUTPATH/lib -L$SOLARVER/$INPATH/lib -L$SOLARENV/$OUTPATH/lib"
-SOLARLIB="$SOLARLIB -L$URE_DIR/lib -L$INSTALL_DIR -L$SOLARPIECE/lib"
+SOLARLIB="$SOLARLIB -L$URE_DIR/lib -L$INSTALL_DIR -L$SOLARPIECE/$INPATH/lib"
 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"
 export SOLARLIB SOLARINC
 

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Mon Jul 14 11:44:11 2008
@@ -57,7 +57,7 @@
 	if test "z$PIECE" != "z"; then
 		CORE_PKGS=$PIECE
 	else
-		CORE_PKGS="sdk ure base calc l10n writer impress artwork filters testing bootstrap libs-gui libs-core libs-extern components postprocess"
+		CORE_PKGS="sdk ure base calc l10n writer impress artwork filters testing bootstrap libs_gui libs_core libs_extern components postprocess"
 	fi
 	for pkg in $CORE_PKGS; do
 		check_tarball "$OOO_SPLIT_PREFIX$pkg.tar.bz2"
@@ -163,9 +163,17 @@
 	echo "Unpacking $OOO_TARBALL..."
 	($OOO_DECOMPRESS_CMD $SRCDIR/$OOO_TARBALL | $GNUTAR xpf - ) || exit 1
 else # split packages
+	if test -d $OOBUILDDIR; then
+	    echo "	removing old build dir: $OOBUILDDIR"
+	    rm -rf $OOBUILDDIR
+	fi
+	mkdir $OOBUILDDIR
 	for pkg in $CORE_PKGS; do
 		echo "	unpacking $pkg..."
 		($OOO_DECOMPRESS_CMD "$SRCDIR/$OOO_SPLIT_PREFIX$pkg.tar.bz2" | $GNUTAR xpf - ) || exit 1
+		echo "	moving it into place..."
+		mv $OOO_SPLIT_PREFIX$pkg/* $OOBUILDDIR
+		rmdir $OOO_SPLIT_PREFIX$pkg
 	done
 	if test "z$PIECE" != "z"; then
 		ln -s "$BUILDDIR/$CVSTAG-$PIECE" $OOBUILDDIR

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Mon Jul 14 11:44:11 2008
@@ -276,9 +276,9 @@
     push @files, ( source_file( "filters" ) );
     push @files, ( source_file( "testing" ) );
     push @files, ( source_file( "bootstrap" ) );
-    push @files, ( source_file( "libs-gui" ) );
-    push @files, ( source_file( "libs-core" ) );
-    push @files, ( source_file( "libs-extern" ) );
+    push @files, ( source_file( "libs_gui" ) );
+    push @files, ( source_file( "libs_core" ) );
+    push @files, ( source_file( "libs_extern" ) );
     push @files, ( source_file( "components" ) );
     push @files, ( source_file( "postprocess" ) );
 } else {

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul 14 11:44:11 2008
@@ -2446,7 +2446,6 @@
 libwps-testing.diff
 writerperfect-testing.diff
 
-
 [ PieceBits ]
 SectionOwner => michael
 # Experimental piece-wise source code split for build
@@ -2454,8 +2453,8 @@
 piece-deliver.diff
 piece-checkdll.diff
 piece-target.diff
-piece-solarbindir.diff
 piece-rsc.diff
+piece-startup.diff
 
 [ BFFixes ]
 fit-list-to-size-binfilter.diff, thorsten

Added: trunk/patches/dev300/piece-startup.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/piece-startup.diff	Mon Jul 14 11:44:11 2008
@@ -0,0 +1,11 @@
+--- solenv/inc/startup/startup.mk
++++ solenv/inc/startup/startup.mk
+@@ -30,7 +30,7 @@
+ CALLTARGETS=$(MAKETARGETS)
+ .ENDIF			# "$(TNR)" == ""
+ 
+-.INCLUDEDIRS : $(DMAKE_INC) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) $(SOLARENV)$/inc
++.INCLUDEDIRS : $(DMAKE_INC) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) $(SOLARPIECE)$/$(INPATH)$/inc$(UPDMINOREXT) $(SOLARENV)$/inc
+ 
+ # Grab key definitions from the environment
+ # .IMPORT .IGNORE : OS TMPDIR SHELL UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME CVER GVER COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT VCL SO3 ENVCFLAGS

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 11:44:11 2008
@@ -54,7 +54,7 @@
 source $OO_TOOLSDIR/piece/sys-setup
 
 export VERBOSE=1
-$OO_TOOLSDIR/piece/build-%piece
+$OO_TOOLSDIR/piece/build-generic
 
 %install
 
@@ -65,7 +65,7 @@
 export DESTDIR=$RPM_BUILD_ROOT
 
 source $OO_TOOLSDIR/piece/sys-setup
-$OO_TOOLSDIR/piece/install-%piece
+$OO_TOOLSDIR/piece/install-generic
 
 %clean
 %post
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]