From 33b05d5de716707e54ae09afe88a7e02c63e388d Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Sat, 12 Jan 2013 13:25:10 +0100 Subject: there is no standalone URE installation ..I hope :-). URE is part of normal installation. - removes script from scp2 and unused stuff from instsetoo_native. - removes also OxygenOffice mentioned in openoffice.lst. Change-Id: I1673c06aa84ae0eb2adda2df78a50a5c5d0761c1 --- instsetoo_native/util/makefile.mk | 23 --------- instsetoo_native/util/openoffice.lst.in | 89 --------------------------------- instsetoo_native/util/pack.lst | 1 - 3 files changed, 113 deletions(-) (limited to 'instsetoo_native/util') diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index ea1022b0e248..ac26adfe5688 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -166,8 +166,6 @@ lotest: $(foreach,i,$(alllangiso) lotest_$i) lodevtest: $(foreach,i,$(alllangiso) lodevtest_$i) -ure: $(foreach,i,$(alllangiso) ure_$i) - oxygenoffice: $(foreach,i,$(alllangiso) oxygenoffice_$i) oxygenofficelanguagepack : $(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) @@ -177,7 +175,6 @@ oxygenofficehelppack : $(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i) MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates MSIHELPPACKTEMPLATESOURCE=$(PRJ)$/inc_ooohelppack$/windows$/msi_templates -MSIURETEMPLATESOURCE=$(PRJ)$/inc_ure$/windows$/msi_templates MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates MSITESTTEMPLATESOURCE=$(PRJ)$/inc_lotest$/windows$/msi_templates MSICOMMONTEMPLATESOURCE=$(PRJ)$/inc_common$/windows$/msi_templates @@ -187,7 +184,6 @@ DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates MSIHELPPACKTEMPLATEDIR=$(MISC)$/ooohelppack$/msi_templates -MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates MSITESTTEMPLATEDIR=$(MISC)$/lotest$/msi_templates @@ -217,8 +213,6 @@ $(foreach,i,$(alllangiso) lotest_$i) : $(ADDDEPS) $(foreach,i,$(alllangiso) lodevtest_$i) : $(ADDDEPS) -$(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS) - $(foreach,i,$(alllangiso) oxygenoffice_$i) : $(ADDDEPS) $(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $(ADDDEPS) @@ -278,17 +272,6 @@ lodevtest_%{$(PKGFORMAT:^".")} : $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev_Test -u $(OUT) -buildid $(BUILD) -msitemplate $(MSITESTTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) -$(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")} -ure_%{$(PKGFORMAT:^".")} : -.IF "$(OS)" == "MACOSX" - @echo 'for now, there is no standalone URE for Mac OS X' -.ELSE - $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst \ - -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p URE -u $(OUT) -buildid $(BUILD) -format $(@:e:s/.//) $(VERBOSESWITCH) \ - -msitemplate $(MSIURETEMPLATEDIR) \ - -msilanguage $(COMMONMISC)$/win_ulffiles -.ENDIF - $(foreach,i,$(alllangiso) oxygenoffice_$i) : $$@{$(PKGFORMAT:^".")} .IF "$(MAKETARGETS)"!="" .IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)" @@ -339,36 +322,30 @@ hack_msitemplates .PHONY: -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR) -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR) -$(MKDIRHIER) $(MSIHELPPACKTEMPLATEDIR) - -$(MKDIRHIER) $(MSIURETEMPLATEDIR) -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR) -$(MKDIRHIER) $(MSITESTTEMPLATEDIR) -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)$/Binary -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary -$(MKDIRHIER) $(MSIHELPPACKTEMPLATEDIR)$/Binary - -$(MKDIRHIER) $(MSIURETEMPLATEDIR)$/Binary -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary -$(MKDIRHIER) $(MSITESTTEMPLATEDIR)$/Binary $(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR) $(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR) $(GNUCOPY) -u $(MSIHELPPACKTEMPLATESOURCE)$/*.* $(MSIHELPPACKTEMPLATEDIR) - $(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR) $(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR) $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSIHELPPACKTEMPLATEDIR)$/Binary - $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSITESTTEMPLATEDIR)$/Binary $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp - $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSITESTTEMPLATEDIR)$/Binary$/Image.bmp $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp - $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSITESTTEMPLATEDIR)$/Binary$/Banner.bmp diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 5609eb8ff498..79113e45fa79 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -148,40 +148,6 @@ LibreOffice_Dev } } -URE -{ - Settings - { - downloadname URE_{productversion}_{os}_install_{languages} - variables - { - PRODUCTNAME URE - PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ - PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ - PACKAGEREVISION 1 - PRODUCTEXTENSION - BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ - SHORT_PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ - LICENSENAME LGPL - NOVERSIONINDIRNAME 1 - PCPFILENAME ure.pcp - GLOBALFILEGID gid_File_Dl_Cppu - DONTUSESTARTMENUFOLDER 1 - STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ - STARTCENTER_INFO_URL http://www.libreoffice.org/ - STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ - ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk - PACKAGEMAP package_names_ext.txt - DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ - STARTCENTER_HIDE_EXTERNAL_LINKS 0 - } - active 1 - compression 5 - script ure - include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/ure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/xml.{minor},{solarenvpath}/{os}/MS - } -} - LibreOffice_SDK { Settings @@ -349,58 +315,3 @@ LibreOffice_Dev_Test include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/cppunit,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor} } } - -OxygenOffice -{ - Settings - { - variables - { - PRODUCTNAME OxygenOffice - PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ - PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ - POSTVERSIONEXTENSION - BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ - USERDIRPRODUCTVERSION @LIBO_VERSION_MAJOR@ - ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ - ABOUTBOXPRODUCTVERSIONSUFFIX @LIBO_VERSION_SUFFIX_SUFFIX@ - BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ - PCPFILENAME openoffice.pcp - UPDATEURL http://update.libreoffice.org/check.php - ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk - ADDSYSTEMINTEGRATION 1 - FILEFORMATNAME OpenOffice.org - FILEFORMATVERSION 1.0 - WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ - PACKAGEREVISION {buildid} - LICENSENAME LGPL - SERVICESPROJEKT 1 - GLOBALFILEGID gid_File_Lib_Vcl - GLOBALPATCHFILEGID gid_File_Txt_Patchfiles - SPELLCHECKERFILE spellchecker_selection.txt - OOODOWNLOADNAME 1 - BETAUPGRADECODE - STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A} - CHANGETARGETDIR 1 - PATCHCODEFILE ooo_patchcodes.txt - PROGRESSBARCOLOR 126,170,23 - PROGRESSSIZE 430,5 - PROGRESSPOSITION 5,230 - PROGRESSFRAMECOLOR 207,208,211 - STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ - STARTCENTER_INFO_URL http://www.libreoffice.org/ - STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ - DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ - STARTCENTER_HIDE_EXTERNAL_LINKS 0 - } - active 1 - compression 5 - script setup_osl - downloadname OOOP_{productversion}_{os}_install_{languages} - langpackdownloadname OOOP_{productversion}_languagepack_{os}_install_{languages} - helppackdownloadname OOOP_{productversion}_helppack_{os}_install_{languages} - include {solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand - } -} diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst index e75bed1d2e17..381f306fa023 100644 --- a/instsetoo_native/util/pack.lst +++ b/instsetoo_native/util/pack.lst @@ -13,7 +13,6 @@ LibreOffice unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntm LibreOffice_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US sdkoo #LibreOffice_Dev_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US sdkoodev LibreOffice_Test unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US test -#URE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12 en-US ure LibreOfficeLanguagepack unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US|ar|as|ast|be|bg|bn|ca|ca-XV|cs|da|de|dz|el|en-GB|eo|es|et|eu|fi|fr|ga|gl|gu|he|hi|hu|id|is|it|ja|ka|km|kn|ko|ku|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ro|ru|sh|si|sk|sl|sr|sv|ta|te|th|tr|ug|uk|uz|vi|zh-CN|zh-TW ooolanguagepack #LibreOfficeLanguagepack unxlngi6,unxsoli4,unxsols4,wntmsci12,unxmacxi de ooolanguagepack #LibreOfficeDevLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro ar|as|ast|bg|bn|ca|ca-XV|cs|da|de|dz|el|en-GB|es|et|eu|fi|fr|ga|gl|gu|he|hi|hu|id|is|it|ja|km|kn|ko|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ru|sh|si|sk|sl|sr|sv|ta|te|th|tr|ug|uk|vi|zh-CN|zh-TW ooodevlanguagepack -- cgit