[ooo-build-commit] Branch 'ooo/OOO320' - 2 commits - instsetoo_native/util scp2/source

[Jan Holesovsky]

 instsetoo_native/util/pack.lst              |    4 ++--
 scp2/source/ooo/windowscustomaction_ooo.scp |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 499b06ff7dbef6b21c66f06280c7a55566997f05
Author: Oliver Bolte <obo at openoffice.org>
Date:   Mon Jan 4 12:47:24 2010 +0000

    CWS-TOOLING: integrate CWS installer14
    2009-12-21 15:14:08 +0100 dv  r277831 : #i107804# Checking for an already running office doesn't work well with Windows Vista or later

diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index b4ddac3..ceb0b15 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -394,7 +394,7 @@ WindowsCustomAction gid_Customaction_Patch_Isofficerunning
 	Target = "IsOfficeRunning";
 	Inbinarytable = 1;
 	Assignment1 = ("ControlEvent", "ReadyToInstall", "InstallNow", "DoAction", "IsOfficeRunning", "1", "1");
-	Assignment2 = ("InstallExecuteSequence", "", "RunningOffice");
+	Assignment2 = ("InstallExecuteSequence", "VersionNT < 600", "RunningOffice");
 End
 
 WindowsCustomAction gid_Customaction_Full_Isofficerunning
@@ -403,7 +403,7 @@ WindowsCustomAction gid_Customaction_Full_Isofficerunning
 	Source = "shlxtmsi.dll";
 	Target = "IsOfficeRunning";
 	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "", "RunningOffice");
+	Assignment1 = ("InstallExecuteSequence", "VersionNT < 600 Or Not PATCH", "RunningOffice");
 End
 
 WindowsCustomAction gid_Customaction_Langpack_Isofficerunning
@@ -412,7 +412,7 @@ WindowsCustomAction gid_Customaction_Langpack_Isofficerunning
 	Source = "lngpckinsthlp.dll";
 	Target = "IsOfficeRunning";
 	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "PATCH", "RunningOffice");
+	Assignment1 = ("InstallExecuteSequence", "PATCH And VersionNT < 600", "RunningOffice");
 End
 
 WindowsCustomAction gid_Customaction_CheckPatchList
commit 462ab6d2e1d43d6a45f4d08ea69b4c1fcdaca893
Author: Oliver Bolte <obo at openoffice.org>
Date:   Mon Jan 4 07:05:06 2010 +0000

    #i10000# activate en-GB for full OOo + OOo_wJRE

diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index 7119fc5..5642215 100755
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -7,10 +7,10 @@
 
 # Product       List_of_platforms                                                   List_of_languages   Target
 
-OpenOffice      unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro              en-US|ar|bg|bn|ca|cs|da|de|el|es|et|eu|fi|fr|gl|hu|it|ja|km|ko|lt|mk|nb|nl|nn|om|pl|pt|ru|sh|sl|sr|sv|tr|vi|zh-CN|zh-TW   openoffice
+OpenOffice      unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro              en-US|ar|bg|bn|ca|cs|da|de|el|en-GB|es|et|eu|fi|fr|gl|hu|it|ja|km|ko|lt|mk|nb|nl|nn|om|pl|pt|ru|sh|sl|sr|sv|tr|vi|zh-CN|zh-TW   openoffice
 OpenOffice      unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12                                     en-US   openoffice
 BrOffice        unxlngi6.pro,unxlngx6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro                 pt-BR   broffice
-OpenOffice_wJRE unxsoli4.pro,unxsols4.pro,wntmsci12.pro                                                     en-US|ar|bg|bn|ca|cs|da|de|el|es|et|eu|fi|fr|gl|hu|it|ja|km|ko|lt|mk|nb|nl|nn|om|pl|pt|ru|sh|sl|sr|sv|tr|vi|zh-CN|zh-TW   openofficewithjre
+OpenOffice_wJRE unxsoli4.pro,unxsols4.pro,wntmsci12.pro                                                     en-US|ar|bg|bn|ca|cs|da|de|el|en-GB|es|et|eu|fi|fr|gl|hu|it|ja|km|ko|lt|mk|nb|nl|nn|om|pl|pt|ru|sh|sl|sr|sv|tr|vi|zh-CN|zh-TW   openofficewithjre
 BrOffice_wJRE   unxsoli4.pro,unxsols4.pro,wntmsci12.pro                                        pt-BR   brofficewithjre
 OpenOffice_SDK  unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12  en-US   sdkoo
 #URE             unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12  en-US   ure