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

[michael svn gnome org]

Author: michael
Date: Wed Jul 23 19:57:23 2008
New Revision: 13373
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13373&view=rev

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

        * patches/dev300/piece-solenv.diff: clobber regmergelazy
        * location.
        * bin/piece/install-generic: check for empty DESTDIR



Modified:
   trunk/ChangeLog
   trunk/bin/piece/install-generic
   trunk/patches/dev300/piece-solenv.diff

Modified: trunk/bin/piece/install-generic
==============================================================================
--- trunk/bin/piece/install-generic	(original)
+++ trunk/bin/piece/install-generic	Wed Jul 23 19:57:23 2008
@@ -22,6 +22,12 @@
 # install from the copy in the solver - to the system
 export SOLARVERSION="`pwd`/solver"
 export LANGS="en-US,en-GB"
+
+if test "z$DESTDIR" == "z"; then
+    print "install-generic requires a destdir to be set"
+    exit 1
+fi
+
 perl -w $SOLARENV/bin/make_installer.pl \
      -f /usr/lib/ooo-3/solver/instsetoo_native/util/openoffice.lst \
      -l $LANGS -p OpenOffice -buildid $BUILD -destdir $DESTDIR \

Modified: trunk/patches/dev300/piece-solenv.diff
==============================================================================
--- trunk/patches/dev300/piece-solenv.diff	(original)
+++ trunk/patches/dev300/piece-solenv.diff	Wed Jul 23 19:57:23 2008
@@ -239,7 +239,7 @@
  		$includefilename =~ s/^\s*//;
  		$includefilename =~ s/\s*$//;
  		$includefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$includefilename, $includepatharrayref, 1);
-+		if ($$includefilenameref eq "") {
++		if ($$includefilenameref eq "" && $installer::globals::split) {
 +		    $$includefilenameref = $ENV{OO_INSTDIR} . "/solver/bin/" . $includefilename;
 +		}
  		if ( $$includefilenameref eq "" ) { installer::exiter::exit_program("Include file $includefilename not found!\nADD_INCLUDE_FILES = $allvariables->{'ADD_INCLUDE_FILES'}", "add_variables_from_inc_to_hashref"); }
@@ -277,3 +277,16 @@
  		installer::logger::print_message( "... creating profiles ...\n" );
  
 
+
+--- solenv/bin/modules/installer/regmerge.pm	2008-07-23 20:50:16.000000000 +0100
++++ solenv/bin/modules/installer/regmerge.pm	2008-07-23 20:50:16.000000000 +0100
+@@ -135,6 +135,9 @@
+ 	else { $searchname = "regcomplazy.exe"; } 
+ 	
+ 	my $regmergefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$searchname, $includepatharrayref, 1);
++	if ( $$regmergefileref eq "" && $installer::globals::split) {
++	    $$regmergefileref = $ENV{OO_INSTDIR} . "/solver/bin/" . $searchname;
++	}
+ 	if ( $$regmergefileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $searchname for merging the StarRegistry!", "get_regmerge_file"); }
+ 	
+ 	return $$regmergefileref;