summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
authorIngo Schmidt <is@openoffice.org>2010-05-26 14:44:44 +0200
committerIngo Schmidt <is@openoffice.org>2010-05-26 14:44:44 +0200
commit1e96d7d75ab2fd674d80788d7ebd52ce97fb0d17 (patch)
treef6b82d265ded20ee1f5c3b10061bdff632ca9884 /instsetoo_native
parentff94b38b00f90b4fbc8f49d132d46f27c537e143 (diff)
native305 #i92977# new Windows INSTALLLOCATION settings
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt1
-rw-r--r--instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt3
-rw-r--r--instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt3
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt3
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt12
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt3
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt3
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt6
-rw-r--r--instsetoo_native/inc_ure/windows/msi_templates/AdminExe.idt1
-rw-r--r--instsetoo_native/inc_ure/windows/msi_templates/CustomAc.idt1
-rw-r--r--instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt1
-rw-r--r--instsetoo_native/util/makefile.mk4
-rw-r--r--instsetoo_native/util/openoffice.lst7
13 files changed, 2 insertions, 46 deletions
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
index 3ab09afdb990..dea5e9767a6e 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
@@ -56,7 +56,6 @@ InstallChangeFolder Cancel NewDialog DestinationFolder 1 2
InstallChangeFolder Cancel Reset 0 1 1
InstallChangeFolder OK NewDialog DestinationFolder 1 3
InstallChangeFolder OK SetTargetPath [_BrowseProperty] 1 2
-InstallChangeFolder OK DoAction SetOfficeInstallLocation 1 4
InstallChangeFolder Up DirectoryListUp 0 1 0
InstallWelcome Back NewDialog SplashBitmap Display_IsBitmapDlg 1
InstallWelcome Cancel SpawnDialog CancelSetup 1 0
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
index d9971918d3f5..7af1c7b26429 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
@@ -5,9 +5,6 @@ setAllUsersProfile2K 51 ALLUSERSPROFILE [%ALLUSERSPROFILE]
SetAllUsersProfileNT 51 ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users
setUserProfileNT 51 USERPROFILE [%USERPROFILE]
SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
-SetOfficeInstallLocation 51 OFFICEINSTALLLOCATION [OFFICEDIRECTORYGID]
-SetBasisInstallLocation 51 BASISINSTALLLOCATION [BASISDIRECTORYGID]
-SetUreInstallLocation 51 UREINSTALLLOCATION [UREDIRECTORYGID]
NewProductFound 19 OOO_CUSTOMACTION_1
SameProductFound 19 OOO_CUSTOMACTION_2
RunningOffice 19 OOO_CUSTOMACTION_4
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
index 5db654cb045c..90ba9c6a6005 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
@@ -56,9 +56,6 @@ ScheduleReboot ISSCHEDULEREBOOT 3125
SelfRegModules 2850
SelfUnregModules 1100
SetARPInstallLocation 990
-SetOfficeInstallLocation Not Installed 575
-SetBasisInstallLocation Not Installed 576
-SetUreInstallLocation Not Installed 577
SetODBCFolders 550
StartServices VersionNT 2800
StopServices VersionNT 950
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
index 0be369431d84..ede3f7cb4f42 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
@@ -11,6 +11,3 @@ InstallFinalize 400
InstallInitialize 250
InstallValidate 200
ScheduleReboot ISSCHEDULEREBOOT 375
-SetOfficeInstallLocation 410
-SetBasisInstallLocation 420
-SetUreInstallLocation 430
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
index a4a5415fd928..9bb051e56492 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
@@ -1,17 +1,5 @@
Property Signature_
s72 s72
AppSearch Property Signature_
-UREUNINSTALLLOCATION ureuninstalluser
-UREUNINSTALLLOCATION ureuninstallmachine
-BASISUNINSTALLLOCATION basisuninstalluser
-BASISUNINSTALLLOCATION basisuninstallmachine
-OFFICEUNINSTALLLOCATION officeuninstalluser
-OFFICEUNINSTALLLOCATION officeuninstallmachine
-UREINSTALLLOCATION ureuninstalluser
-UREINSTALLLOCATION ureuninstallmachine
-BASISINSTALLLOCATION basisuninstalluser
-BASISINSTALLLOCATION basisuninstallmachine
-OFFICEINSTALLLOCATION officeuninstalluser
-OFFICEINSTALLLOCATION officeuninstallmachine
INSTALLLOCATION installuser
INSTALLLOCATION installmachine
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index 80514fd1904b..17a47e8e9889 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -122,9 +122,6 @@ setAllUsersProfile2K 51 ALLUSERSPROFILE [%ALLUSERSPROFILE]
SetAllUsersProfileNT 51 ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users
setUserProfileNT 51 USERPROFILE [%USERPROFILE]
SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
-SetOfficeInstallLocation 51 OFFICEINSTALLLOCATION [OFFICEDIRECTORYGID]
-SetBasisInstallLocation 51 BASISINSTALLLOCATION [BASISDIRECTORYGID]
-SetUreInstallLocation 51 UREINSTALLLOCATION [UREDIRECTORYGID]
NewProductFound 19 OOO_CUSTOMACTION_1
SameProductFound 19 OOO_CUSTOMACTION_2
SetLanguageSelected 51 LANG_SELECTED 1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 11f97a0bb797..defde2299409 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -173,9 +173,6 @@ ScheduleReboot ISSCHEDULEREBOOT 3125
SelfRegModules 2850
SelfUnregModules 1100
SetARPInstallLocation 990
-SetOfficeInstallLocation Not Installed 575
-SetBasisInstallLocation Not Installed 576
-SetUreInstallLocation Not Installed 577
SetODBCFolders 550
StartServices VersionNT 2800
StopServices VersionNT 950
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
index 349aa0604ca3..2fb2d2963727 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
@@ -1,11 +1,5 @@
Signature_ Root Key Name Type
s72 i2 s255 S255 I2
RegLocator Signature_
-ureuninstalluser 1 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] UREINSTALLLOCATION 2
-ureuninstallmachine 2 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] UREINSTALLLOCATION 2
-basisuninstalluser 1 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] BASISINSTALLLOCATION 2
-basisuninstallmachine 2 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] BASISINSTALLLOCATION 2
-officeuninstalluser 1 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] OFFICEINSTALLLOCATION 2
-officeuninstallmachine 2 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] OFFICEINSTALLLOCATION 2
installuser 1 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
installmachine 2 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/AdminExe.idt b/instsetoo_native/inc_ure/windows/msi_templates/AdminExe.idt
index b9a99b9fb502..ede3f7cb4f42 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/AdminExe.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/AdminExe.idt
@@ -11,4 +11,3 @@ InstallFinalize 400
InstallInitialize 250
InstallValidate 200
ScheduleReboot ISSCHEDULEREBOOT 375
-SetUreInstallLocation 430
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_ure/windows/msi_templates/CustomAc.idt
index c6607481274c..ed030dc3e17c 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/CustomAc.idt
@@ -6,6 +6,5 @@ setAllUsersProfile2K 51 ALLUSERSPROFILE [%ALLUSERSPROFILE]
SetAllUsersProfileNT 51 ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users
setUserProfileNT 51 USERPROFILE [%USERPROFILE]
SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
-SetUreInstallLocation 51 UREINSTALLLOCATION [UREDIRECTORYGID]
SameProductFound 19 The same version of this product is already installed.
NewProductFound 19 A newer version of [ProductName] was found. To install an older version, the newer version needs to be removed first.
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt
index 0fbfa4bcf8b6..c1de8e4a19fe 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt
@@ -56,7 +56,6 @@ ScheduleReboot ISSCHEDULEREBOOT 3125
SelfRegModules 2850
SelfUnregModules 1100
SetARPInstallLocation Not Installed 990
-SetUreInstallLocation Not Installed 577
SetODBCFolders 550
StartServices VersionNT 2800
StopServices VersionNT 950
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index b2f014f6ad58..c18f2dad2098 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -105,7 +105,7 @@ PKGFORMAT+=$(MAKETARGETS:e:s/.//)
# Independent of PKGFORMAT, always build a default-language openoffice product
# also in archive format, so that tests that require an OOo installation (like
# smoketestoo_native) have one available:
-openoffice_$(defaultlangiso) : $$@.archive
+# openoffice_$(defaultlangiso) : $$@.archive
.IF "$(VERBOSE)"=="TRUE"
VERBOSESWITCH=-verbose
@@ -209,7 +209,7 @@ $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
.ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
.ENDIF # "$(MAKETARGETS)"!=""
openoffice_%{$(PKGFORMAT:^".") .archive} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) -log
$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 5ce50111d519..4715beabcc27 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -82,7 +82,6 @@ OpenOffice
OPENSOURCE 1
SETSTATICPATH 1
OOODOWNLOADNAME 1
- PROGRAMFILESROOT 1
XPDINSTALLER 0
BETAUPGRADECODE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
@@ -148,7 +147,6 @@ OpenOffice_wJRE
OPENSOURCE 1
SETSTATICPATH 1
OOODOWNLOADNAME 1
- PROGRAMFILESROOT 1
XPDINSTALLER 1
BETAUPGRADECODE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
@@ -220,7 +218,6 @@ OpenOffice_Dev
OPENSOURCE 1
SETSTATICPATH 1
OOODOWNLOADNAME 1
- PROGRAMFILESROOT 1
XPDINSTALLER 1
BETAUPGRADECODE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
@@ -270,7 +267,6 @@ URE
SERVICESPROJEKT 1
SETSTATICPATH 1
NOVERSIONINDIRNAME 1
- PROGRAMFILESROOT 1
PCPFILENAME ure.pcp
POOLPRODUCT 0
GLOBALFILEGID gid_File_Dl_Cppu
@@ -429,7 +425,6 @@ BrOffice
SPELLCHECKERFILE spellchecker_selection.txt
OPENSOURCE 1
OOODOWNLOADNAME 1
- PROGRAMFILESROOT 1
XPDINSTALLER 0
BETAUPGRADECODE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
@@ -500,7 +495,6 @@ BrOffice_wJRE
SPELLCHECKERFILE spellchecker_selection.txt
OPENSOURCE 1
OOODOWNLOADNAME 1
- PROGRAMFILESROOT 1
XPDINSTALLER 1
BETAUPGRADECODE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
@@ -572,7 +566,6 @@ BrOffice_Dev
SPELLCHECKERFILE spellchecker_selection.txt
OPENSOURCE 1
OOODOWNLOADNAME 1
- PROGRAMFILESROOT 1
XPDINSTALLER 1
BETAUPGRADECODE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 21:54:10 +0000