Skip to content

C
core
Kaydet (Commit) 1e96d7d7 authored tarafından Ingo Schmidt's avatar Ingo Schmidt
Dosyalara gözat
Seçenekler

native305 #i92977# new Windows INSTALLLOCATION settings

üst ff94b38b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 184 deletions
instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
Dosyayı görüntüle @ 1e96d7d7
......@@ -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
......
instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
Dosyayı görüntüle @ 1e96d7d7
......@@ -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
instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
Dosyayı görüntüle @ 1e96d7d7
......@@ -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
......
instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
Dosyayı görüntüle @ 1e96d7d7
......@@ -11,6 +11,3 @@ InstallFinalize 400
InstallInitialize 250
InstallValidate 200
ScheduleReboot ISSCHEDULEREBOOT 375
SetOfficeInstallLocation 410
SetBasisInstallLocation 420
SetUreInstallLocation 430
instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
Dosyayı görüntüle @ 1e96d7d7
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
instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
Dosyayı görüntüle @ 1e96d7d7
......@@ -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
......
instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
Dosyayı görüntüle @ 1e96d7d7
......@@ -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
......
instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
Dosyayı görüntüle @ 1e96d7d7
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
instsetoo_native/inc_ure/windows/msi_templates/AdminExe.idt
Dosyayı görüntüle @ 1e96d7d7
......@@ -11,4 +11,3 @@ InstallFinalize 400
InstallInitialize 250
InstallValidate 200
ScheduleReboot ISSCHEDULEREBOOT 375
SetUreInstallLocation 430
instsetoo_native/inc_ure/windows/msi_templates/CustomAc.idt
Dosyayı görüntüle @ 1e96d7d7
......@@ -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.
instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt
Dosyayı görüntüle @ 1e96d7d7
......@@ -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
......
instsetoo_native/util/makefile.mk
Dosyayı görüntüle @ 1e96d7d7
......@@ -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:^".")}
......
instsetoo_native/util/openoffice.lst
Dosyayı görüntüle @ 1e96d7d7
......@@ -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}
......
scp2/source/javafilter/registryitem_javafilter.scp
Dosyayı görüntüle @ 1e96d7d7
......@@ -46,7 +46,7 @@ RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Inprocserv
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
......@@ -106,7 +106,7 @@ RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Inprocserv
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
......@@ -166,7 +166,7 @@ RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Inprocserv
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
......@@ -226,7 +226,7 @@ RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Inprocserv
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
......
scp2/source/ooo/common_brand.scp
Dosyayı görüntüle @ 1e96d7d7
......@@ -1190,7 +1190,7 @@ ProfileItem gid_Brand_Profileitem_Setup_Ureinstall
Section = "Bootstrap";
Order = 4;
Key = "UREINSTALLLOCATION";
Value = "[UREINSTALLLOCATION]";
Value = "[INSTALLLOCATION]URE\\";
Inifiletablekey = "UreInstallLocation";
Inifiletableaction = "1";
Styles = (INIFILETABLE);
......@@ -1204,7 +1204,7 @@ ProfileItem gid_Brand_Profileitem_Setup_Basisinstall
Section = "Bootstrap";
Order = 4;
Key = "BASISINSTALLLOCATION";
Value = "[BASISINSTALLLOCATION]";
Value = "[INSTALLLOCATION]Basis\\";
Inifiletablekey = "BasisInstallLocation";
Inifiletableaction = "1";
Styles = (INIFILETABLE);
......@@ -1218,7 +1218,7 @@ ProfileItem gid_Brand_Profileitem_Setup_Officeinstall
Section = "Bootstrap";
Order = 4;
Key = "OFFICEINSTALLLOCATION";
Value = "[OFFICEINSTALLLOCATION]";
Value = "[INSTALLLOCATION]";
Inifiletablekey = "OfficeInstallLocation";
Inifiletableaction = "1";
Styles = (INIFILETABLE);
......
scp2/source/ooo/ooo_brand.scp
Dosyayı görüntüle @ 1e96d7d7
......@@ -35,7 +35,7 @@ Directory gid_Dir_Brand_Root
#else
HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}";
#endif
Styles = (OFFICEDIRECTORY);
Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION);
End
#endif
......
scp2/source/ooo/registryitem_ooo.scp
Dosyayı görüntüle @ 1e96d7d7
......@@ -289,7 +289,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
ModuleID = gid_Module_Root;
Name = "OFFICEINSTALLLOCATION";
Value = "[OFFICEINSTALLLOCATION]";
Value = "[INSTALLLOCATION]";
Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,UPGRADEKEY);
End
......@@ -307,7 +307,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
ModuleID = gid_Module_Root;
Name = "OFFICEINSTALLLOCATION";
Value = "[OFFICEINSTALLLOCATION]";
Value = "[INSTALLLOCATION]";
Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
......@@ -325,7 +325,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "OFFICEINSTALLLOCATION";
Value = "[OFFICEINSTALLLOCATION]";
Value = "[INSTALLLOCATION]";
Styles = (ALWAYS_REQUIRED);
End
......@@ -334,7 +334,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
Value = "[BASISINSTALLLOCATION]";
Value = "[INSTALLLOCATION]Basis\\";
Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
......@@ -343,7 +343,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
Value = "[BASISINSTALLLOCATION]";
Value = "[INSTALLLOCATION]Basis\\";
Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
......@@ -352,7 +352,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
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
......@@ -361,7 +361,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstal
Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
Value = "[BASISINSTALLLOCATION]";
Value = "[INSTALLLOCATION]Basis\\";
Styles = (ALWAYS_REQUIRED);
End
......@@ -370,7 +370,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
ModuleID = gid_Module_Root;
Name = "UREINSTALLLOCATION";
Value = "[UREINSTALLLOCATION]";
Value = "[INSTALLLOCATION]URE\\";
Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
......@@ -379,7 +379,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
ModuleID = gid_Module_Root;
Name = "UREINSTALLLOCATION";
Value = "[UREINSTALLLOCATION]";
Value = "[INSTALLLOCATION]URE\\";
Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
......@@ -388,7 +388,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
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
......@@ -397,7 +397,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "UREINSTALLLOCATION";
Value = "[UREINSTALLLOCATION]";
Value = "[INSTALLLOCATION]URE\\";
Styles = (ALWAYS_REQUIRED);
End
......
scp2/source/ooo/ure.scp
Dosyayı görüntüle @ 1e96d7d7
......@@ -1263,5 +1263,5 @@ RegistryItem gid_Regitem_Path
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = "Software\OpenOffice.org\%PRODUCTNAME";
Name = "Path";
Value = "[UREINSTALLLOCATION]";
Value = "[INSTALLLOCATION]";
End
scp2/source/ooo/ure_standalone.scp
Dosyayı görüntüle @ 1e96d7d7
......@@ -46,6 +46,7 @@ Directory gid_Dir_Ooo_Openofficeorg
#else
HostName = "openoffice.org";
#endif
Styles = (ISINSTALLLOCATION);
End
Directory gid_Dir_Common_Ure
......@@ -105,21 +106,4 @@ RegistryItem gid_Regitem_Ure_Software_Manufacturer_Productname_Productversion_Up
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
scp2/source/sdkoo/sdkoo.scp
Dosyayı görüntüle @ 1e96d7d7
......@@ -46,6 +46,14 @@ End
#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;
......@@ -77,7 +85,7 @@ Directory gid_Dir_Basis_Sdk
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
......
scp2/source/winexplorerext/registryitem_winexplorerext.scp 100755 → 100644
Dosyayı görüntüle @ 1e96d7d7
......@@ -35,8 +35,8 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer
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
......@@ -58,8 +58,8 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer
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
......@@ -90,8 +90,8 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer
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
......@@ -124,8 +124,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
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
......@@ -167,8 +167,8 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
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
......@@ -201,8 +201,8 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer
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
......
solenv/bin/make_installer.pl
Dosyayı görüntüle @ 1e96d7d7
......@@ -1982,7 +1982,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
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); }
......@@ -2143,10 +2143,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
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);
......
solenv/bin/modules/installer/globals.pm
Dosyayı görüntüle @ 1e96d7d7
......@@ -378,6 +378,8 @@ BEGIN
%spellcheckerfilehash = ();
$registryrootcomponent = "";
$installlocationdirectory = "";
$installlocationdirectoryset = 0;
$officeinstalldirectory = "";
$officeinstalldirectoryset = 0;
$basisinstalldirectory = "";
......@@ -396,9 +398,9 @@ BEGIN
$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 = ();
......
solenv/bin/modules/installer/scriptitems.pm
Dosyayı görüntüle @ 1e96d7d7
......@@ -541,18 +541,6 @@ sub set_global_directory_hostnames
$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'};
......
solenv/bin/modules/installer/windows/component.pm
Dosyayı görüntüle @ 1e96d7d7
......@@ -162,6 +162,11 @@ sub get_file_component_directory
}
$uniquedir = $onedir->{'uniquename'};
if ( $uniquedir eq $installer::globals::officeinstalldirectory )
{
$uniquedir = "INSTALLLOCATION";
}
}
$onefile->{'uniquedirname'} = $uniquedir; # saving it in the file collection
......@@ -176,16 +181,7 @@ sub get_file_component_directory
sub get_registry_component_directory
{
my $componentdir = "";
if ( $installer::globals::officeinstalldirectoryset )
{
$componentdir = $installer::globals::officeinstalldirectory;
}
else
{
$componentdir = "INSTALLLOCATION";
}
my $componentdir = "INSTALLLOCATION";
return $componentdir;
}
......
solenv/bin/modules/installer/windows/idtglobal.pm
Dosyayı görüntüle @ 1e96d7d7
......@@ -1023,44 +1023,6 @@ sub 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
installer::files::save_file($customactionfilename ,$customacfile);
......
solenv/bin/modules/installer/windows/property.pm
Dosyayı görüntüle @ 1e96d7d7
......@@ -318,18 +318,6 @@ sub set_important_properties
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";
......
solenv/bin/modules/installer/windows/registry.pm
Dosyayı görüntüle @ 1e96d7d7
......@@ -203,8 +203,8 @@ sub get_registry_value
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); }
......@@ -224,8 +224,8 @@ sub get_registry_val64
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); }
......
solenv/bin/modules/installer/windows/shortcut.pm
Dosyayı görüntüle @ 1e96d7d7
......@@ -111,7 +111,7 @@ sub get_shortcut_directory
$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;
}
......@@ -343,7 +343,7 @@ sub get_folderitem_wkdir
$directory = $onedir->{'uniquename'};
if ($directory eq "") { $directory = "OFFICEINSTALLLOCATION"; }
if ($directory eq "") { $directory = "INSTALLLOCATION"; }
}
return $directory;
......
solenv/bin/modules/installer/worker.pm
Dosyayı görüntüle @ 1e96d7d7
......@@ -1059,8 +1059,7 @@ sub write_content_into_inf_file
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";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment