ooo-build r13831 - in trunk: . bin patches/dev300

[tml svn gnome org]

Author: tml
Date: Mon Sep  8 09:35:54 2008
New Revision: 13831
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13831&view=rev

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

	Merge from ooo-build-3-0:
	
	* patches/dev300/novell-win32-msi-patchability.diff
	(solenv/bin/modules/installer/windows/file.pm): In order to get a
	"build counter" or "patch level" into the versioning, add back
	code to installer::windows::file::get_fileversion(). This affects
	the Version column in the File table. This time don't use the
	binary file version from .exe and .dll files, upstream doesn't
	either, and their patches work. Do use the more
	human-understandable PACKAGEVERSION (3.0.0) instead of the weird
	LIBRARYVERSION (9.0.0), though. Append the OOO_PATCHLEVEL
	environment variable which acts as a build number.

	* patches/dev300/sw-field-patch.diff: Comment out two leftover
	debugging printfs.

	* bin/unpack:
	* download.in: Download and unpack an updated ooo-windows-icons
	tarball with icon files renamed to match upstream.



Modified:
   trunk/ChangeLog
   trunk/bin/unpack
   trunk/download.in
   trunk/patches/dev300/novell-win32-msi-patchability.diff
   trunk/patches/dev300/sw-field-patch.diff

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Mon Sep  8 09:35:54 2008
@@ -466,9 +466,8 @@
 	# Add other Win32 "distros" here if they too want to use
 	# these icons
         NovellWin32*|GoOoWin32*)
-	    bzip2 -dc $SRCDIR/ooo-windows-icons-0.1.tar.bz2 | $GNUTAR xpf -
-	    rm ico/ooo-web-app.ico
-	    mv ico/ooo-*.ico $OOBUILDDIR/sysui/desktop/icons
+	    bzip2 -dc $SRCDIR/ooo-windows-icons-0.2.tar.bz2 | $GNUTAR xpf -
+	    mv ico/ooo3_*.ico $OOBUILDDIR/sysui/desktop/icons
 	    ;;
     esac
 else

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Mon Sep  8 09:35:54 2008
@@ -80,7 +80,7 @@
 # SDK bits
     'unowinreg\.dll'                     => 'http://tools.openoffice.org/unowinreg_prebuild/680/',
 # Windows .ico icons
-    'ooo-windows-icons-.*'               => '@MIRROR@/SRC680',
+    'ooo-windows-icons-0.2.tar.bz2'     => '@MIRROR@/OOO300',
 # Updated libwpd
     'libwpd-*'                           => '@MIRROR@/libwpd',
 # MS Works importer bits
@@ -229,7 +229,7 @@
     #push @files, ( 'wintools.zip' );
 
     # Icons
-    push @files, ( 'ooo-windows-icons-0.1.tar.bz2' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32/;
+    push @files, ( 'ooo-windows-icons-0.2.tar.bz2' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32/;
 
 # We must use the prebuilt Mozilla bits as the compiler to use (MSVS2008) does not compile
 # Mozilla 1.7.5 as used here without love that hasn't been applied yet

Modified: trunk/patches/dev300/novell-win32-msi-patchability.diff
==============================================================================
--- trunk/patches/dev300/novell-win32-msi-patchability.diff	(original)
+++ trunk/patches/dev300/novell-win32-msi-patchability.diff	Mon Sep  8 09:35:54 2008
@@ -225,3 +225,56 @@
 +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;
+ }

Modified: trunk/patches/dev300/sw-field-patch.diff
==============================================================================
--- trunk/patches/dev300/sw-field-patch.diff	(original)
+++ trunk/patches/dev300/sw-field-patch.diff	Mon Sep  8 09:35:54 2008
@@ -807,7 +807,7 @@
 +		 }
 +		 sal_Unicode ch_start=pStartTxtNode->GetTxt().GetChar(ch_start_pos);
 +		 sal_Unicode ch_end=pEndTxtNode->GetTxt().GetChar(ch_end_pos);
-+		 printf("CHECK(%s %p[%i/'%c'] %p[%i/'%c']);\n", aOString.getStr(), pStartTxtNode, ch_start, ch_start, pEndTxtNode, ch_end, ch_end);
++		 // printf("CHECK(%s %p[%i/'%c'] %p[%i/'%c']);\n", aOString.getStr(), pStartTxtNode, ch_start, ch_start, pEndTxtNode, ch_end, ch_end);
 +	     }	    
 +	 }
 +     }
@@ -1065,7 +1065,7 @@
  			default:
  			{
  				ASSERT( !this, "SwTxtPaintInfo::DrawViewOpt: don't know how to draw this" );
-+				printf("SwTxtPaintInfo::DrawViewOpt %04X\n", (int)nWhich);
++				// printf("SwTxtPaintInfo::DrawViewOpt %04X\n", (int)nWhich);
  				break;
  			}
  		}