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

[michael svn gnome org]

Author: michael
Date: Mon Jul 21 15:15:17 2008
New Revision: 13324
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13324&view=rev

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

        * patches/dev300/piece-solenv.diff: more work.
        * bin/piece/install-bootstrap: install packinfo bits.



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

Modified: trunk/bin/piece/install-bootstrap
==============================================================================
--- trunk/bin/piece/install-bootstrap	(original)
+++ trunk/bin/piece/install-bootstrap	Mon Jul 21 15:15:17 2008
@@ -6,6 +6,9 @@
 # openoffice lst
 cp -R $OOBUILDDIR/instsetoo_native $DEST
 
+# setup_native - not built; odd deps ...
+cp $OOBUILDDIR/setup_native/source/packinfo/*.txt $DEST/bin
+
 # ooo-build
 mkdir -p $OOINSTDIR/ooo-build/bin
 mkdir -p $OOINSTDIR/ooo-build/patches

Modified: trunk/patches/dev300/piece-solenv.diff
==============================================================================
--- trunk/patches/dev300/piece-solenv.diff	(original)
+++ trunk/patches/dev300/piece-solenv.diff	Mon Jul 21 15:15:17 2008
@@ -57,7 +57,7 @@
  				next;	# removing this file from list, if sourcepath is empty
  			}
 
-a--- solenv/bin/make_installer.pl	2008-07-18 17:58:25.000000000 +0100
+--- solenv/bin/make_installer.pl	2008-07-18 17:58:25.000000000 +0100
 +++ solenv/bin/make_installer.pl	2008-07-18 17:58:25.000000000 +0100
 @@ -802,7 +802,8 @@
  			# "regcomp" or "regcomp.exe". Therefore this function can only be executed on the
@@ -69,3 +69,69 @@
  			{
  				installer::logger::print_message( "... creating preregistered services.rdb ...\n" );
  
+
+--- solenv/bin/modules/installer/profiles.pm	2008-07-21 14:04:00.000000000 +0100
++++ solenv/bin/modules/installer/profiles.pm	2008-07-21 14:04:00.000000000 +0100
+@@ -91,20 +91,32 @@
+ # Adding the newly created profile into the file list
+ #####################################################################
+ 
++sub create_blank_profile
++{
++	my $profile = shift;
++
++	# Taking the base data from the "gid_File_Lib_Vcl"
++#	my $vclgid = "gid_File_Lib_Vcl";
++#	if ( $allvariables->{'GLOBALFILEGID'} ) { $vclgid = $allvariables->{'GLOBALFILEGID'}; }
++#	my $vclfile = installer::existence::get_specified_file($filesarrayref, $vclgid);
++	# copying all base data	
++#	installer::converter::copy_item_object($vclfile, \%profile);
++
++	# hard-coded defaults instead
++	$profile->{'ismultilingual'} = 0;
++	$profile->{'haslanguagemodule'} = 0;
++	$profile->{'specificlanguage'} = '';
++	$profile->{'Styles'} = '(PACKED,UNO_COMPONENT)';
++	$profile->{'RegistryID'} = 'gid_Starregistry_Services_Rdb';
++}
++
+ sub add_profile_into_filelist
+ {
+ 	my ($filesarrayref, $oneprofile, $completeprofilename, $allvariables) = @_;
+ 
+ 	my %profile = ();
+ 
+-	# Taking the base data from the "gid_File_Lib_Vcl"
+-
+-	my $vclgid = "gid_File_Lib_Vcl";
+-	if ( $allvariables->{'GLOBALFILEGID'} ) { $vclgid = $allvariables->{'GLOBALFILEGID'}; }
+-	my $vclfile = installer::existence::get_specified_file($filesarrayref, $vclgid);
+-
+-	# copying all base data	
+-	installer::converter::copy_item_object($vclfile, \%profile);			
++	create_blank_profile (\%profile);
+ 
+ 	# and overriding all new values
+ 	
+--- solenv/bin/modules/installer/worker.pm	2008-07-21 15:57:11.000000000 +0100
++++ solenv/bin/modules/installer/worker.pm	2008-07-21 15:57:11.000000000 +0100
+@@ -784,7 +791,18 @@
+ 
+ 		push @lines, "$destination\n";
+ 		# printf "cp $sourcepath $destdir$destination\n";
+-		copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $!";
++
++		next if ($installer::globals::split && $sourcepath eq '');
++
++		if (!copy ("$sourcepath", "$destdir$destination")) {
++		    if (-f "$destdir$destination" && ! -w "$destdir$destination") {
++			print STDERR "skipping existing file: $destdir$destination: $!\n";
++		    } else {
++			die "Can't copy file '$sourcepath' to '$destdir$destination': $!";
++		    }
++		} else {
++		    printf "copy file $sourcepath to $destdir$destination\n";
++		}
+ 		my $sourcestat = stat($sourcepath);
+ 		utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination");
+ 		chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!";