ooo-build r8777 - in branches/ooo-build-2-1: . patches/src680

[tml svn gnome org]

Author: tml
Date: 2007-02-12 12:22:18 +0000 (Mon, 12 Feb 2007)
New Revision: 8777
ViewCVS link: http://svn.gnome.org/viewcvs/ooo-build?rev=8777&view=rev

Modified:
   branches/ooo-build-2-1/ChangeLog
   branches/ooo-build-2-1/patches/src680/novell-win32-msi-patchability.diff
Log:
2007-02-12  Tor Lillqvist  <tml novell com>

	* patches/src680/apply/novell-win32-msi-patchability.diff:
	(instsetoo_native/inc_openoffice/windows/msi_templates/components.txt):
	Add predefined component codes for "af", too.
	(solenv/bin/modules/installer/globals.pm): Add the hash tables
	%installer::globals::savedmapping, savedrevmapping,
	savedrev83mapping and saved83dirmapping to keep track of the file
	table keys (FTKs) and 8.3 names used in a previous build. When
	producing a build to which the intention is that it should be
	possible to upgrade by using a Windows Installer patch (.msp file)
	we should use the same FTKs and 8.3 names for files and
	folders. Otherwise the msimsp program that builds the patch will
	get confused and unnecessarily include whole files as it thinks
	they are "new" because their FTK is different, their 8.3 name is
	different, or the folder they are in has a different 8.3 name.
	(solenv/bin/modules/installer/windows/file.pm)
	(solenv/bin/modules/installer/windows/idtglobal.pm)
	(solenv/bin/modules/installer/windows/directory.pm): Use the
	mapping hash tables.
	(solenv/bin/modules/installer/windows/msiglobal.pm): New function:
	installer::windows::msiglobal::read_saved_mappings(). If there is
	a PREVIOUS_IDT_DIR environment variable, it should point to the
	wntmsci10.pro/OpenOffice/msi/idt_files/foo/en-US folder of the
	previous build that we want to be upgradable from. Read File.idt
	and Director.idt in that folder and set up the mapping hash
	tables.
	(solenv/bin/make_installer.pl): Call read_saved_mappings().