diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-18 10:41:06 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-18 10:41:06 +0000 |
| commit | 9e7d59cf2f269b1a3330e25271c495e3da1bdf7b (patch) | |
| tree | 09e90ac73057ae5fc81529757527b2df3d2a66d9 /instsetoo_native | |
| parent | 9b5026b9bde183fd62e25137ca26e47211651b4f (diff) | |
CWS-TOOLING: integrate CWS dv07
2009-02-12 13:22:37 +0100 dv r267650 : #i94560# Removed string, which needed translation
2009-01-27 16:09:50 +0100 dv r267004 : #i94560# Allow building without redistributable
2009-01-27 10:56:38 +0100 is r266965 : #i98509# InstallOrder for extension module
2009-01-26 08:08:16 +0100 dv r266899 : #i94560# Work around Windows Vista installation problems
2009-01-19 14:28:56 +0100 dv r266498 : CWS-TOOLING: rebase CWS dv07 to trunk@266428 (milestone: DEV300:m39)
2009-01-19 09:56:07 +0100 dv r266477 : #i94560# Added custom action to work around 'major upgrade' problem on Windows Vista
2009-01-19 09:54:30 +0100 dv r266476 : #i94560# Added custom action to work around 'major upgrade' problem on Windows Vista
2009-01-19 09:13:06 +0100 dv r266474 : #i94347# Changed LaunchCondition from AdminUser to Privileged
2008-12-18 08:42:04 +0100 dv r265662 : #i97201# remove old release notes when notified about updates
2008-12-15 14:50:33 +0100 dv r265501 : #i96844# Use fputs instead of fprintf
Diffstat (limited to 'instsetoo_native')
9 files changed, 19 insertions, 10 deletions
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_languages/CustomAc.ulf b/instsetoo_native/inc_ooolangpack/windows/msi_languages/CustomAc.ulf new file mode 100644 index 000000000000..284aee68eebf --- /dev/null +++ b/instsetoo_native/inc_ooolangpack/windows/msi_languages/CustomAc.ulf @@ -0,0 +1,12 @@ +[OOO_CUSTOMACTION_1] +en-US = "A newer version of [ProductName] was found. To install an older version, the newer version needs to be removed first." + +[OOO_CUSTOMACTION_2] +en-US = "The same version of this product is already installed." + +[OOO_CUSTOMACTION_3] +en-US = "An older version of [ProductName] was found. To install a newer version, the older version needs to be removed first." + +[OOO_CUSTOMACTION_4] +en-US = "Please exit [DEFINEDPRODUCT] [DEFINEDVERSION] and the [DEFINEDPRODUCT] [DEFINEDVERSION] Quickstarter before you continue. If you are using a multi-user system, also make sure that no other user has [DEFINEDPRODUCT] [DEFINEDVERSION] open." + diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt index d9971918d3f5..0399b8b46113 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt @@ -10,4 +10,4 @@ SetBasisInstallLocation 51 BASISINSTALLLOCATION [BASISDIRECTORYGID] SetUreInstallLocation 51 UREINSTALLLOCATION [UREDIRECTORYGID] NewProductFound 19 OOO_CUSTOMACTION_1 SameProductFound 19 OOO_CUSTOMACTION_2 -RunningOffice 19 OOO_CUSTOMACTION_4 +RunningOffice 19 "Please exit [DEFINEDPRODUCT] [DEFINEDVERSION] and the [DEFINEDPRODUCT] [DEFINEDVERSION] Quickstarter before you continue. If you are using a multi-user system, also make sure that no other user has [DEFINEDPRODUCT] [DEFINEDVERSION] open." diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/LaunchCo.idt index 7fa2df1562b1..35d78694a664 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/LaunchCo.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/LaunchCo.idt @@ -1,4 +1,4 @@ Condition Description s255 l255 WINDOWSENCODINGTEMPLATE LaunchCondition Condition -AdminUser OOO_LAUNCH_1 +Privileged OOO_LAUNCH_1 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt index 93411143a914..f2d5eb2b8829 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt @@ -41,10 +41,9 @@ SetOfficeInstallLocation 51 OFFICEINSTALLLOCATION [OFFICEDIRECTORYGID] SetBasisInstallLocation 51 BASISINSTALLLOCATION [BASISDIRECTORYGID] SetUreInstallLocation 51 UREINSTALLLOCATION [UREDIRECTORYGID] NewProductFound 19 OOO_CUSTOMACTION_1 -OldProductFound 19 OOO_CUSTOMACTION_3 SameProductFound 19 OOO_CUSTOMACTION_2 SetLanguageSelected 51 LANG_SELECTED 1 ResetLanguageSelected 51 LANG_SELECTED 0 SetApplicationSelected 51 APP_SELECTED 1 ResetApplicationSelected 51 APP_SELECTED 0 -RunningOffice 19 OOO_CUSTOMACTION_4 +RunningOffice 19 "Please exit [DEFINEDPRODUCT] [DEFINEDVERSION] and the [DEFINEDPRODUCT] [DEFINEDVERSION] Quickstarter before you continue. If you are using a multi-user system, also make sure that no other user has [DEFINEDPRODUCT] [DEFINEDVERSION] open." diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt index 80a81c1f7531..9459e79e283d 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt @@ -58,7 +58,6 @@ MoveFiles 1900 MsiPublishAssemblies 3025 MsiUnpublishAssemblies 875 NewProductFound NEWPRODUCTS 110 -OldProductFound OLDPRODUCTSSAMEMAJOR And (VersionNT > 599) 115 PatchFiles 2000 ProcessComponents 800 PublishComponents 3000 @@ -82,7 +81,7 @@ RemoveIniValues 1550 RemoveODBC 1200 RemoveRegistryValues 1300 RemoveShortcuts 1600 -RunningOffice OFFICERUNS="1" And VersionNT < 600 65 +RunningOffice OFFICERUNS="1" 135 RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250 SameProductFound SAMEPRODUCTS 120 ScheduleReboot ISSCHEDULEREBOOT 3125 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt index 1ccec5fa5b0c..135987f108d3 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt @@ -15,7 +15,6 @@ LaunchConditions 50 MaintenanceWelcome Installed And Not RESUME And Not Preselected And Not PATCH 750 MigrateFeatureStates 600 NewProductFound NEWPRODUCTS 160 -OldProductFound OLDPRODUCTSSAMEMAJOR And (VersionNT > 599) 165 PatchWelcome Installed And PATCH And Not IS_MAJOR_UPGRADE 625 ResolveSource Not Installed And Not PATCH 525 RMCCPSearch Not CCP_SUCCESS And CCP_TEST 300 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt index 7fa2df1562b1..35d78694a664 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt @@ -1,4 +1,4 @@ Condition Description s255 l255 WINDOWSENCODINGTEMPLATE LaunchCondition Condition -AdminUser OOO_LAUNCH_1 +Privileged OOO_LAUNCH_1 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/LaunchCo.idt index 7fa2df1562b1..35d78694a664 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/LaunchCo.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/LaunchCo.idt @@ -1,4 +1,4 @@ Condition Description s255 l255 WINDOWSENCODINGTEMPLATE LaunchCondition Condition -AdminUser OOO_LAUNCH_1 +Privileged OOO_LAUNCH_1 diff --git a/instsetoo_native/inc_ure/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_ure/windows/msi_templates/LaunchCo.idt index 7fa2df1562b1..35d78694a664 100644 --- a/instsetoo_native/inc_ure/windows/msi_templates/LaunchCo.idt +++ b/instsetoo_native/inc_ure/windows/msi_templates/LaunchCo.idt @@ -1,4 +1,4 @@ Condition Description s255 l255 WINDOWSENCODINGTEMPLATE LaunchCondition Condition -AdminUser OOO_LAUNCH_1 +Privileged OOO_LAUNCH_1 |