[Libreoffice-commits] .: 2 commits - desktop/source instsetoo_native/util
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Dec 8 06:21:43 PST 2011
desktop/source/app/app.cxx | 1
instsetoo_native/util/makefile.mk | 10 ------
instsetoo_native/util/openoffice.lst | 57 -----------------------------------
instsetoo_native/util/pack.lst | 1
4 files changed, 2 insertions(+), 67 deletions(-)
New commits:
commit 9a18da1e45a5aa89038d08fbd76a8d457e34b608
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Dec 8 16:18:58 2011 +0200
There is no LibreOffice with bundled JRE and won't be
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 907b2e7..64707d8 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -150,8 +150,6 @@ openoffice: $(foreach,i,$(alllangiso) openoffice_$i)
openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
-openofficewithjre: $(foreach,i,$(alllangiso) openofficewithjre_$i)
-
ooolanguagepack : $(foreach,i,$(alllangiso) ooolanguagepack_$i)
ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i)
@@ -205,8 +203,6 @@ openoffice_$(defaultlangiso).archive : $(ADDDEPS)
$(foreach,i,$(alllangiso) openofficedev_$i) : $(ADDDEPS)
-$(foreach,i,$(alllangiso) openofficewithjre_$i) : $(ADDDEPS)
-
$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $(ADDDEPS)
@@ -248,10 +244,6 @@ openoffice_%{$(PKGFORMAT:^".") .archive} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
-openofficewithjre_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-
$(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
openofficedev_%{$(PKGFORMAT:^".")} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
@@ -332,7 +324,7 @@ openoffice:
.IF "$(DISABLE_PYTHON)" != "TRUE"
.IF "$(LOCALPYFILES)"!=""
-$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} lotest_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
+$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} lotest_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
.ENDIF # "$(LOCALPYFILES)"!=""
.IF "$(GUI)"!="WNT"
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 0cfafc5..72caad8 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -101,63 +101,6 @@ LibreOffice
}
}
-LibreOffice_wJRE
-{
- Settings
- {
- variables
- {
- PRODUCTNAME LibreOffice
- PRODUCTVERSION 3.5
- PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta0
- POSTVERSIONEXTENSION
- POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3.5
- USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.5.0
- BASEPRODUCTVERSION 3.5
- UPDATEURL http://update.libreoffice.org/check.php
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
- REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
- ADDSYSTEMINTEGRATION 1
- EVAL
- FILEFORMATNAME OpenOffice.org
- FILEFORMATVERSION 1.0
- WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.5.0
- PACKAGEREVISION {buildid}
- LICENSENAME LGPL
- WITHJREPRODUCT 1
- GLOBALFILEGID gid_File_Lib_Vcl
- GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
- SPELLCHECKERFILE spellchecker_selection.txt
- SETSTATICPATH 1
- OOODOWNLOADNAME 1
- XPDINSTALLER 1
- BETAUPGRADECODE
- STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
- CHANGETARGETDIR 1
- USE_FILEVERSION 1
- LIBRARYVERSION 9.4.0
- PATCHCODEFILE ooo_patchcodes.txt
- JAVAPRODUCT 1
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
- STARTCENTER_INFO_URL http://www.libreoffice.org/
- STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
- STARTCENTER_LAYOUT_STYLE 0
- DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
- }
- active 1
- compression 5
- script setup_osljre
- downloadname LibO_{productversion}_{os}_installwjre_{languages}
- include {solarenvpath}/{os}/loader2,.,{localpath}/bin,{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},../../external/common,{solarenvpath}/{os}/OOo_external
- }
-}
-
LibreOffice_Dev
{
Settings
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index c7e1834..e75bed1 100644
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -9,7 +9,6 @@
LibreOffice unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US|ar|bg|bn|ca|ca-XV|cs|da|de|el|en-GB|es|et|eu|fi|fr|ga|gl|he|hu|it|ja|km|ko|lt|mk|nb|nl|om|pl|pt|pt-BR|ru|sh|sl|sr|sv|tr|vi|zh-CN|zh-TW openoffice
#LibreOffice unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US openoffice
-LibreOffice_wJRE unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US|ar|bg|bn|ca|ca-XV|cs|da|de|el|en-GB|es|et|eu|fi|fr|ga|gl|he|hu|it|ja|km|ko|lt|mk|nb|nl|om|pl|pt|pt-BR|ru|sh|sl|sr|sv|tr|vi|zh-CN|zh-TW openofficewithjre
#LibreOffice_Dev unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro en-US openofficedev
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
commit dfc4e8223ce5590803b17540fc05dc1824a34faa
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Dec 8 13:44:04 2011 +0200
Fix Windows build
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 381508c..61c3832 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -29,6 +29,7 @@
#include "app.hxx"
#include "desktop.hrc"
#include "cmdlineargs.hxx"
+#include "cmdlinehelp.hxx"
#include "dispatchwatcher.hxx"
#include "configinit.hxx"
#include "lockfile.hxx"
More information about the Libreoffice-commits
mailing list