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

[michael svn gnome org]

Author: michael
Date: Tue Jul 22 11:11:05 2008
New Revision: 13345
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13345&view=rev

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

        * bin/piece/install-bootstrap: fix symlink
        * patches/dev300/piece-solenv.diff: add missing bits.

        * src/setup_native_packinfo-m25.tar.bz2,
        * bin/unpack: hack around missing bits required for
        make_installer.



Added:
   trunk/src/setup_native_packinfo-m25.tar.bz2   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/bin/package-ooo
   trunk/bin/piece/install-bootstrap
   trunk/bin/unpack
   trunk/patches/dev300/piece-solenv.diff

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Tue Jul 22 11:11:05 2008
@@ -23,7 +23,7 @@
 #    ln -sf $OOBUILDDIR/solver/$UPD/$INPATH .
     if test -f "$TOOLSDIR/bin/piece/install-$PIECE"; then
 	echo "$PIECE specific install"
-	. $TOOLSDIR/bin/piece/install-$PIECE
+	. $TOOLSDIR/bin/piece/install-$PIECE && exit 1
     fi
     exit 0;
 fi

Modified: trunk/bin/piece/install-bootstrap
==============================================================================
--- trunk/bin/piece/install-bootstrap	(original)
+++ trunk/bin/piece/install-bootstrap	Tue Jul 22 11:11:05 2008
@@ -1,5 +1,7 @@
 # install bash script - invoked from package-ooo
 
+ln -s . "$OOINSTDIR/$INPATH"
+
 # environment
 cp -R $OOBUILDDIR/*.[sS]et.sh $DEST
 

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Tue Jul 22 11:11:05 2008
@@ -177,6 +177,9 @@
 	done
 	if test "z$PIECE" != "z"; then
 		ln -s "$BUILDDIR/$CVSTAG-$PIECE" $OOBUILDDIR
+		# ugly hack around odd positioning of this info
+		echo "Unpacking setup_native .txt pieces"
+		($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-m25.tar.bz2 | $GNUTAR xpf - )
 	fi
 fi
 

Modified: trunk/patches/dev300/piece-solenv.diff
==============================================================================
--- trunk/patches/dev300/piece-solenv.diff	(original)
+++ trunk/patches/dev300/piece-solenv.diff	Tue Jul 22 11:11:05 2008
@@ -18,8 +18,9 @@
  
  	if ( $installer::globals::setupscriptname eq "" )
  	{
---- /tmp/globals.pm	2008-07-18 17:53:26.000000000 +0100
-+++ /usr/lib/ooo-3/solenv/bin/modules/installer/globals.pm	2008-07-18 17:53:17.000000000 +0100
+
+--- solenv/bin/modules/installer/globals.pm	2008-07-18 17:53:17.000000000 +0100
++++ solenv/bin/modules/installer/globals.pm	2008-07-18 17:53:17.000000000 +0100
 @@ -56,7 +56,8 @@
  
  	$destdir = "";
@@ -135,3 +136,34 @@
  		my $sourcestat = stat($sourcepath);
  		utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination");
  		chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!";
+
+
+
+
+--- solenv/bin/modules/installer/packagelist.pm	2008-07-22 12:05:12.000000000 +0100
++++ solenv/bin/modules/installer/packagelist.pm	2008-07-22 12:05:12.000000000 +0100
+@@ -501,6 +501,9 @@
+ 			my $gid =  $onepackage->{'module'};
+ 			my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptfile, "" , 0);
+ 
++                        if ($installer::globals::split) {
++                            $$fileref = $ENV{OO_INSTDIR} . "/solver/bin/" . $scriptfile;
++                        }
+ 			if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find script file $scriptfile for module $gid!", "check_packagelist"); }
+ 
+ 			my $infoline = "$gid: Using script file: \"$$fileref\"!\n";
+@@ -651,7 +654,13 @@
+ 			# The file with package information has to be found in path list
+ 			my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$packinfofile, "" , 0);
+ 
+-			if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $packinfofile for module $modulegid!", "collectpackages"); }
++			if ($installer::globals::split) {
++			    $$fileref = $ENV{OO_INSTDIR} . "/solver/bin/" . $packinfofile;
++			}
++
++			if ( $$fileref eq "" ) {
++			    installer::exiter::exit_program("ERROR: Could not find file $packinfofile for module $modulegid!", "collectpackages");
++			}
+ 
+ 			my $infoline = "$modulegid: Using packinfo: \"$$fileref\"!\n";
+ 			push( @installer::globals::logfileinfo, $infoline);

Added: trunk/src/setup_native_packinfo-m25.tar.bz2
==============================================================================
Binary file. No diff available.