1. mst
  2. ooo340

Commits

Ingo Schmidt  committed 45f15e7

native305 #i92977# new Windows INSTALLLOCATION settings

  • Participants
  • Parent commits e4a9ffc
  • Branches default

Comments (0)

Files changed (48)

File instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt

View file
  • Ignore whitespace
 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

File instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt

View file
  • Ignore whitespace
 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

File instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt

View file
  • Ignore whitespace
 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

File instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt

View file
  • Ignore whitespace
 InstallInitialize		250
 InstallValidate		200
 ScheduleReboot	ISSCHEDULEREBOOT	375
-SetOfficeInstallLocation		410
-SetBasisInstallLocation		420
-SetUreInstallLocation		430

File instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt

View file
  • Ignore whitespace
 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

File instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt

View file
  • Ignore whitespace
 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

File instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt

View file
  • Ignore whitespace
 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

File instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt

View file
  • Ignore whitespace
 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

File instsetoo_native/inc_ure/windows/msi_templates/AdminExe.idt

View file
  • Ignore whitespace
 InstallInitialize		250
 InstallValidate		200
 ScheduleReboot	ISSCHEDULEREBOOT	375
-SetUreInstallLocation		430

File instsetoo_native/inc_ure/windows/msi_templates/CustomAc.idt

View file
  • Ignore whitespace
 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.

File instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt

View file
  • Ignore whitespace
 SelfRegModules		2850
 SelfUnregModules		1100
 SetARPInstallLocation	Not Installed	990
-SetUreInstallLocation	Not Installed	577
 SetODBCFolders		550
 StartServices	VersionNT	2800
 StopServices	VersionNT	950

File instsetoo_native/util/makefile.mk

View file
  • Ignore whitespace
 # 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
 .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:^".")}

File instsetoo_native/util/openoffice.lst

View file
  • Ignore whitespace
 			OPENSOURCE 1
 			SETSTATICPATH 1
 			OOODOWNLOADNAME 1
-			PROGRAMFILESROOT 1
 			XPDINSTALLER 0
 			BETAUPGRADECODE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 			OPENSOURCE 1
 			SETSTATICPATH 1
 			OOODOWNLOADNAME 1
-			PROGRAMFILESROOT 1
 			XPDINSTALLER 1
 			BETAUPGRADECODE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 			OPENSOURCE 1
 			SETSTATICPATH 1
 			OOODOWNLOADNAME 1
-			PROGRAMFILESROOT 1
 			XPDINSTALLER 1
 			BETAUPGRADECODE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
             SERVICESPROJEKT 1
             SETSTATICPATH 1
             NOVERSIONINDIRNAME 1
-            PROGRAMFILESROOT 1
             PCPFILENAME ure.pcp
             POOLPRODUCT 0
             GLOBALFILEGID gid_File_Dl_Cppu
 			SPELLCHECKERFILE spellchecker_selection.txt
 			OPENSOURCE 1
 			OOODOWNLOADNAME 1
-			PROGRAMFILESROOT 1
 			XPDINSTALLER 0
 			BETAUPGRADECODE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 			SPELLCHECKERFILE spellchecker_selection.txt
 			OPENSOURCE 1
 			OOODOWNLOADNAME 1
-			PROGRAMFILESROOT 1
 			XPDINSTALLER 1
 			BETAUPGRADECODE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 			SPELLCHECKERFILE spellchecker_selection.txt
 			OPENSOURCE 1
 			OOODOWNLOADNAME 1
-			PROGRAMFILESROOT 1
 			XPDINSTALLER 1
 			BETAUPGRADECODE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}

File scp2/source/javafilter/registryitem_javafilter.scp

View file
  • Ignore whitespace
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\InProcServer32";
     ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "[BASISINSTALLLOCATION]program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll";
 End
 
 RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Inprocserver32_Threadingmodel
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\InProcServer32";
     ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "[BASISINSTALLLOCATION]program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll";
 End
 
 RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Inprocserver32_Threadingmodel
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\InProcServer32";
     ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "[BASISINSTALLLOCATION]program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll";
 End
 
 RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Inprocserver32_Threadingmodel
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\InProcServer32";
     ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "[BASISINSTALLLOCATION]program\xmergesync.dll";
+    Value = "[INSTALLLOCATION]Basis\program\xmergesync.dll";
 End
 
 RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Inprocserver32_Threadingmodel

File scp2/source/ooo/common_brand.scp

View file
  • Ignore whitespace
     Section = "Bootstrap";
     Order = 4;
     Key = "UREINSTALLLOCATION";
-    Value = "[UREINSTALLLOCATION]";
+    Value = "[INSTALLLOCATION]URE\\";
     Inifiletablekey = "UreInstallLocation";
     Inifiletableaction = "1";
     Styles = (INIFILETABLE);
     Section = "Bootstrap";
     Order = 4;
     Key = "BASISINSTALLLOCATION";
-    Value = "[BASISINSTALLLOCATION]";
+    Value = "[INSTALLLOCATION]Basis\\";
     Inifiletablekey = "BasisInstallLocation";
     Inifiletableaction = "1";
     Styles = (INIFILETABLE);
     Section = "Bootstrap";
     Order = 4;
     Key = "OFFICEINSTALLLOCATION";
-    Value = "[OFFICEINSTALLLOCATION]";
+    Value = "[INSTALLLOCATION]";
     Inifiletablekey = "OfficeInstallLocation";
     Inifiletableaction = "1";
     Styles = (INIFILETABLE);

File scp2/source/ooo/ooo_brand.scp

View file
  • Ignore whitespace
   #else
     HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}";
   #endif
-    Styles = (OFFICEDIRECTORY);
+    Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION);
 End
 #endif
 

File scp2/source/ooo/registryitem_ooo.scp

View file
  • Ignore whitespace
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
-	Value = "[OFFICEINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,UPGRADEKEY);
 End
 
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
-	Value = "[OFFICEINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
-	Value = "[OFFICEINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]";
 	Styles = (ALWAYS_REQUIRED);
 End
 
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
-	Value = "[BASISINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]Basis\\";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
-	Value = "[BASISINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]Basis\\";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
-	Value = "[BASISINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]Basis\\";
 	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION);
 End
 
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
-	Value = "[BASISINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]Basis\\";
 	Styles = (ALWAYS_REQUIRED);
 End
 
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]URE\\";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]URE\\";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]URE\\";
 	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION);
 End
 
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
+	Value = "[INSTALLLOCATION]URE\\";
 	Styles = (ALWAYS_REQUIRED);
 End
 

File scp2/source/ooo/ure.scp

