ooo-build r13926 - in branches/ooo-build-3-0: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Wed Sep 17 20:26:23 2008
New Revision: 13926
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13926&view=rev

Log:
2008-09-17  Tor Lillqvist  <tml novell com>

	* patches/dev300/novell-win32-msi-patchability.diff: Take out our
	patch to file.pm again. Upstream in ooo300-m6 now does leave space
	for a "vendor patch level" or "true build number" in the Version
	column in the File table.

	* patches/dev300/apply: win32-mergemodule-pm.diff not needed in
	m6.



Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply
   branches/ooo-build-3-0/patches/dev300/novell-win32-msi-patchability.diff

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Wed Sep 17 20:26:23 2008
@@ -2613,7 +2613,7 @@
 
 [ Fixes <= dev300-m30 <= ooo300-m3 ]
 win32-mergemodule-pm-m30.diff, tml
-[ Fixes > dev300-m30 > ooo300-m3 ]
+[ Fixes > dev300-m30 > ooo300-m3 < ooo300-m6 ]
 win32-mergemodule-pm.diff, tml
 
 [ Fixes ]

Modified: branches/ooo-build-3-0/patches/dev300/novell-win32-msi-patchability.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/novell-win32-msi-patchability.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/novell-win32-msi-patchability.diff	Wed Sep 17 20:26:23 2008
@@ -225,56 +225,3 @@
 +tg = "{C5C00559-A17F-4ED2-B475-82D94A5BB1B4}"
  multiwestern = "{385A1970-0257-4C57-9383-DD2D668B23CE}"
  multiasia = "{74543111-6ABF-4A12-AC11-D315E2939D2A}"
---- solenv/bin/modules/installer/windows/file.pm
-+++ solenv/bin/modules/installer/windows/file.pm
-@@ -302,12 +302,46 @@
- 
- 	if ( $allvariables->{'USE_FILEVERSION'} )
- 	{
--		if ( ! $allvariables->{'LIBRARYVERSION'} ) { installer::exiter::exit_program("ERROR: USE_FILEVERSION is set, but not LIBRARYVERSION", "get_fileversion"); } 
--		$fileversion = $allvariables->{'LIBRARYVERSION'} . "\." . $installer::globals::buildid;
--		if ( $onefile->{'FileVersion'} ) { $fileversion = $onefile->{'FileVersion'}; } # overriding FileVersion in scp
-+
-+		# Upstream uses LIBRARYVERSION appended with buildid
-+		# as the Version column values in the file
-+		# table. I.e. values like 3.0.0.0344 That means there
-+		# is no space for a "patch level" counter.  We do want
-+		# to leave space for a build counter or patch level in
-+		# sequential builds (typically with different sets of
-+		# patches) of the same upstream source.
-+
-+		# So, just use PACKAGEVERSION appended with the patch
-+		# level.
-+
-+		my @packageversion;
-+
-+		# So far PACKAGEVERSION in openoffice.lst is three
-+		# numbers separated by periods, but be liberal here
-+		# and accept also three numbers followed by whatever,
-+		# or just two numbers followed by whatever. As a
-+		# fallback, use just the buildid.
-+
-+		if ($allvariables->{'PACKAGEVERSION'} =~ /^(\d+)\.(\d+)\.(\d+)/)
-+		{
-+			@packageversion = ($allvariables->{'PACKAGEVERSION'} =~ /^(\d+)\.(\d+)\.(\d+)$/);
-+		}
-+		elsif ($allvariables->{'PACKAGEVERSION'} =~ /^(\d+)\.(\d+)/)
-+		{
-+			@packageversion = ($allvariables->{'PACKAGEVERSION'} =~ /^(\d+)\.(\d+)$/);
-+			push (@packageversion, 0);
-+		}
-+		else
-+		{
-+			@packageversion = ($installer::globals::buildid);
-+			push (@packageversion, 0);
-+			push (@packageversion, 0);
-+		}
-+		my $patchlevel = '0';
-+		$patchlevel = $ENV{'OOO_PATCHLEVEL'} if defined $ENV{'OOO_PATCHLEVEL'};
-+		$fileversion = $packageversion[0] . '.' . $packageversion[1] . '.' . $packageversion[2] . '.' . $patchlevel;
- 	}
- 	
--	if ( $installer::globals::prepare_winpatch ) { $fileversion = ""; } # Windows patches do not allow this version # -> who says so?
- 		
- 	return $fileversion;
- }