diff options
| author | Ingo Schmidt <is@openoffice.org> | 2010-05-26 14:44:44 +0200 |
|---|---|---|
| committer | Ingo Schmidt <is@openoffice.org> | 2010-05-26 14:44:44 +0200 |
| commit | 1e96d7d75ab2fd674d80788d7ebd52ce97fb0d17 (patch) | |
| tree | f6b82d265ded20ee1f5c3b10061bdff632ca9884 /instsetoo_native/util | |
| parent | ff94b38b00f90b4fbc8f49d132d46f27c537e143 (diff) | |
native305 #i92977# new Windows INSTALLLOCATION settings
Diffstat (limited to 'instsetoo_native/util')
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 4 | ||||
| -rw-r--r-- | instsetoo_native/util/openoffice.lst | 7 |
2 files changed, 2 insertions, 9 deletions
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} |