View file
  • Ignore whitespace
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "Software\OpenOffice.org\%PRODUCTNAME";
     Name = "Path";
-    Value = "[UREINSTALLLOCATION]";
+    Value = "[INSTALLLOCATION]";
 End

File scp2/source/ooo/ure_standalone.scp

View file
  • Ignore whitespace
   #else
     HostName = "openoffice.org";
   #endif
+    Styles = (ISINSTALLLOCATION);
 End
 
 Directory gid_Dir_Common_Ure
 	Styles = (ALWAYS_REQUIRED);
 End
 
-RegistryItem gid_Regitem_Ure_Software_Manufacturer_Productname_Productversion_Productcode_Ureinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
-	ModuleID = gid_Module_Root;
-	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED);
-End
 
-RegistryItem gid_Regitem_Ure_Software_Manufacturer_Productname_Productversion_Upgradecode_Ureinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
-	ModuleID = gid_Module_Root;
-	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED);
-End
-

File scp2/source/sdkoo/sdkoo.scp

View file
  • Ignore whitespace
 
 #ifndef MACOSX
 
+#ifdef WNT
+Directory gid_Dir_Sdkoo_Root
+    ParentID = PREDEFINED_PROGDIR;
+    HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}";
+    Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION);
+End
+#endif
+
 #ifndef WNT
 Directory gid_Dir_Ooo_Openofficeorg_Sdk
     ParentID = PREDEFINED_PROGDIR;
     DosName = "OpenOffice.org${OOOBASEVERSION}_SDK";
 #else
   #if defined WNT
-    ParentID = PREDEFINED_PROGDIR;
+    ParentID = gid_Dir_Sdkoo_Root;
   #else
     ParentID = gid_Dir_Ooo_Basis_Sdk;
   #endif

File scp2/source/winexplorerext/registryitem_winexplorerext.scp

View file
  • Ignore whitespace
     ModuleID = gid_Module_Optional_Winexplorerext;
     Styles = (X64);
     Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel
     ModuleID = gid_Module_Optional_Winexplorerext;
     Styles = (X64);
     Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel
     ModuleID = gid_Module_Optional_Winexplorerext;
     Styles = (X64);
     Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
 End
     
 RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel
     ModuleID = gid_Module_Root;
     Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
     Styles = (X64); // Values: X64 / X64_ONLY
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
     ModuleID = gid_Module_Optional_Winexplorerext;
     Styles = (X64);
     Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel
     ComponentCondition = "VersionNT >= 600";
     Styles = (X64);
     Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\propertyhdl.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll";
+    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl.dll";
+    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel

File setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx

View file
  • Ignore whitespace
 
 extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
 {
-	std::_tstring	sInstDir = GetMsiProperty( handle, TEXT("BASISINSTALLLOCATION") );
-	std::_tstring	sResourceDir = sInstDir + TEXT("program\\resource\\");
+	std::_tstring	sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
+	std::_tstring	sResourceDir = sInstDir + TEXT("Basis\\program\\resource\\");
 	std::_tstring	sPattern = sResourceDir + TEXT("vcl*.res");
 
 	WIN32_FIND_DATA	aFindFileData;

File setup_native/source/win32/customactions/languagepacks/respintest.cxx

View file
  • Ignore whitespace
 
 extern "C" UINT __stdcall GetUserInstallMode(MSIHANDLE handle)
 {
-    string sOfficeInstallPath = GetMsiProperty(handle, TEXT("OFFICEINSTALLLOCATION"));
+    string sOfficeInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
 
     // MessageBox(NULL, sOfficeInstallPath.c_str(), "DEBUG", MB_OK);
 

File setup_native/source/win32/customactions/patch/swappatchfiles.cxx

View file
  • Ignore whitespace
 extern "C" UINT __stdcall InstallPatchedFiles( MSIHANDLE handle )
 {
 	std::_tstring	sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
-	std::_tstring	sBasisInstDir = GetMsiProperty( handle, TEXT("BASISINSTALLLOCATION") );
-	std::_tstring	sProgramDir = sBasisInstDir + TEXT("program\\");
+	std::_tstring	sProgramDir = sInstDir + TEXT("Basis\\program\\");
 	std::_tstring	sPatchFile = sProgramDir + TEXT("patchlist.txt");
 
 	std::queue< std::_tstring > aSectionNames;
 	HKEY	hKey;
 	
 	std::_tstring	sInstDir;
-	std::_tstring	sBasisInstDir;
 	
 	std::_tstring	sProductKey = GetMsiProperty( handle, TEXT("FINDPRODUCT") );
 
 	if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER,  sProductKey.c_str(), &hKey ) )
 	{
-		if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("BASISINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
-		{
-			sBasisInstDir = szValue;
-		}
 		if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
 		{
 			sInstDir = szValue;
 	}
 	else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE,  sProductKey.c_str(), &hKey ) )
 	{
-		if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("BASISINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
-		{
-			sBasisInstDir = szValue;
-		}
 		if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
 		{
 			sInstDir = szValue;
 	else
 		return ERROR_SUCCESS;
 
-	std::_tstring	sProgramDir = sBasisInstDir + TEXT("program\\");
+	std::_tstring	sProgramDir = sInstDir + TEXT("Basis\\program\\");
 	std::_tstring	sPatchFile = sProgramDir + TEXT("patchlist.txt");
 
 	std::queue< std::_tstring >	aSectionNames;
 
 extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
 {
-	std::_tstring	sInstDir = GetMsiProperty( handle, TEXT("BASISINSTALLLOCATION") );
-	std::_tstring	sResourceDir = sInstDir + TEXT("program\\resource\\");
+	std::_tstring	sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
+	std::_tstring	sResourceDir = sInstDir + TEXT("Basis\\program\\resource\\");
 	std::_tstring	sPattern = sResourceDir + TEXT("vcl*.res");
 
 	WIN32_FIND_DATA	aFindFileData;
 
 	// 1. Reading Product Code from setup.ini of installed Office
 
-	std::_tstring sInstallPath = GetMsiProperty(handle, TEXT("OFFICEINSTALLLOCATION"));
-	// MessageBox(NULL, sInstallPath.c_str(), "BASISINSTALLLOCATION", MB_OK);
+	std::_tstring sInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
+	// MessageBox(NULL, sInstallPath.c_str(), "INSTALLLOCATION", MB_OK);
 	std::_tstring sSetupiniPath = sInstallPath + TEXT("program\\setup.ini");
 
 	TCHAR szProductCode[32767];
     // Online Update functionality is always available. Then the dialog
     // that offers the Online Update is superfluous.
 
-    std::_tstring sInstDir = GetMsiProperty( handle, TEXT("BASISINSTALLLOCATION") );
-    std::_tstring sProgramDir = sInstDir + TEXT("program\\");
+    std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
+    std::_tstring sProgramDir = sInstDir + TEXT("Basis\\program\\");
     std::_tstring sSearchFile = sProgramDir + TEXT("updchk.uno.dll");
 
     WIN32_FIND_DATA data;

File setup_native/source/win32/customactions/quickstarter/quickstarter.cxx

View file
  • Ignore whitespace
     DWORD sz = 0;
     LPTSTR dummy = TEXT("");
     
-    if (MsiGetProperty(handle, TEXT("OFFICEINSTALLLOCATION"), dummy, &sz) == ERROR_MORE_DATA)
+    if (MsiGetProperty(handle, TEXT("INSTALLLOCATION"), dummy, &sz) == ERROR_MORE_DATA)
     {
         sz++; // space for the final '\0'
         DWORD nbytes = sz * sizeof(TCHAR);
         LPTSTR buff = reinterpret_cast<LPTSTR>(_alloca(nbytes));
         ZeroMemory(buff, nbytes);
-        MsiGetProperty(handle, TEXT("OFFICEINSTALLLOCATION"), buff, &sz);
+        MsiGetProperty(handle, TEXT("INSTALLLOCATION"), buff, &sz);
         progpath = buff;            
     }
     return progpath;

File setup_native/source/win32/customactions/rebase/rebase.cxx

View file
  • Ignore whitespace
 
 static BOOL rebaseImages( MSIHANDLE handle, LPVOID pAddress )
 {
-	std::string sOfficeInstallPath = GetMsiProperty(handle, TEXT("OFFICEINSTALLLOCATION"));
-	std::string sBasisInstallPath = GetMsiProperty(handle, TEXT("BASISINSTALLLOCATION"));
-	std::string sUreInstallPath = GetMsiProperty(handle, TEXT("UREINSTALLLOCATION"));
+	std::string sInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
  
-	std::string sBasisDir  = sBasisInstallPath + TEXT("program\\");
-	std::string sOfficeDir = sOfficeInstallPath + TEXT("program\\");
-	std::string sUreDir    = sUreInstallPath + TEXT("bin\\");
+	std::string sBasisDir  = sInstallPath + TEXT("Basis\\program\\");
+	std::string sOfficeDir = sInstallPath + TEXT("program\\");
+	std::string sUreDir    = sInstallPath + TEXT("URE\\bin\\");
 	
 	BOOL bResult = rebaseImagesInFolder( handle, sBasisDir, pAddress );
 	bResult &= rebaseImagesInFolder( handle, sOfficeDir, pAddress );

File setup_native/source/win32/customactions/reg4msdoc/msihelper.cxx

View file
  • Ignore whitespace
 std::wstring GetOfficeInstallationPath(MSIHANDLE handle)
 {
     std::wstring progpath;
-    GetMsiProp(handle, TEXT("OFFICEINSTALLLOCATION"), progpath);
+    GetMsiProp(handle, TEXT("INSTALLLOCATION"), progpath);
     return progpath;
 }
 

File setup_native/source/win32/customactions/regactivex/regactivex.cxx

View file
  • Ignore whitespace
 BOOL GetActiveXControlPath( MSIHANDLE hMSI, char** ppActiveXPath )
 {
 	wchar_t* pProgPath = NULL;
-	if ( GetMsiProp( hMSI, L"OFFICEINSTALLLOCATION", &pProgPath ) && pProgPath )
+	if ( GetMsiProp( hMSI, L"INSTALLLOCATION", &pProgPath ) && pProgPath )
    	{
 		char* pCharProgPath = UnicodeToAnsiString( pProgPath );
 #ifdef OWN_DEBUG_PRINT

File setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx

View file
  • Ignore whitespace
     // renaming the vcl resource doesn't work reliable with OS >= Windows Vista
     if (osverinfo.dwMajorVersion < 6 )
     {
-        std::_tstring sInstDir = GetMsiProperty( handle, TEXT("BASISINSTALLLOCATION") );
+        std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
         // Property empty -> no office installed
         if ( sInstDir.length() == 0 )
             return ERROR_SUCCESS;
 
-        std::_tstring sResourceDir = sInstDir + TEXT("program\\resource\\");
+        std::_tstring sResourceDir = sInstDir + TEXT("Basis\\program\\resource\\");
         std::_tstring sPattern = sResourceDir + TEXT("vcl*.res");
 
 //        std::_tstring mystr;
     }
     else
     {
-        std::_tstring sOfficeInstallPath = GetMsiProperty(handle, TEXT("OFFICEINSTALLLOCATION"));
+        std::_tstring sOfficeInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
         // Property empty -> no office installed
         if ( sOfficeInstallPath.length() == 0 )
             return ERROR_SUCCESS;

File setup_native/source/win32/customactions/shellextensions/copyeditiondata.cxx

View file
  • Ignore whitespace
     wchar_t * end;
     boost::scoped_array<wchar_t> to(
         getProperty(
-            install, L"OFFICEINSTALLLOCATION",
+            install, L"INSTALLLOCATION",
             LCL_STRING0(L"program\\edition\0"), &end));
     if (!to) {
         return ERROR_INSTALL_FAILURE;

File setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx

View file
  • Ignore whitespace
         bool fSuccess = true;
         bool bFailIfExist = true;
 
-        std::_tstring sDestDir = GetMsiProperty( handle, TEXT("OFFICEINSTALLLOCATION") );
+        std::_tstring sDestDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
         std::_tstring sShareInstallDir = sDestDir + TEXT("share\\extension\\install\\");
 
         // creating directories

File setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx

View file
  • Ignore whitespace
     string myText = TEXT("INSTALLLOCATION: ") + property;
 	MessageBox(NULL, myText.c_str(), "INSTALLLOCATION", MB_OK);
 
-    property = GetMsiProperty(handle, TEXT("UREINSTALLLOCATION"));                
-    myText = TEXT("UREINSTALLLOCATION: ") + property;
-	MessageBox(NULL, myText.c_str(), "UREINSTALLLOCATION", MB_OK);
-
-    property = GetMsiProperty(handle, TEXT("BASISINSTALLLOCATION"));                
-    myText = TEXT("BASISINSTALLLOCATION: ") + property;
-	MessageBox(NULL, myText.c_str(), "BASISINSTALLLOCATION", MB_OK);
-
-    property = GetMsiProperty(handle, TEXT("OFFICEINSTALLLOCATION"));                
-    myText = TEXT("OFFICEINSTALLLOCATION: ") + property;
-	MessageBox(NULL, myText.c_str(), "OFFICEINSTALLLOCATION", MB_OK);
-
     property = GetMsiProperty(handle, TEXT("Installed"));                
     myText = TEXT("Installed: ") + property;
 	MessageBox(NULL, myText.c_str(), "Installed", MB_OK);

File setup_native/source/win32/customactions/shellextensions/layerlinks.cxx

View file
  • Ignore whitespace
 
 extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle)
 {
-    string sOfficeInstallPath = GetMsiProperty(handle, TEXT("OFFICEINSTALLLOCATION"));
-    string sBasisInstallPath = GetMsiProperty(handle, TEXT("BASISINSTALLLOCATION"));
-    string sUreInstallPath = GetMsiProperty(handle, TEXT("UREINSTALLLOCATION"));
+    string sInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
 
-    string sBasisLinkPath = sOfficeInstallPath + TEXT("basis-link");
-    string sUreLinkPath = sBasisInstallPath + TEXT("ure-link");
+    string sOfficeInstallPath = sInstallPath;
+    string sBasisInstallPath = sInstallPath + TEXT("Basis\\");
+    string sUreInstallPath = sInstallPath + TEXT("URE\\");
+
+    string sBasisLinkPath = sInstallPath + TEXT("basis-link");
+    string sUreLinkPath = sInstallPath + TEXT("Basis\\ure-link");
 
     if ( IsSetMsiProperty(handle, TEXT("ADMININSTALL")) )
     {
 
 extern "C" UINT __stdcall RemoveLayerLinks(MSIHANDLE handle)
 {
-    string sOfficeInstallPath = GetMsiProperty(handle, TEXT("OFFICEUNINSTALLLOCATION"));
-    string sBasisInstallPath = GetMsiProperty(handle, TEXT("BASISUNINSTALLLOCATION"));
-    string sUreInstallPath = GetMsiProperty(handle, TEXT("UREUNINSTALLLOCATION"));
+    string sInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
 
+    string sOfficeInstallPath = sInstallPath;
+    string sBasisInstallPath = sInstallPath + TEXT("Basis\\");
+    string sUreInstallPath = sInstallPath + TEXT("URE\\");
+	
     string sBasisLinkPath = sOfficeInstallPath + TEXT("basis-link");
     string sUreLinkPath = sBasisInstallPath + TEXT("ure-link");
     string sUreDirName = sUreInstallPath + TEXT("bin");

File setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx

View file
  • Ignore whitespace
 
 	if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER,  sProductKey.c_str(), &hKey ) )
 	{
-		if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("OFFICEINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
-		{
-			sInstDir = szValue;
-			MsiSetProperty(handle, TEXT("OFFICEINSTALLLOCATION"), sInstDir.c_str());                        
-			// MessageBox( NULL, sInstDir.c_str(), "Found in HKEY_CURRENT_USER", MB_OK );
-		}
-		
-		if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("BASISINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
-		{
-			sInstDir = szValue;
-			MsiSetProperty(handle, TEXT("BASISINSTALLLOCATION"), sInstDir.c_str());                        
-			// MessageBox( NULL, sInstDir.c_str(), "Found in HKEY_CURRENT_USER", MB_OK );
-		}
-
-		if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("UREINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
-		{
-			sInstDir = szValue;
-			MsiSetProperty(handle, TEXT("UREINSTALLLOCATION"), sInstDir.c_str());                        
-			// MessageBox( NULL, sInstDir.c_str(), "Found in HKEY_CURRENT_USER", MB_OK );
-		}
-
 		if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
 		{
 			sInstDir = szValue;
 	}
 	else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE,  sProductKey.c_str(), &hKey ) )
 	{
-		if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("OFFICEINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
-		{
-			sInstDir = szValue;
-			MsiSetProperty(handle, TEXT("OFFICEINSTALLLOCATION"), sInstDir.c_str());                        
-			// MessageBox( NULL, sInstDir.c_str(), "Found in HKEY_LOCAL_MACHINE", MB_OK );
-		}
-
-		if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("BASISINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
-		{
-			sInstDir = szValue;
-			MsiSetProperty(handle, TEXT("BASISINSTALLLOCATION"), sInstDir.c_str());                        
-			// MessageBox( NULL, sInstDir.c_str(), "Found in HKEY_LOCAL_MACHINE", MB_OK );
-		}
-		
-		if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("UREINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
-		{
-			sInstDir = szValue;
-			MsiSetProperty(handle, TEXT("UREINSTALLLOCATION"), sInstDir.c_str());                        
-			// MessageBox( NULL, sInstDir.c_str(), "Found in HKEY_LOCAL_MACHINE", MB_OK );
-		}
-
 		if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
 		{
 			sInstDir = szValue;

File setup_native/source/win32/customactions/shellextensions/postuninstall.cxx

View file
  • Ignore whitespace
 	
 	if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER,  sProductKey.c_str(), &hKey ) )
 	{
-		if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("OFFICEINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
+		if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
 		{
 			sInstDir = szValue;
 		}
 	}
 	else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE,  sProductKey.c_str(), &hKey ) )
 	{
-		if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("OFFICEINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
+		if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
 		{
 			sInstDir = szValue;
 		}

File setup_native/source/win32/customactions/shellextensions/registerextensions.cxx

View file
  • Ignore whitespace
 
 extern "C" UINT __stdcall RegisterExtensions(MSIHANDLE handle)
 {
-    std::_tstring sInstDir = GetMsiProperty( handle, TEXT("OFFICEINSTALLLOCATION") );
+    std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
     std::_tstring sUnoPkgFile = sInstDir + TEXT("program\\unopkg.exe");
     std::_tstring sShareInstallDir = sInstDir + TEXT("share\\extension\\install\\");
     std::_tstring sPattern = sShareInstallDir + TEXT("*.oxt");
     
     if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER,  sProductKey.c_str(), &hKey ) )
     {
-        if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("OFFICEINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
+        if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
         {
             sInstDir = szValue;
         }
     }
     else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE,  sProductKey.c_str(), &hKey ) )
     {
-        if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("OFFICEINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
+        if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
         {
             sInstDir = szValue;
         }
     
     if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER,  sProductKey.c_str(), &hKey ) )
     {
-        if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("OFFICEINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
+        if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
         {
             sInstDir = szValue;
         }
     }
     else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE,  sProductKey.c_str(), &hKey ) )
     {
-        if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("OFFICEINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
+        if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
         {
             sInstDir = szValue;
         }

File setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx

View file
  • Ignore whitespace
     
     //    MessageBox(NULL, sDesktopFile.c_str(), TEXT("OfficeMenuFolder"), MB_OK | MB_ICONINFORMATION);
     
-    std::_tstring	sIconFile = GetMsiProperty( handle, TEXT("OFFICEINSTALLLOCATION") ) + TEXT("program\\soffice.exe");
+    std::_tstring	sIconFile = GetMsiProperty( handle, TEXT("INSTALLLOCATION") ) + TEXT("program\\soffice.exe");
     
 	OSVERSIONINFO	osverinfo;
 	osverinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);

File setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx

View file
  • Ignore whitespace
 
 extern "C" UINT __stdcall RenamePrgFolder( MSIHANDLE handle )
 {
-    std::_tstring sOfficeInstallPath = GetMsiProperty(handle, TEXT("OFFICEINSTALLLOCATION"));
+    std::_tstring sOfficeInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
 
     std::_tstring sRenameSrc = sOfficeInstallPath + TEXT("program");
     std::_tstring sRenameDst = sOfficeInstallPath + TEXT("program_old");
 
-//    MessageBox(NULL, sRenameSrc.c_str(), "OFFICEINSTALLLOCATION", MB_OK);
+//    MessageBox(NULL, sRenameSrc.c_str(), "INSTALLLOCATION", MB_OK);
 
     bool bSuccess = MoveFile( sRenameSrc.c_str(), sRenameDst.c_str() );
     if ( !bSuccess )
 
 extern "C" UINT __stdcall RemovePrgFolder( MSIHANDLE handle )
 {
-    std::_tstring sOfficeInstallPath = GetMsiProperty(handle, TEXT("OFFICEINSTALLLOCATION"));
+    std::_tstring sOfficeInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
     std::_tstring sRemoveDir = sOfficeInstallPath + TEXT("program_old");
 
 //    MessageBox(NULL, sRemoveDir.c_str(), "REMOVING OLD DIR", MB_OK);

File solenv/bin/make_installer.pl

View file
  • Ignore whitespace
 		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles17c.log", $filesinproductlanguageresolvedarrayref); }
 		if ( $installer::globals::updatedatabase ) { installer::windows::file::check_file_sequences($allupdatefileorder, $allupdatecomponentorder); }
 
-		installer::windows::directory::create_directory_table($directoriesforepmarrayref, $newidtdir, $allvariableshashref, $shortdirname);
+		installer::windows::directory::create_directory_table($directoriesforepmarrayref, $newidtdir, $allvariableshashref, $shortdirname, $loggingdir);
 		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles18.log", $filesinproductlanguageresolvedarrayref); }
 		if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt1.log", $directoriesforepmarrayref); }
 
 				push(@installer::globals::logfileinfo, $infoline);
 			}
 
-			# include office directory in CustomAction table
-
-			installer::windows::idtglobal::add_officedir_to_database($languageidtdir, $allvariableshashref);
-
 			# include a component into environment table if required
 			
 			installer::windows::component::set_component_in_environment_table($languageidtdir, $filesinproductlanguageresolvedarrayref);

File solenv/bin/modules/installer/globals.pm

View file
  • Ignore whitespace
 	%spellcheckerfilehash = ();
 	$registryrootcomponent = "";
 	
+	$installlocationdirectory = "";
+	$installlocationdirectoryset = 0;
 	$officeinstalldirectory = "";
 	$officeinstalldirectoryset = 0;
 	$basisinstalldirectory = "";
 	$sundirgid = "";
 	
 	%sign_extensions = ("dll" => "1", "exe" => "1", "cab" => "1");
-	%treestyles = ("UREDIRECTORY" => "INSTALLURE", "BASISDIRECTORY" => "INSTALLBASIS", "OFFICEDIRECTORY" => "INSTALLOFFICE");
-	%installlocations = ("INSTALLLOCATION" => "1", "BASISINSTALLLOCATION" => "1", "OFFICEINSTALLLOCATION" => "1", "UREINSTALLLOCATION" => "1");
-	%treelayername = ("UREDIRECTORY" => "URE", "BASISDIRECTORY" => "BASIS", "OFFICEDIRECTORY" => "BRAND");
+	%treestyles = ();
+	%installlocations = ("INSTALLLOCATION" => "1");
+	%treelayername = ();
 	%hostnametreestyles = ();
 	%treeconditions = ();
 	%usedtreeconditions = ();

File solenv/bin/modules/installer/scriptitems.pm

View file
  • Ignore whitespace
 			$installer::globals::officedirgid = $onedir->{'gid'};
 			$allvariables->{'OFFICEDIRECTORYHOSTNAME'} = $installer::globals::officedirhostname;
 		}
-		if ( $styles =~ /\bBASISDIRECTORY\b/ )
-		{
-			$installer::globals::basisdirhostname = $onedir->{'HostName'};
-			$installer::globals::basisdirgid = $onedir->{'gid'};
-			$allvariables->{'BASISDIRECTORYHOSTNAME'} = $installer::globals::basisdirhostname;
-		}
-		if ( $styles =~ /\bUREDIRECTORY\b/ )
-		{
-			$installer::globals::uredirhostname = $onedir->{'HostName'};
-			$installer::globals::uredirgid = $onedir->{'gid'};
-			$allvariables->{'UREDIRECTORYHOSTNAME'} = $installer::globals::uredirhostname;
-		}
 		if ( $styles =~ /\bSUNDIRECTORY\b/ )
 		{
 			$installer::globals::sundirhostname = $onedir->{'HostName'};

File solenv/bin/modules/installer/windows/component.pm

View file
  • Ignore whitespace
 		}
 	
 		$uniquedir = $onedir->{'uniquename'};
+		
+		if ( $uniquedir eq $installer::globals::officeinstalldirectory )
+		{
+			$uniquedir = "INSTALLLOCATION";		
+		}
 	}
 		
 	$onefile->{'uniquedirname'} = $uniquedir;		# saving it in the file collection
 
 sub get_registry_component_directory
 {
-	my $componentdir = "";
-
-	if ( $installer::globals::officeinstalldirectoryset )
-	{
-		$componentdir = $installer::globals::officeinstalldirectory;
-	}
-	else
-	{
-		$componentdir = "INSTALLLOCATION";
-	}
+	my $componentdir = "INSTALLLOCATION";
 	
 	return $componentdir;
 }

File solenv/bin/modules/installer/windows/directory.pm

View file
  • Ignore whitespace
 		}
 		else
 		{
-			$uniqueparentname = "INSTALLLOCATION";
+			$uniqueparentname = $installer::globals::programfilesfolder;
 		}
 
 		if ( $styles =~ /\bPROGRAMFILESFOLDER\b/ ) { $uniqueparentname = $installer::globals::programfilesfolder; }
 		
 		$onedir->{'uniquename'} = $uniquename;
 		$onedir->{'uniqueparentname'} = $uniqueparentname;
-		
-		# setting the office installation directory
-		if ( $styles =~ /\bOFFICEDIRECTORY\b/ )
+
+		# setting the installlocation directory
+		if ( $styles =~ /\bISINSTALLLOCATION\b/ )
 		{
-			if ( $installer::globals::officeinstalldirectoryset ) { installer::exiter::exit_program("ERROR: Directory with flag OFFICEDIRECTORY alread set: \"$installer::globals::officeinstalldirectory\".", "create_unique_directorynames"); }
-			$installer::globals::officeinstalldirectory = $uniquename;
-			$installer::globals::officeinstalldirectoryset = 1;
-			if ( $installer::globals::officeinstalldirectory =~ /sun_/i ) { $installer::globals::sundirexists = 1; }
-		}
-
-		# setting the bais installation directory
-		if ( $styles =~ /\bBASISDIRECTORY\b/ )
-		{
-			if ( $installer::globals::basisinstalldirectoryset ) { installer::exiter::exit_program("ERROR: Directory with flag BASISDIRECTORY alread set: \"$installer::globals::basisinstalldirectory\".", "create_unique_directorynames"); }
-			$installer::globals::basisinstalldirectory = $uniquename;
-			$installer::globals::basisinstalldirectoryset = 1;
-		}
-
-		# setting the ure installation directory
-		if ( $styles =~ /\bUREDIRECTORY\b/ )
-		{
-			if ( $installer::globals::ureinstalldirectoryset ) { installer::exiter::exit_program("ERROR: Directory with flag UREDIRECTORY alread set: \"$installer::globals::ureinstalldirectory\".", "create_unique_directorynames"); }
-			$installer::globals::ureinstalldirectory = $uniquename;
-			$installer::globals::ureinstalldirectoryset = 1;
+			if ( $installer::globals::installlocationdirectoryset ) { installer::exiter::exit_program("ERROR: Directory with flag ISINSTALLLOCATION alread set: \"$installer::globals::installlocationdirectory\".", "create_unique_directorynames"); }
+			$installer::globals::installlocationdirectory = $uniquename;
+			$installer::globals::installlocationdirectoryset = 1;
+			if ( $installer::globals::installlocationdirectory =~ /oracle_/i ) { $installer::globals::sundirexists = 1; }
 		}
 	}			
 }
 
 #####################################################
+# The directory with the style ISINSTALLLOCATION
+# will be replaced by INSTALLLOCATION
+#####################################################
+
+sub set_installlocation_directory
+{
+	my ( $directoryref ) = @_;
+	
+	if ( ! $installer::globals::installlocationdirectoryset ) { installer::exiter::exit_program("ERROR: Directory with flag ISINSTALLLOCATION not set!", "set_installlocation_directory"); }
+	
+	for ( my $i = 0; $i <= $#{$directoryref}; $i++ )
+	{
+		my $onedir = ${$directoryref}[$i];
+		
+		if ( $onedir->{'uniquename'} eq $installer::globals::installlocationdirectory )
+		{
+			$onedir->{'uniquename'} = "INSTALLLOCATION";
+			
+			if (($installer::globals::addchildprojects) ||
+				($installer::globals::patch) ||
+				($installer::globals::languagepack) || 
+				($allvariableshashref->{'CHANGETARGETDIR'}))
+			{
+				
+				my $sourcediraddon = "\:\.";
+				$onedir->{'defaultdir'} = $onedir->{'defaultdir'} . $sourcediraddon;
+			}			
+		}
+		
+		if ( $onedir->{'uniqueparentname'} eq $installer::globals::installlocationdirectory )
+		{
+			$onedir->{'uniqueparentname'} = "INSTALLLOCATION";			
+		}
+	}
+}
+
+#####################################################
 # Getting the name of the top level directory. This
 # can have only one letter
 #####################################################
 sub add_root_directories
 {
 	my ($directorytableref, $allvariableshashref) = @_;
+	
+#	my $sourcediraddon = "";
+#	if (($installer::globals::addchildprojects) ||
+#		($installer::globals::patch) ||
+#		($installer::globals::languagepack) || 
+#		($allvariableshashref->{'CHANGETARGETDIR'}))
+#	{
+#		$sourcediraddon = "\:\.";
+#	}
 
-	my $oneline = "TARGETDIR\t\tSourceDir\n";
-	push(@{$directorytableref}, $oneline);
-	
-	my $sourcediraddon = "";
-	if (($installer::globals::addchildprojects) ||
-		($installer::globals::patch) ||
-		($installer::globals::languagepack) || 
-		($allvariableshashref->{'CHANGETARGETDIR'}))
+	my $oneline = "";
+
+	if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} ))
 	{
-		$sourcediraddon = "\:\.";
-	}
-
-	if (!($installer::globals::product =~ /ada/i ))	# the following directories not for ada products
-	{
-		$oneline = "$installer::globals::programfilesfolder\tTARGETDIR\t.\n";
-		push(@{$directorytableref}, $oneline);
-
-		# my $manufacturer = $installer::globals::manufacturer;
-		# my $shortmanufacturer = installer::windows::idtglobal::make_eight_three_conform($manufacturer, "dir");	# third parameter not used
-		# $shortmanufacturer =~ s/\s/\_/g;									# changing empty space to underline
-
 		my $productname = $allvariableshashref->{'PRODUCTNAME'};
 		my $productversion = $allvariableshashref->{'PRODUCTVERSION'};
 		my $baseproductversion = $productversion;
 		
 		my $shortproductkey = installer::windows::idtglobal::make_eight_three_conform($productkey, "dir");		# third parameter not used
 		$shortproductkey =~ s/\s/\_/g;									# changing empty space to underline
-
-		if ( $allvariableshashref->{'SUNDIR'} )
-		{
-			if ( $allvariableshashref->{'SUNDIRNAME'} ) { $installer::globals::sundirname = $allvariableshashref->{'SUNDIRNAME'}; }
-			$oneline = "sundirectory\t$installer::globals::programfilesfolder\t$installer::globals::sundirname$sourcediraddon\n";
-			push(@{$directorytableref}, $oneline);
-
-			$oneline = "INSTALLLOCATION\tsundirectory\t$shortproductkey|$productkey$sourcediraddon\n";
-			push(@{$directorytableref}, $oneline);			
-		}
-		else
-		{
-			if ( $allvariableshashref->{'PROGRAMFILESROOT'} )
-			{
-				$oneline = "INSTALLLOCATION\t$installer::globals::programfilesfolder\t.\n";
-			}
-			else
-			{
-				$oneline = "INSTALLLOCATION\t$installer::globals::programfilesfolder\t$shortproductkey|$productkey$sourcediraddon\n";
-			}
-
-			push(@{$directorytableref}, $oneline);
-		}
-
-		$oneline = "$installer::globals::programmenufolder\tTARGETDIR\t.\n";
-		push(@{$directorytableref}, $oneline);			
-
-		if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} ))
-		{
-			$oneline = "$installer::globals::officemenufolder\t$installer::globals::programmenufolder\t$shortproductkey|$realproductkey\n";
-			push(@{$directorytableref}, $oneline);
-		}
-
-		$oneline = "$installer::globals::startupfolder\tTARGETDIR\t.\n";
-		push(@{$directorytableref}, $oneline);
-
-		$oneline = "$installer::globals::desktopfolder\tTARGETDIR\t.\n";
-		push(@{$directorytableref}, $oneline);
-
-		$oneline = "$installer::globals::startmenufolder\tTARGETDIR\t.\n";
-		push(@{$directorytableref}, $oneline);
-
-		$oneline = "$installer::globals::commonfilesfolder\tTARGETDIR\t.\n";
-		push(@{$directorytableref}, $oneline);
-
-		$oneline = "$installer::globals::commonappdatafolder\tTARGETDIR\t.\n";
-		push(@{$directorytableref}, $oneline);
-
-		$oneline = "$installer::globals::localappdatafolder\tTARGETDIR\t.\n";
-		push(@{$directorytableref}, $oneline);
-		
-		if ( $installer::globals::usesharepointpath )
-		{
-			$oneline = "SHAREPOINTPATH\tTARGETDIR\t.\n";
-			push(@{$directorytableref}, $oneline);
-		}
-
-		$oneline = "$installer::globals::systemfolder\tTARGETDIR\t.\n";
-		push(@{$directorytableref}, $oneline);
-
-		my $localtemplatefoldername = $installer::globals::templatefoldername;
-		my $directorytableentry = $localtemplatefoldername;
-		my $shorttemplatefoldername = installer::windows::idtglobal::make_eight_three_conform($localtemplatefoldername, "dir");
-		if ( $shorttemplatefoldername ne $localtemplatefoldername ) { $directorytableentry = "$shorttemplatefoldername|$localtemplatefoldername"; }
-		$oneline = "$installer::globals::templatefolder\tTARGETDIR\t$directorytableentry\n";
-		push(@{$directorytableref}, $oneline);
-
-		if ( $installer::globals::fontsdirname )
-		{
-			$oneline = "$installer::globals::fontsfolder\t$installer::globals::fontsdirparent\t$installer::globals::fontsfoldername\:$installer::globals::fontsdirname\n";
-		}
-		else
-		{
-			$oneline = "$installer::globals::fontsfolder\tTARGETDIR\t$installer::globals::fontsfoldername\n";
-		}
-
+			
+		$oneline = "$installer::globals::officemenufolder\t$installer::globals::programmenufolder\t$shortproductkey|$realproductkey\n";
 		push(@{$directorytableref}, $oneline);
 	}
 
+	$oneline = "TARGETDIR\t\tSourceDir\n";
+	push(@{$directorytableref}, $oneline);
+
+	$oneline = "$installer::globals::programfilesfolder\tTARGETDIR\t.\n";
+	push(@{$directorytableref}, $oneline);
+
+	$oneline = "$installer::globals::programmenufolder\tTARGETDIR\t.\n";
+	push(@{$directorytableref}, $oneline);			
+
+	$oneline = "$installer::globals::startupfolder\tTARGETDIR\t.\n";
+	push(@{$directorytableref}, $oneline);
+
+	$oneline = "$installer::globals::desktopfolder\tTARGETDIR\t.\n";
+	push(@{$directorytableref}, $oneline);
+
+	$oneline = "$installer::globals::startmenufolder\tTARGETDIR\t.\n";
+	push(@{$directorytableref}, $oneline);
+
+	$oneline = "$installer::globals::commonfilesfolder\tTARGETDIR\t.\n";
+	push(@{$directorytableref}, $oneline);
+
+	$oneline = "$installer::globals::commonappdatafolder\tTARGETDIR\t.\n";
+	push(@{$directorytableref}, $oneline);
+
+	$oneline = "$installer::globals::localappdatafolder\tTARGETDIR\t.\n";
+	push(@{$directorytableref}, $oneline);
+		
+	if ( $installer::globals::usesharepointpath )
+	{
+		$oneline = "SHAREPOINTPATH\tTARGETDIR\t.\n";
+		push(@{$directorytableref}, $oneline);
+	}
+
+	$oneline = "$installer::globals::systemfolder\tTARGETDIR\t.\n";
+	push(@{$directorytableref}, $oneline);
+
+	my $localtemplatefoldername = $installer::globals::templatefoldername;
+	my $directorytableentry = $localtemplatefoldername;
+	my $shorttemplatefoldername = installer::windows::idtglobal::make_eight_three_conform($localtemplatefoldername, "dir");
+	if ( $shorttemplatefoldername ne $localtemplatefoldername ) { $directorytableentry = "$shorttemplatefoldername|$localtemplatefoldername"; }
+	$oneline = "$installer::globals::templatefolder\tTARGETDIR\t$directorytableentry\n";
+	push(@{$directorytableref}, $oneline);
+
+	if ( $installer::globals::fontsdirname )
+	{
+		$oneline = "$installer::globals::fontsfolder\t$installer::globals::fontsdirparent\t$installer::globals::fontsfoldername\:$installer::globals::fontsdirname\n";
+	}
+	else
+	{
+		$oneline = "$installer::globals::fontsfolder\tTARGETDIR\t$installer::globals::fontsfoldername\n";
+	}
+
+	push(@{$directorytableref}, $oneline);
+
 }
 
 ###############################################
 
 sub create_directory_table
 {
-	my ($directoryref, $basedir, $allvariableshashref, $shortdirnamehashref) = @_;
+	my ($directoryref, $basedir, $allvariableshashref, $shortdirnamehashref, $loggingdir) = @_;
 
 	# Structure of the directory table:
 	# Directory Directory_Parent DefaultDir
 	
 	overwrite_programfilesfolder($allvariableshashref);
 	create_unique_directorynames($directoryref);
+	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_1.log", $directoryref); }
 	create_defaultdir_directorynames($directoryref, $shortdirnamehashref);	# only destdir!
+	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_2.log", $directoryref); }
+	set_installlocation_directory($directoryref);
+	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_3.log", $directoryref); }
 	installer::windows::idtglobal::write_idt_header(\@directorytable, "directory");
 	add_root_directories(\@directorytable, $allvariableshashref);
 	create_directorytable_from_collection(\@directorytable, $directoryref);

File solenv/bin/modules/installer/windows/idtglobal.pm

View file
  • Ignore whitespace
 			installer::exiter::exit_program("ERROR: \"OFFICEDIRECTORYGID\" not found in \"$customactionfilename\" !", "add_officedir_to_database");
 		}		
 	}
-
-	if ( $installer::globals::basisinstalldirectoryset )
-	{
-		$found = 0;
-		
-		for ( my $i = 0; $i <= $#{$customacfile}; $i++ )
-		{
-			if ( ${$customacfile}[$i] =~ /\bBASISDIRECTORYGID\b/ )
-			{
-				${$customacfile}[$i] =~ s/\bBASISDIRECTORYGID\b/$installer::globals::basisinstalldirectory/;
-				$found = 1;
-			}
-		}
-
-		if (( ! $found ) && ( ! $allvariables->{'IGNOREDIRECTORYLAYER'} ))
-		{
-			installer::exiter::exit_program("ERROR: \"BASISDIRECTORYGID\" not found in \"$customactionfilename\" !", "add_officedir_to_database");
-		}		
-	}
-
-	if ( $installer::globals::ureinstalldirectoryset )
-	{
-		$found = 0;
-		
-		for ( my $i = 0; $i <= $#{$customacfile}; $i++ )
-		{
-			if ( ${$customacfile}[$i] =~ /\bUREDIRECTORYGID\b/ )
-			{
-				${$customacfile}[$i] =~ s/\bUREDIRECTORYGID\b/$installer::globals::ureinstalldirectory/;
-				$found = 1;
-			}
-		}
-		
-		if (( ! $found ) && ( ! $allvariables->{'IGNOREDIRECTORYLAYER'} ))
-		{
-			installer::exiter::exit_program("ERROR: \"UREDIRECTORYGID\" not found in \"$customactionfilename\" !", "add_officedir_to_database");
-		}		
-	}
 	
 	# Saving the file
 	

File solenv/bin/modules/installer/windows/property.pm

View file
  • Ignore whitespace
 		push(@{$propertyfile}, $onepropertyline);		
 	}
 
-	if ( $installer::globals::basisdirhostname )
-	{
-		my $onepropertyline = "BASISDIRHOSTNAME" . "\t" . $installer::globals::basisdirhostname . "\n";
-		push(@{$propertyfile}, $onepropertyline);		
-	}
-
-	if ( $installer::globals::uredirhostname )
-	{
-		my $onepropertyline = "UREDIRHOSTNAME" . "\t" . $installer::globals::uredirhostname . "\n";
-		push(@{$propertyfile}, $onepropertyline);		
-	}
-
 	if ( $installer::globals::sundirhostname )
 	{
 		my $onepropertyline = "SUNDIRHOSTNAME" . "\t" . $installer::globals::sundirhostname . "\n";

File solenv/bin/modules/installer/windows/registry.pm

View file
  • Ignore whitespace
 	if ( $registry->{'Value'} ) { $value = $registry->{'Value'}; }
 	
 	$value =~ s/\\\"/\"/g;	# no more masquerading of '"'
-	$value =~ s/\<progpath\>/\[OFFICEINSTALLLOCATION\]/;
-	$value =~ s/\[OFFICEINSTALLLOCATION\]\\/\[OFFICEINSTALLLOCATION\]/;	# removing "\" after "[OFFICEINSTALLLOCATION]"
+	$value =~ s/\<progpath\>/\[INSTALLLOCATION\]/;
+	$value =~ s/\[INSTALLLOCATION\]\\/\[INSTALLLOCATION\]/;	# removing "\" after "[INSTALLLOCATION]"
 
 	if ( $value =~ /\%/ ) { $value = installer::worker::replace_variables_in_string($value, $allvariableshashref); }
 
 	if ( $registry->{'Val64'} ) { $value = $registry->{'Val64'}; }
 	
 	$value =~ s/\\\"/\"/g;	# no more masquerading of '"'
-	$value =~ s/\<progpath\>/\[OFFICEINSTALLLOCATION\]/;
-	$value =~ s/\[OFFICEINSTALLLOCATION\]\\/\[OFFICEINSTALLLOCATION\]/;	# removing "\" after "[OFFICEINSTALLLOCATION]"
+	$value =~ s/\<progpath\>/\[INSTALLLOCATION\]/;
+	$value =~ s/\[INSTALLLOCATION\]\\/\[INSTALLLOCATION\]/;	# removing "\" after "[INSTALLLOCATION]"
 
 	if ( $value =~ /\%/ ) { $value = installer::worker::replace_variables_in_string($value, $allvariableshashref); }
 

File solenv/bin/modules/installer/windows/shortcut.pm

View file
  • Ignore whitespace
 	
 	$directory = $onedir->{'uniquename'};
 
-	if ($directory eq "") { $directory = "OFFICEINSTALLLOCATION"; }		# Shortcuts in the root directory
+	if ($directory eq "") { $directory = "INSTALLLOCATION"; }		# Shortcuts in the root directory
 	
 	return $directory;
 }
 
 		$directory = $onedir->{'uniquename'};
 
-		if ($directory eq "") { $directory = "OFFICEINSTALLLOCATION"; }
+		if ($directory eq "") { $directory = "INSTALLLOCATION"; }
 	}
 
 	return $directory;	

File solenv/bin/modules/installer/worker.pm

View file
  • Ignore whitespace
 				if ( $registryitem->{'Value'} ) { $value = $registryitem->{'Value'}; }
 				if ( $value =~ /\<progpath\>/ ) { $value =~ s/\\\"/\"\"/g; } # Quoting for INF is done by double "" 
 				$value =~ s/\\\"/\"/g;	# no more masquerading of '"'
-				$value =~ s/\<progpath\>/\%OFFICEINSTALLLOCATION\%/g;  
-				# $value =~ s/\%OFFICEINSTALLLOCATION\%\\/\%OFFICEINSTALLLOCATION\%/g;  	# removing "\" after "%OFFICEINSTALLLOCATION%"
+				$value =~ s/\<progpath\>/\%INSTALLLOCATION\%/g;  
 				if ( $value ne "" ) { $value = "\"" . $value . "\""; }
 
 				my $oneline = $regroot . "," . $subkey . "," . $valueentryname . "," . $flag . "," . $value . "\n";