[Libreoffice-commits] core.git: 22 commits - external/misc_extensions external/Module_external.mk extras/Module_extras.mk extras/Package_extensions.mk instsetoo_native/util languagetool/ExtensionPackage_LanguageTool.mk languagetool/Module_languagetool.mk languagetool/Package_languagetool.mk Makefile.in odk/Module_odk.mk odk/Package_config.mk odk/Package_config_notwin.mk odk/Package_share_readme_generated.mk odk/Package_share_readme.mk readlicense_oo/Module_readlicense_oo.mk readlicense_oo/Package_files.mk readlicense_oo/Package_license.mk readlicense_oo/Package_readme.mk scp2/InstallModule_extensions.mk scp2/source setup_native/Module_setup_native.mk setup_native/Package_misc.mk setup_native/Package_packinfo.mk setup_native/Package_scripts_generated.mk setup_native/Package_scripts.mk setup_native/Package_ulf.mk setup_native/scripts setup_native/source solenv/bin solenv/gbuild sysui/Module_sysui.mk sysui/Package_desktop.mk
Michael Stahl
mstahl at redhat.com
Thu Oct 31 10:46:17 CET 2013
Makefile.in | 2
dev/null |binary
external/Module_external.mk | 1
external/misc_extensions/ExtensionPackageSet_misc_extensions.mk | 68 +
external/misc_extensions/Makefile | 7
external/misc_extensions/Module_misc_extensions.mk | 16
external/misc_extensions/README | 1
extras/Module_extras.mk | 6
extras/Package_extensions.mk | 59 -
instsetoo_native/util/openoffice.lst.in | 8
languagetool/ExtensionPackage_LanguageTool.mk | 14
languagetool/Module_languagetool.mk | 2
languagetool/Package_languagetool.mk | 18
odk/Module_odk.mk | 5
odk/Package_config.mk | 16
odk/Package_config_notwin.mk | 19
odk/Package_share_readme.mk | 11
odk/Package_share_readme_generated.mk | 19
readlicense_oo/Module_readlicense_oo.mk | 2
readlicense_oo/Package_files.mk | 13
readlicense_oo/Package_license.mk | 4
readlicense_oo/Package_readme.mk | 20
scp2/InstallModule_extensions.mk | 1
scp2/source/extensions/directory_extensions.scp | 185 ---
scp2/source/extensions/file_extensions.scp | 70 -
scp2/source/ooo/file_ooo.scp | 27
scp2/source/ooo/scpaction_ooo.scp | 2
scp2/source/sdkoo/sdkoo.scp | 17
setup_native/Module_setup_native.mk | 9
setup_native/Package_misc.mk | 15
setup_native/Package_packinfo.mk | 27
setup_native/Package_scripts.mk | 14
setup_native/Package_scripts_generated.mk | 25
setup_native/Package_ulf.mk | 16
setup_native/scripts/javaloader.sh | 565 ----------
setup_native/scripts/update.sh | 212 ---
setup_native/source/linux/root3.dat | 4
setup_native/source/linux/root4.dat | 4
setup_native/source/linux/root5.dat | 4
setup_native/source/packinfo/DS_Store |binary
setup_native/source/packinfo/DS_Store_Dev |binary
setup_native/source/packinfo/DS_Store_Langpack |binary
setup_native/source/packinfo/osxdndinstall.png |binary
setup_native/source/packinfo/packinfo_office.txt | 1
setup_native/source/packinfo/shellscripts.txt | 11
setup_native/source/packinfo/shellscripts_core01.txt | 87 -
setup_native/source/packinfo/shellscripts_root.txt | 11
solenv/bin/modules/installer/control.pm | 1
solenv/bin/modules/installer/download.pm | 19
solenv/bin/modules/installer/environment.pm | 9
solenv/bin/modules/installer/globals.pm | 2
solenv/bin/modules/installer/languagepack.pm | 9
solenv/bin/modules/installer/simplepackage.pm | 26
solenv/gbuild/ExtensionPackage.mk | 91 +
solenv/gbuild/Helper.mk | 15
solenv/gbuild/InstallScript.mk | 74 -
solenv/gbuild/Package.mk | 1
solenv/gbuild/TargetLocations.mk | 14
solenv/gbuild/gbuild.mk | 1
solenv/gbuild/platform/IOS_ARM_GCC.mk | 2
solenv/gbuild/platform/com_MSC_class.mk | 2
solenv/gbuild/platform/macosx.mk | 2
solenv/gbuild/platform/mingw.mk | 2
solenv/gbuild/platform/solaris.mk | 2
solenv/gbuild/platform/unxgcc.mk | 2
sysui/Module_sysui.mk | 1
sysui/Package_desktop.mk | 37
67 files changed, 376 insertions(+), 1554 deletions(-)
New commits:
commit 36033194e3632f4c35333256592a50c497d089f6
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Oct 31 01:07:42 2013 +0100
scp2: content of directory_extensions.scp is unused
Change-Id: I1e0d25def55e0c9dfd3f303e5d2c4aa82a13432d
diff --git a/scp2/InstallModule_extensions.mk b/scp2/InstallModule_extensions.mk
index ad7a25a..181d2af 100644
--- a/scp2/InstallModule_extensions.mk
+++ b/scp2/InstallModule_extensions.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_InstallModule_add_templates,scp2/extensions,\
))
$(eval $(call gb_InstallModule_add_scpfiles,scp2/extensions,\
- scp2/source/extensions/directory_extensions \
scp2/source/extensions/file_extensions \
))
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
deleted file mode 100644
index 92b0dcf..0000000
--- a/scp2/source/extensions/directory_extensions.scp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "macros.inc"
-
-/* *** Additional Extensions *** */
-
-#ifdef WITH_EXTENSION_INTEGRATION
-
-/* ** MediaWiki Publisher** */
-
-#ifndef WITHOUT_EXTENSION_MEDIAWIKI
-
-Directory gid_Brand_Dir_Share_Extensions_MediaWiki
- ParentID = gid_Brand_Dir_Share_Extensions;
- DosName = "wiki-publisher";
-End
-
-#endif
-
-/* ** ConvertTextToNumber ** */
-
-#ifdef WITH_EXTENSION_CT2N
-
-Directory gid_Brand_Dir_Share_Extensions_CT2N
- ParentID = gid_Brand_Dir_Share_Extensions;
- DosName = "ConvertTextToNumber";
-End
-
-#endif
-
-/* ** NLPSolver ** */
-
-#ifdef WITH_EXTENSION_NLPSOLVER
-
-Directory gid_Brand_Dir_Share_Extensions_NLPSolver
- ParentID = gid_Brand_Dir_Share_Extensions;
- DosName = "nlpsolver";
-End
-
-#endif
-
-/* ** MySQL Connector ** */
-
-#ifdef WITH_EXTENSION_MARIADBC
-
-Directory gid_Brand_Dir_Share_Extensions_MySQLConnector
- ParentID = gid_Brand_Dir_Share_Extensions;
- DosName = "mysql-connector-ooo";
-End
-
-#endif
-
-#endif
commit 45460cbd4333f619fefb721462f17fc13e4f887d
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Oct 31 01:04:47 2013 +0100
move bundled binary OXT to new module external/misc_extensions
... and use ExtensionPackageSet to copy them to INSTDIR.
Change-Id: I3c77e986c308ffbabb5e55b93d3e04e6282bf4c9
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 24fb029..09246fe 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,LPSOLVE,lpsolve) \
$(call gb_Helper_optional,MARIADB,libmariadb) \
$(call gb_Helper_optional,MDDS,mdds) \
+ $(if $(filter YES,$(WITH_EXTRA_EXTENSIONS)),misc_extensions) \
$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
$(call gb_Helper_optional,MOZ,moz) \
$(call gb_Helper_optional,MSPUB,libmspub) \
diff --git a/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk b/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk
new file mode 100644
index 0000000..d1c0984
--- /dev/null
+++ b/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk
@@ -0,0 +1,68 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExtensionPackageSet_ExtensionPackageSet,misc_extensions))
+
+ifneq ($(BARCODE_EXTENSION_PACK),)
+$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,Barcode,$(BARCODE_EXTENSION_PACK)))
+endif
+
+ifneq ($(DIAGRAM_EXTENSION_PACK),)
+$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,SmART,$(DIAGRAM_EXTENSION_PACK)))
+endif
+
+ifneq ($(GOOGLE_DOCS_EXTENSION_PACK),)
+$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,gdocs,$(GOOGLE_DOCS_EXTENSION_PACK)))
+endif
+
+ifneq ($(HUNART_EXTENSION_PACK),)
+$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,hunart,$(HUNART_EXTENSION_PACK)))
+endif
+
+ifneq ($(NUMBERTEXT_EXTENSION_PACK),)
+$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,numbertext,$(NUMBERTEXT_EXTENSION_PACK)))
+endif
+
+ifneq ($(SUNTEMPLATES_DE_PACK),)
+$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,Sun_ODF_Template_Pack_de,$(SUNTEMPLATES_DE_PACK)))
+endif
+
+ifneq ($(SUNTEMPLATES_EN_US_PACK),)
+$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,Sun_ODF_Template_Pack_en-US,$(SUNTEMPLATES_EN_US_PACK)))
+endif
+
+ifneq ($(SUNTEMPLATES_ES_PACK),)
+$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,Sun_ODF_Template_Pack_es,$(SUNTEMPLATES_ES_PACK)))
+endif
+
+ifneq ($(SUNTEMPLATES_FR_PACK),)
+$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,Sun_ODF_Template_Pack_fr,$(SUNTEMPLATES_FR_PACK)))
+endif
+
+ifneq ($(SUNTEMPLATES_HU_PACK),)
+$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,Sun_ODF_Template_Pack_hu,$(SUNTEMPLATES_HU_PACK)))
+endif
+
+ifneq ($(SUNTEMPLATES_IT_PACK),)
+$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,Sun_ODF_Template_Pack_it,$(SUNTEMPLATES_IT_PACK)))
+endif
+
+ifneq ($(TYPO_EXTENSION_PACK),)
+$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,typo,$(TYPO_EXTENSION_PACK)))
+endif
+
+ifneq ($(VALIDATOR_EXTENSION_PACK),)
+$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,Validator,$(VALIDATOR_EXTENSION_PACK)))
+endif
+
+ifneq ($(WATCH_WINDOW_EXTENSION_PACK),)
+$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,WatchWindow,$(WATCH_WINDOW_EXTENSION_PACK)))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/misc_extensions/Makefile b/external/misc_extensions/Makefile
new file mode 100644
index 0000000..e4968cf
--- /dev/null
+++ b/external/misc_extensions/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/misc_extensions/Module_misc_extensions.mk b/external/misc_extensions/Module_misc_extensions.mk
new file mode 100644
index 0000000..86f65c2
--- /dev/null
+++ b/external/misc_extensions/Module_misc_extensions.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,misc_extensions))
+
+$(eval $(call gb_Module_add_targets,misc_extensions,\
+ ExtensionPackageSet_misc_extensions \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/misc_extensions/README b/external/misc_extensions/README
new file mode 100644
index 0000000..9c6fa2e
--- /dev/null
+++ b/external/misc_extensions/README
@@ -0,0 +1 @@
+misc_extensions contains some extensions may be downloaded and bundled as-is
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index b8429d8..c94b1e0 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -59,12 +59,6 @@ $(eval $(call gb_Module_add_targets,extras,\
))
endif
-ifeq ($(WITH_EXTRA_EXTENSIONS),YES)
-$(eval $(call gb_Module_add_targets,extras,\
- Package_extensions \
-))
-endif
-
ifeq ($(WITH_EXTRA_FONT),YES)
$(eval $(call gb_Module_add_targets,extras,\
ExternalPackage_extra_fonts \
diff --git a/extras/Package_extensions.mk b/extras/Package_extensions.mk
deleted file mode 100644
index a88679e..0000000
--- a/extras/Package_extensions.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-# Technically these files do not belong to extras module, but they must
-# be delivered from somewhere, so why not from extras...
-$(eval $(call gb_Package_Package,extras_extensions,$(TARFILE_LOCATION)))
-
-$(eval $(call gb_Package_set_outdir,extras_extensions,$(OUTDIR)))
-
-ifneq ($(BARCODE_EXTENSION_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/Barcode.oxt,$(BARCODE_EXTENSION_PACK)))
-endif
-ifneq ($(DIAGRAM_EXTENSION_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/SmART.oxt,$(DIAGRAM_EXTENSION_PACK)))
-endif
-ifneq ($(GOOGLE_DOCS_EXTENSION_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/gdocs.oxt,$(GOOGLE_DOCS_EXTENSION_PACK)))
-endif
-ifneq ($(HUNART_EXTENSION_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/hunart.oxt,$(HUNART_EXTENSION_PACK)))
-endif
-ifneq ($(NUMBERTEXT_EXTENSION_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/numbertext.oxt,$(NUMBERTEXT_EXTENSION_PACK)))
-endif
-ifneq ($(SUNTEMPLATES_DE_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/Sun-ODF-Template-Pack-de.oxt,$(SUNTEMPLATES_DE_PACK)))
-endif
-ifneq ($(SUNTEMPLATES_EN_US_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/Sun-ODF-Template-Pack-en-US.oxt,$(SUNTEMPLATES_EN_US_PACK)))
-endif
-ifneq ($(SUNTEMPLATES_ES_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/Sun-ODF-Template-Pack-es.oxt,$(SUNTEMPLATES_ES_PACK)))
-endif
-ifneq ($(SUNTEMPLATES_FR_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/Sun-ODF-Template-Pack-fr.oxt,$(SUNTEMPLATES_FR_PACK)))
-endif
-ifneq ($(SUNTEMPLATES_HU_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/Sun-ODF-Template-Pack-hu.oxt,$(SUNTEMPLATES_HU_PACK)))
-endif
-ifneq ($(SUNTEMPLATES_IT_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/Sun-ODF-Template-Pack-it.oxt,$(SUNTEMPLATES_IT_PACK)))
-endif
-ifneq ($(TYPO_EXTENSION_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/typo.oxt,$(TYPO_EXTENSION_PACK)))
-endif
-ifneq ($(VALIDATOR_EXTENSION_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/Validator.oxt,$(VALIDATOR_EXTENSION_PACK)))
-endif
-ifneq ($(WATCH_WINDOW_EXTENSION_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/WatchWindow.oxt,$(WATCH_WINDOW_EXTENSION_PACK)))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index 31f2e32..92b0dcf 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -33,17 +33,6 @@ End
#endif
-/* ** Numbertext ** */
-
-#ifdef WITH_EXTENSION_NUMBERTEXT
-
-Directory gid_Brand_Dir_Share_Extensions_NumberText
- ParentID = gid_Brand_Dir_Share_Extensions;
- DosName = "numbertext";
-End
-
-#endif
-
/* ** ConvertTextToNumber ** */
#ifdef WITH_EXTENSION_CT2N
@@ -55,83 +44,6 @@ End
#endif
-/* ** Hungarian Cross-reference Toolbar** */
-
-#ifdef WITH_EXTENSION_HUNART
-
-Directory gid_Brand_Dir_Share_Extensions_HunArt
- ParentID = gid_Brand_Dir_Share_Extensions;
- DosName = "hunart";
-End
-
-#endif
-
-/* ** Typography Toolbar** */
-
-#ifdef WITH_EXTENSION_TYPO
-
-Directory gid_Brand_Dir_Share_Extensions_Typo
- ParentID = gid_Brand_Dir_Share_Extensions;
- DosName = "typo";
-End
-
-#endif
-
-/* ** Watch Window ** */
-
-#ifdef WITH_EXTENSION_WATCH_WINDOW
-
-Directory gid_Brand_Dir_Share_Extensions_Watch_Window
- ParentID = gid_Brand_Dir_Share_Extensions;
- DosName = "WatchWindow";
-End
-
-#endif
-
-/* ** Diagram ** */
-
-#ifdef WITH_EXTENSION_DIAGRAM
-
-Directory gid_Brand_Dir_Share_Extensions_Diagram
- ParentID = gid_Brand_Dir_Share_Extensions;
- DosName = "Diagram";
-End
-
-#endif
-
-/* ** Validator ** */
-
-#ifdef WITH_EXTENSION_VALIDATOR
-
-Directory gid_Brand_Dir_Share_Extensions_Validator
- ParentID = gid_Brand_Dir_Share_Extensions;
- DosName = "Validator";
-End
-
-#endif
-
-/* ** Barcode ** */
-
-#ifdef WITH_EXTENSION_BARCODE
-
-Directory gid_Brand_Dir_Share_Extensions_Barcode
- ParentID = gid_Brand_Dir_Share_Extensions;
- DosName = "Barcode";
-End
-
-#endif
-
-/* ** Google Docs ** */
-
-#ifdef WITH_EXTENSION_GOOGLE_DOCS
-
-Directory gid_Brand_Dir_Share_Extensions_Google_Docs
- ParentID = gid_Brand_Dir_Share_Extensions;
- DosName = "gdocs";
-End
-
-#endif
-
/* ** NLPSolver ** */
#ifdef WITH_EXTENSION_NLPSOLVER
@@ -154,21 +66,4 @@ End
#endif
-/* ** Sun Template Pack ** */
-
-#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
-
-Directory gid_Brand_Dir_Share_Extensions_Sun_Template_Pack
- ParentID = gid_Brand_Dir_Share_Extensions;
- DosName (en-US) = "Sun_ODF_Template_Pack_en-US";
- DosName (de) = "Sun_ODF_Template_Pack_de";
- DosName (es) = "Sun_ODF_Template_Pack_es";
- DosName (fr) = "Sun_ODF_Template_Pack_fr";
- DosName (hu) = "Sun_ODF_Template_Pack_hu";
- DosName (it) = "Sun_ODF_Template_Pack_it";
- DosName = "Sun_ODF_Template_Pack";
-End
-
-#endif
-
#endif
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index f76f25f..09966f7 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -41,9 +41,9 @@ End
File gid_File_Oxt_NumberText
TXT_FILE_BODY;
- Styles = (PACKED, ARCHIVE);
- Dir = gid_Brand_Dir_Share_Extensions_NumberText;
- Name = "numbertext.oxt";
+ Styles = (PACKED, FILELIST);
+ Dir = FILELIST_DIR;
+ Name = "numbertext.filelist";
End
#endif
@@ -67,9 +67,9 @@ End
File gid_File_Oxt_HunArt
TXT_FILE_BODY;
- Styles = (PACKED, ARCHIVE);
- Dir = gid_Brand_Dir_Share_Extensions_HunArt;
- Name = "hunart.oxt";
+ Styles = (PACKED, FILELIST);
+ Dir = FILELIST_DIR;
+ Name = "hunart.filelist";
End
#endif
@@ -80,9 +80,9 @@ End
File gid_File_Oxt_Typo
TXT_FILE_BODY;
- Styles = (PACKED, ARCHIVE);
- Dir = gid_Brand_Dir_Share_Extensions_Typo;
- Name = "typo.oxt";
+ Styles = (PACKED, FILELIST);
+ Dir = FILELIST_DIR;
+ Name = "typo.filelist";
End
#endif
@@ -93,9 +93,9 @@ End
File gid_File_Oxt_Watch_Window
TXT_FILE_BODY;
- Styles = (PACKED, ARCHIVE);
- Dir = gid_Brand_Dir_Share_Extensions_Watch_Window;
- Name = "WatchWindow.oxt";
+ Styles = (PACKED, FILELIST);
+ Dir = FILELIST_DIR;
+ Name = "WatchWindow.filelist";
End
#endif
@@ -106,9 +106,9 @@ End
File gid_File_Oxt_Diagram
TXT_FILE_BODY;
- Styles = (PACKED, ARCHIVE);
- Dir = gid_Brand_Dir_Share_Extensions_Diagram;
- Name = "SmART.oxt";
+ Styles = (PACKED, FILELIST);
+ Dir = FILELIST_DIR;
+ Name = "SmART.filelist";
End
#endif
@@ -119,9 +119,9 @@ End
File gid_File_Oxt_Validator
TXT_FILE_BODY;
- Styles = (PACKED, ARCHIVE);
- Dir = gid_Brand_Dir_Share_Extensions_Validator;
- Name = "Validator.oxt";
+ Styles = (PACKED, FILELIST);
+ Dir = FILELIST_DIR;
+ Name = "Validator.filelist";
End
#endif
@@ -132,9 +132,9 @@ End
File gid_File_Oxt_Barcode
TXT_FILE_BODY;
- Styles = (PACKED, ARCHIVE);
- Dir = gid_Brand_Dir_Share_Extensions_Barcode;
- Name = "Barcode.oxt";
+ Styles = (PACKED, FILELIST);
+ Dir = FILELIST_DIR;
+ Name = "Barcode.filelist";
End
#endif
@@ -145,9 +145,9 @@ End
File gid_File_Oxt_Google_Docs
TXT_FILE_BODY;
- Styles = (PACKED, ARCHIVE);
- Dir = gid_Brand_Dir_Share_Extensions_Google_Docs;
- Name = "gdocs.oxt";
+ Styles = (PACKED, FILELIST);
+ Dir = FILELIST_DIR;
+ Name = "gdocs.filelist";
End
#endif
@@ -197,14 +197,14 @@ End
File gid_File_Optional_Extensions_Sun_Template_Pack
TXT_FILE_BODY;
- Styles = (PACKED, ARCHIVE);
- Dir = gid_Brand_Dir_Share_Extensions_Sun_Template_Pack;
- Name (en-US) = "Sun-ODF-Template-Pack-en-US.oxt";
- Name (de) = "Sun-ODF-Template-Pack-de.oxt";
- Name (it) = "Sun-ODF-Template-Pack-it.oxt";
- Name (fr) = "Sun-ODF-Template-Pack-fr.oxt";
- Name (es) = "Sun-ODF-Template-Pack-es.oxt";
- Name (hu) = "Sun-ODF-Template-Pack-hu.oxt";
+ Styles = (PACKED, FILELIST);
+ Dir = FILELIST_DIR;
+ Name (en-US) = "Sun_ODF_Template_Pack_en-US.filelist";
+ Name (de) = "Sun_ODF_Template_Pack_de.filelist";
+ Name (it) = "Sun_ODF_Template_Pack_it.filelist";
+ Name (fr) = "Sun_ODF_Template_Pack_fr.filelist";
+ Name (es) = "Sun_ODF_Template_Pack_es.filelist";
+ Name (hu) = "Sun_ODF_Template_Pack_hu.filelist";
End
#endif
commit 60211134bc6aadd2c8bbcaf6fcda80971cb5fdd1
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Oct 31 00:58:46 2013 +0100
gbuild: add ExtensionPackageSet class
Change-Id: I947207c78e28b416aebe2e33172043fd8cfa4f17
diff --git a/Makefile.in b/Makefile.in
index 00b1531..8523722 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -112,6 +112,7 @@ gbuild_TARGETS := AllLangHelp \
Executable \
Extension \
ExtensionPackage \
+ ExtensionPackageSet \
ExternalPackage \
ExternalProject \
GeneratedPackage \
diff --git a/solenv/gbuild/ExtensionPackage.mk b/solenv/gbuild/ExtensionPackage.mk
index 34a9bd4..73e1aa9 100644
--- a/solenv/gbuild/ExtensionPackage.mk
+++ b/solenv/gbuild/ExtensionPackage.mk
@@ -30,14 +30,21 @@ $(call gb_ExtensionPackage_get_target,%) :
&& zipinfo -1 $(ZIPFILE) | grep -v '/$$' \
| sed s+^+$(INSTROOT)/$(LIBO_SHARE_FOLDER)/extensions/$*/+ > $@)
-# call gb_ExtensionPackage_ExtensionPackage,package,oxt
-define gb_ExtensionPackage_ExtensionPackage
+# call gb_ExtensionPackage_ExtensionPackage_internal,package,oxt
+define gb_ExtensionPackage_ExtensionPackage_internal
+$(if $(2),,$(call gb_Output_error,need 2 parameters))
$(call gb_ExtensionPackage_get_target,$(1)) : ZIPFILE := $(2)
$(call gb_ExtensionPackage_get_target,$(1)) : $(2)
-$(2) :| $(call gb_ExtensionPackage_get_preparation_target,$(1))
$(call gb_ExtensionPackage_get_target,$(1)) :| \
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/extensions/.dir
+endef
+
+# call gb_ExtensionPackage_ExtensionPackage,package,oxt
+define gb_ExtensionPackage_ExtensionPackage
+$(call gb_ExtensionPackage_ExtensionPackage_internal,$(1),$(2))
+$(2) :| $(call gb_ExtensionPackage_get_preparation_target,$(1))
+
$$(eval $$(call gb_Module_register_target,$(call gb_ExtensionPackage_get_target,$(1)),$(call gb_ExtensionPackage_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),ExtensionPackage)
@@ -50,4 +57,35 @@ $(call gb_ExtensionPackage_get_preparation_target,$(1)) : \
endef
+# ExtensionPackage class
+#
+# This is less boring than writing a dozen 1-line ExtensionPackage files.
+
+$(call gb_ExtensionPackageSet_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),OXS,3)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -rf $(call gb_ExtensionPackageSet_get_target,$*))
+
+$(call gb_ExtensionPackageSet_get_target,%) :
+ $(call gb_Output_announce,$*,$(true),OXS,3)
+ mkdir -p $(dir $@) && touch $@
+
+# call gb_ExtensionPackageSet_ExtensionPackageSet,set
+define gb_ExtensionPackageSet_ExtensionPackageSet
+$$(eval $$(call gb_Module_register_target,$(call gb_ExtensionPackageSet_get_target,$(1)),$(call gb_ExtensionPackageSet_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),ExtensionPackageSet)
+
+endef
+
+# call gb_ExtensionPackageSet_add_extension,set,package,oxt-filename
+define gb_ExtensionPackageSet_add_extension
+$(call gb_ExtensionPackage_ExtensionPackage_internal,$(2),$(TARFILE_LOCATION)/$(3))
+
+$(call gb_ExtensionPackageSet_get_target,$(1)) : \
+ $(call gb_ExtensionPackage_get_target,$(2))
+$(call gb_ExtensionPackageSet_get_clean_target,$(1)) : \
+ $(call gb_ExtensionPackage_get_clean_target,$(2))
+
+endef
+
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 8504e54..0218a39 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -86,6 +86,7 @@ gb_Extension_get_rootdir = $(WORKDIR)/Extension/$(1)/root
gb_Extension_get_workdir = $(WORKDIR)/Extension/$(1)
gb_ExtensionPackage_get_target = $(WORKDIR)/ExtensionPackage/$(1).filelist
gb_ExtensionPackage_get_preparation_target = $(WORKDIR)/ExtensionPackage/$(1).prepare
+gb_ExtensionPackageSet_get_target = $(WORKDIR)/ExtensionPackage/$(1).set
gb_ExternalPackage_get_target = $(WORKDIR)/ExternalPackage/$(1)
gb_ExternalProject_get_statedir = $(WORKDIR)/ExternalProject/$(1)
gb_ExternalProject_get_preparation_target = $(WORKDIR)/ExternalProject/$(1).prepare
@@ -258,6 +259,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
ExternalPackage \
Extension \
ExtensionPackage \
+ ExtensionPackageSet \
Gallery \
GeneratedPackage \
HelpTarget \
commit e0b50db09acef404f8dc0be74463bcaa1d488034
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Oct 31 00:16:48 2013 +0100
languagetool: convert to ExtensionPackage
Change-Id: If2c5cf48e09b04a68a2d30b38bf8bc26be3c7bfc
diff --git a/languagetool/Package_languagetool.mk b/languagetool/ExtensionPackage_LanguageTool.mk
similarity index 51%
rename from languagetool/Package_languagetool.mk
rename to languagetool/ExtensionPackage_LanguageTool.mk
index a40a1e4..3b685d7 100644
--- a/languagetool/Package_languagetool.mk
+++ b/languagetool/ExtensionPackage_LanguageTool.mk
@@ -7,12 +7,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,languagetool,$(call gb_UnpackedTarball_get_dir,languagetool)))
+$(eval $(call gb_ExtensionPackage_ExtensionPackage,LanguageTool,$(call gb_UnpackedTarball_get_dir,languagetool)/dist/LanguageTool.oxt))
-$(eval $(call gb_Package_set_outdir,languagetool,$(OUTDIR)))
-
-$(eval $(call gb_Package_use_external_project,languagetool,languagetool))
-
-$(eval $(call gb_Package_add_file,languagetool,bin/LanguageTool.oxt,dist/LanguageTool.oxt))
+$(eval $(call gb_ExtensionPackage_use_external_project,LanguageTool,languagetool))
# vim: set noet sw=4 ts=4:
diff --git a/languagetool/Module_languagetool.mk b/languagetool/Module_languagetool.mk
index bc430c0..565a14c 100644
--- a/languagetool/Module_languagetool.mk
+++ b/languagetool/Module_languagetool.mk
@@ -13,7 +13,7 @@ ifneq ($(ENABLE_JAVA),)
ifneq ($(filter LANGUAGETOOL,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_targets,languagetool,\
ExternalProject_languagetool \
- Package_languagetool \
+ ExtensionPackage_languagetool \
UnpackedTarball_languagetool \
))
endif
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index 84d65a5..31f2e32 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -143,17 +143,6 @@ End
#endif
-/* ** LanguageTool ** */
-
-#ifdef WITH_EXTENSION_LANGUAGETOOL
-
-Directory gid_Brand_Dir_Share_Extensions_LanguageTool
- ParentID = gid_Brand_Dir_Share_Extensions;
- DosName = "LanguageTool";
-End
-
-#endif
-
/* ** MySQL Connector ** */
#ifdef WITH_EXTENSION_MARIADBC
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 77b99b1..f76f25f 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -171,9 +171,9 @@ End
File gid_File_Oxt_LanguageTool
TXT_FILE_BODY;
- Styles = (PACKED, ARCHIVE);
- Dir = gid_Brand_Dir_Share_Extensions_LanguageTool;
- Name = "LanguageTool.oxt";
+ Styles = (PACKED, FILELIST);
+ Dir = FILELIST_DIR;
+ Name = "LanguageTool.filelist";
End
#endif
commit 704451d95d7b1c32f0e623bde5b4de4236ff9579
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Oct 31 00:15:51 2013 +0100
gbuild: add ExtensionPackage class
Change-Id: I65ca50ccc512e35a5b95c2482f3a8833d1a7294b
diff --git a/Makefile.in b/Makefile.in
index a3af107..00b1531 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -111,6 +111,7 @@ gbuild_TARGETS := AllLangHelp \
Dictionary \
Executable \
Extension \
+ ExtensionPackage \
ExternalPackage \
ExternalProject \
GeneratedPackage \
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 24df6ec..e179c98 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -78,7 +78,7 @@ LibreOffice
downloadname LibreOffice_{productversion}_{os}_install_{languages}
langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages}
- include {solarpath}/bin.{minor}/osl,{installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
+ include {solarpath}/bin.{minor}/osl,{installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
}
}
@@ -131,7 +131,7 @@ LibreOffice_Dev
downloadname LibreOfficeDev_{productversion}_{os}_install_{languages}
langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
- include {solarpath}/bin.{minor}/osl,{installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
+ include {solarpath}/bin.{minor}/osl,{installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
}
}
diff --git a/solenv/gbuild/ExtensionPackage.mk b/solenv/gbuild/ExtensionPackage.mk
new file mode 100644
index 0000000..34a9bd4
--- /dev/null
+++ b/solenv/gbuild/ExtensionPackage.mk
@@ -0,0 +1,53 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# ExtensionPackage class
+#
+# Unpacks a binary .oxt file into the instdir extension directory and
+# writes a file-list.
+
+$(call gb_ExtensionPackage_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),OXP,3)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -rf $(INSTROOT)/$(LIBO_SHARE_FOLDER)/extensions/$* \
+ $(call gb_ExtensionPackage_get_target,$*))
+
+$(call gb_ExtensionPackage_get_preparation_target,%) :
+ mkdir -p $(dir $@) && touch $@
+
+$(call gb_ExtensionPackage_get_target,%) :
+ $(call gb_Output_announce,$*,$(true),OXP,3)
+ $(call gb_Helper_abbreviate_dirs,\
+ mkdir -p $(dir $@) \
+ && rm -rf $(INSTROOT)/$(LIBO_SHARE_FOLDER)/extensions/$* \
+ && unzip -q $(ZIPFILE) -d $(INSTROOT)/$(LIBO_SHARE_FOLDER)/extensions/$* \
+ && zipinfo -1 $(ZIPFILE) | grep -v '/$$' \
+ | sed s+^+$(INSTROOT)/$(LIBO_SHARE_FOLDER)/extensions/$*/+ > $@)
+
+# call gb_ExtensionPackage_ExtensionPackage,package,oxt
+define gb_ExtensionPackage_ExtensionPackage
+$(call gb_ExtensionPackage_get_target,$(1)) : ZIPFILE := $(2)
+$(call gb_ExtensionPackage_get_target,$(1)) : $(2)
+$(2) :| $(call gb_ExtensionPackage_get_preparation_target,$(1))
+$(call gb_ExtensionPackage_get_target,$(1)) :| \
+ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/extensions/.dir
+
+$$(eval $$(call gb_Module_register_target,$(call gb_ExtensionPackage_get_target,$(1)),$(call gb_ExtensionPackage_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),ExtensionPackage)
+
+endef
+
+# call gb_ExtensionPackage_use_external_project,package,externalproject
+define gb_ExtensionPackage_use_external_project
+$(call gb_ExtensionPackage_get_preparation_target,$(1)) : \
+ $(call gb_ExternalProject_get_target,$(2))
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 90f9dec..8504e54 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -84,6 +84,8 @@ gb_Executable_get_runtime_target = $(WORKDIR_FOR_BUILD)/Executable/$(1).run
gb_Extension_get_target = $(WORKDIR)/Extension/$(1).oxt
gb_Extension_get_rootdir = $(WORKDIR)/Extension/$(1)/root
gb_Extension_get_workdir = $(WORKDIR)/Extension/$(1)
+gb_ExtensionPackage_get_target = $(WORKDIR)/ExtensionPackage/$(1).filelist
+gb_ExtensionPackage_get_preparation_target = $(WORKDIR)/ExtensionPackage/$(1).prepare
gb_ExternalPackage_get_target = $(WORKDIR)/ExternalPackage/$(1)
gb_ExternalProject_get_statedir = $(WORKDIR)/ExternalProject/$(1)
gb_ExternalProject_get_preparation_target = $(WORKDIR)/ExternalProject/$(1).prepare
@@ -255,6 +257,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
Executable \
ExternalPackage \
Extension \
+ ExtensionPackage \
Gallery \
GeneratedPackage \
HelpTarget \
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 425a699..b7f2db5 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -320,6 +320,7 @@ include $(foreach class, \
HelpTarget \
AllLangHelp \
Extension \
+ ExtensionPackage \
Dictionary \
InstallModuleTarget \
InstallModule \
commit c7c0da47e15957e8ab8674551fdaebc35998e9f0
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 30 22:03:18 2013 +0100
gbuild: remove unused gb_Helper_make_outdir_clean_target
Change-Id: I03894747e5269e6da60e0eb59551cdec123ef9a7
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 62743db..535f93e 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -64,11 +64,6 @@ gb_$(1)_get_clean_target = $(WORKDIR)/Clean/$(1)/$$(1)
endef
-define gb_Helper_make_outdir_clean_target
-gb_$(1)_get_clean_target = $$(subst $(OUTDIR)/,$(WORKDIR)/Clean/OutDir/,$$(call gb_$(1)_get_target,$$(1)))
-
-endef
-
define gb_Helper_make_dep_target
gb_$(1)_get_dep_target = $(WORKDIR)/Dep/$(1)/$$(1).d
@@ -80,22 +75,12 @@ $(foreach targettype,$(1),\
endef
-define gb_Helper_make_outdir_clean_targets
-$(foreach targettype,$(1),\
- $(call gb_Helper_make_outdir_clean_target,$(targettype)))
-
-endef
-
define gb_Helper_make_dep_targets
$(foreach targettype,$(1),\
$(call gb_Helper_make_dep_target,$(targettype)))
endef
-define gb_Helper_get_outdir_clean_target
-$$(subst $(OUTDIR)/,$(WORKDIR)/Clean/OutDir/,$(1))
-endef
-
# e.g. 'make CppunitTest_sw_macros_test'
#
# gb_Helper_make_userfriendly_targets target class build-target? clean-target?
commit daa2f80bca3fee7cfc1550b3b56d22d3ff211376
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 30 22:04:10 2013 +0100
gbuild: InstallScript: use scripts from WORKDIR
Change-Id: I741edcabf86801f77ff58bc42a81372053c7901b
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 99da910..24df6ec 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -78,7 +78,7 @@ LibreOffice
downloadname LibreOffice_{productversion}_{os}_install_{languages}
langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages}
- include {solarpath}/bin.{minor}/osl,{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native/scripts,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
+ include {solarpath}/bin.{minor}/osl,{installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
}
}
@@ -131,7 +131,7 @@ LibreOffice_Dev
downloadname LibreOfficeDev_{productversion}_{os}_install_{languages}
langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
- include {solarpath}/bin.{minor}/osl,{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native/scripts,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
+ include {solarpath}/bin.{minor}/osl,{installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
}
}
@@ -170,7 +170,7 @@ LibreOffice_SDK
active 1
compression 5
script sdkoo
- include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath}
+ include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath}
}
}
@@ -216,6 +216,6 @@ LibreOffice_Dev_SDK
active 1
compression 5
script sdkoo
- include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath}
+ include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath}
}
}
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index 9bf14fe..c84f4a9 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -46,7 +46,7 @@ End
#if !defined(WNT) && !defined(MACOSX) && defined(WITH_RPM)
ScpAction scp_Copy_Install
- Copy = "userscripts/install";
+ Copy = "scripts/install";
Name = "install";
UnixRights = 755;
End
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 124ed58..2bcd7cc 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -61,6 +61,9 @@ sub create_pathvariables
my $instdir = $ENV{'INSTDIR'};
$variables{'instdir'} = $instdir;
+ my $installscriptdir = $environment->{'WORKDIR'} . $installer::globals::separator . "InstallScriptTarget";
+ $variables{'installscriptdir'} = $installscriptdir;
+
my $extensionsdir = $environment->{'WORKDIR'} . $installer::globals::separator . "Extension";
$variables{'extensionsdir'} = $extensionsdir;
diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk
index 36aeb1e..41e94f5 100644
--- a/solenv/gbuild/InstallScript.mk
+++ b/solenv/gbuild/InstallScript.mk
@@ -7,86 +7,60 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-# InstallScriptTarget class
+# InstallScript class
-gb_InstallScriptTarget_TARGET := $(SOLARENV)/bin/par2script.pl
-gb_InstallScriptTarget_COMMAND := $(PERL) $(gb_InstallScriptTarget_TARGET)
+gb_InstallScript_TARGET := $(SOLARENV)/bin/par2script.pl
+gb_InstallScript_COMMAND := $(PERL) $(gb_InstallScript_TARGET)
-gb_InstallScriptTarget__make_arglist = $(subst $(WHITESPACE),$(COMMA),$(strip $(1)))
+gb_InstallScript__make_arglist = $(subst $(WHITESPACE),$(COMMA),$(strip $(1)))
-define gb_InstallScriptTarget__get_files
+define gb_InstallScript__get_files
$(notdir $(shell cat $(foreach module,$(1),$(call gb_InstallModule_get_filelist,$(module)))))
endef
-define gb_InstallScriptTarget__get_dirs
+define gb_InstallScript__get_dirs
$(sort $(dir $(shell cat $(foreach module,$(1),$(call gb_InstallModule_get_filelist,$(module))))))
endef
# Pass first arg if make is running in silent mode, second arg otherwise
-define gb_InstallScriptTarget__if_silent
+define gb_InstallScript__if_silent
$(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),$(1),$(2))
endef
-define gb_InstallScriptTarget__command
+define gb_InstallScript__command
$(call gb_Output_announce,$(2),$(true),INS,4)
$(call gb_Helper_abbreviate_dirs,\
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
- $(call gb_InstallScriptTarget__make_arglist,\
- $(call gb_InstallScriptTarget__get_files,$(SCP_MODULES))) \
+ $(call gb_InstallScript__make_arglist,\
+ $(call gb_InstallScript__get_files,$(SCP_MODULES))) \
) && \
- $(gb_InstallScriptTarget_COMMAND) \
- $(call gb_InstallScriptTarget__if_silent,-q) \
- -i $(call gb_InstallScriptTarget__make_arglist,$(call gb_InstallScriptTarget__get_dirs,$(SCP_MODULES))) \
+ $(gb_InstallScript_COMMAND) \
+ $(call gb_InstallScript__if_silent,-q) \
+ -i $(call gb_InstallScript__make_arglist,$(call gb_InstallScript__get_dirs,$(SCP_MODULES))) \
-o $(1) \
@@$${RESPONSEFILE} && \
rm -f $${RESPONSEFILE} \
)
endef
-$(dir $(call gb_InstallScriptTarget_get_target,%))%/.dir :
+$(dir $(call gb_InstallScript_get_target,%))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(dir $(call gb_InstallScriptTarget_get_target,%)).dir :
+$(dir $(call gb_InstallScript_get_target,%)).dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(call gb_InstallScriptTarget_get_target,%) : $(gb_InstallScriptTarget_TARGET)
- $(call gb_InstallScriptTarget__command,$@,$*)
+$(call gb_InstallScript_get_target,%) : $(gb_InstallScript_TARGET)
+ $(call gb_InstallScript__command,$@,$*)
-.PHONY : $(call gb_InstallScriptTarget_get_clean_target,%)
-$(call gb_InstallScriptTarget_get_clean_target,%) :
+.PHONY : $(call gb_InstallScript_get_clean_target,%)
+$(call gb_InstallScript_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),INS,4)
- rm -f $(call gb_InstallScriptTarget_get_target,$*)
-
-# gb_InstallScriptTarget_InstallScriptTarget(<target>)
-define gb_InstallScriptTarget_InstallScriptTarget
-$(call gb_InstallScriptTarget_get_target,$(1)) :| $(dir $(call gb_InstallScriptTarget_get_target,$(1))).dir
-$(call gb_InstallScriptTarget_get_target,$(1)) : SCP_MODULES :=
-
-endef
-
-define gb_InstallScriptTarget_use_module
-$(call gb_InstallScriptTarget_get_target,$(1)) : $(call gb_InstallModule_get_target,$(2))
-$(call gb_InstallScriptTarget_get_clean_target,$(1)) : $(call gb_InstallModule_get_clean_target,$(2))
-$(call gb_InstallScriptTarget_get_target,$(1)) : SCP_MODULES += $(2)
-
-endef
-
-define gb_InstallScriptTarget_use_modules
-$(foreach module,$(2),$(call gb_InstallScriptTarget_use_module,$(1),$(module)))
-
-endef
-
-# InstallScript class
+ rm -f $(call gb_InstallScript_get_target,$*)
# gb_InstallScript_InstallScript(<target>)
define gb_InstallScript_InstallScript
-$(call gb_InstallScriptTarget_InstallScriptTarget,$(1))
-
-$(call gb_InstallScript_get_target,$(1)) : $(call gb_InstallScriptTarget_get_target,$(1))
$(call gb_InstallScript_get_target,$(1)) :| $(dir $(call gb_InstallScript_get_target,$(1))).dir
-$(call gb_InstallScript_get_clean_target,$(1)) : $(call gb_InstallScriptTarget_get_clean_target,$(1))
-
-$(call gb_Deliver_add_deliverable,$(call gb_InstallScript_get_target,$(1)),$(call gb_InstallScriptTarget_get_target,$(1)),$(1))
+$(call gb_InstallScript_get_target,$(1)) : SCP_MODULES :=
$$(eval $$(call gb_Module_register_target,$(call gb_InstallScript_get_target,$(1)),$(call gb_InstallScript_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),InstallScript)
@@ -94,12 +68,14 @@ $(call gb_Helper_make_userfriendly_targets,$(1),InstallScript)
endef
define gb_InstallScript_use_module
-$(call gb_InstallScriptTarget_use_module,$(1),$(2))
+$(call gb_InstallScript_get_target,$(1)) : $(call gb_InstallModule_get_target,$(2))
+$(call gb_InstallScript_get_clean_target,$(1)) : $(call gb_InstallModule_get_clean_target,$(2))
+$(call gb_InstallScript_get_target,$(1)) : SCP_MODULES += $(2)
endef
define gb_InstallScript_use_modules
-$(call gb_InstallScriptTarget_use_modules,$(1),$(2))
+$(foreach module,$(2),$(call gb_InstallScript_use_module,$(1),$(module)))
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 0025f30..90f9dec 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -33,7 +33,6 @@ gb_PackagePart_get_destinations = \
$(OUTDIR)/share \
$(WORKDIR)/unittest \
-gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT)
# kind of lame but with just 3 of these why bother with registration etc.
gb_UnoApi_get_target = $(INSTROOT)/$(if $(filter udkapi,$(1)),$(LIBO_URE_SHARE_FOLDER)/misc/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb
@@ -113,7 +112,7 @@ gb_InstallModule_get_target = $(WORKDIR)/InstallModule/$(1).done
gb_InstallModuleTarget_get_external_target = $(WORKDIR)/InstallModuleTarget/$(1).external
gb_InstallModuleTarget_get_filelist = $(WORKDIR)/InstallModuleTarget/$(1).filelist
gb_InstallModuleTarget_get_target = $(WORKDIR)/InstallModuleTarget/$(1).filelist
-gb_InstallScriptTarget_get_target = $(WORKDIR)/InstallScriptTarget/$(1)$(gb_InstallScript_EXT)
+gb_InstallScript_get_target = $(WORKDIR)/InstallScriptTarget/$(1)$(gb_InstallScript_EXT)
gb_InternalUnoApi_get_target = $(WORKDIR)/InternalUnoApi/$(1).done
gb_Jar_get_target = $(call gb_Jar_get_install_target,$(1))
gb_Jar_get_classsetname = Jar/$(1)
@@ -267,7 +266,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
HelpTreeTarget \
InstallModule \
InstallModuleTarget \
- InstallScriptTarget \
+ InstallScript \
InternalUnoApi \
JavaClassSet \
Jar \
@@ -320,10 +319,6 @@ $(eval $(call gb_Helper_make_clean_targets,\
Configuration \
))
-$(eval $(call gb_Helper_make_outdir_clean_targets,\
- InstallScript \
-))
-
$(eval $(call gb_Helper_make_dep_targets,\
CObject \
CxxObject \
commit 7c4098659238b9a78da4ee734a7b51fc0fab5e92
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 30 21:20:44 2013 +0100
gbuild: Package: check for duplicate definitions
Change-Id: I3c2a6b1128f7d827031e4c5a47a415112ce09c5c
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 37b3e07..5b9586b 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -95,6 +95,7 @@ $(call gb_Package_get_target,$(1)) :| $(dir $(call gb_Package_get_target,$(1))).
endef
define gb_Package_Package
+$$(if $$(gb_Package_SOURCEDIR_$(1)),$$(call gb_Output_error,gb_Package__check: Package $(1) has already been defined))
$(if $(filter postprocess% instsetoo_native%,$(1)),,\
$(call gb_Postprocess_register_target,AllPackages,Package,$(1)))
$(call gb_Package_Package_internal,$(1),$(2))
commit fa424af27e8fd00528aea6ae4377184557a3a160
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 30 21:28:09 2013 +0100
readlicense_oo: stop delivering files to OUTDIR
- remove Package_readme, use generated files from WORKDIR via include
path
- Package_license and Package_files deliver to INSTDIR
- split up Package_odk_shared_readme to have extra Package for
generated files
- gb_Extension_LICENSEFILE_DEFAULT points to INSTDIR
Change-Id: I019d3431e30d982e887ae0000c755e0d61f98893
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 68febd5..99da910 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -78,7 +78,7 @@ LibreOffice
downloadname LibreOffice_{productversion}_{os}_install_{languages}
langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages}
- include {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native/scripts,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
+ include {solarpath}/bin.{minor}/osl,{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native/scripts,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
}
}
@@ -131,7 +131,7 @@ LibreOffice_Dev
downloadname LibreOfficeDev_{productversion}_{os}_install_{languages}
langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
- include {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native/scripts,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
+ include {solarpath}/bin.{minor}/osl,{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native/scripts,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
}
}
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 2fe4b61..9ddc400 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_targets,odk,\
Package_settings \
Package_settings_generated \
Package_share_readme \
+ Package_share_readme_generated \
PackageSet_odk_headers \
))
diff --git a/odk/Package_share_readme.mk b/odk/Package_share_readme.mk
index 79d8e17..a73d1e9 100644
--- a/odk/Package_share_readme.mk
+++ b/odk/Package_share_readme.mk
@@ -7,14 +7,17 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,odk_share_readme,$(OUTDIR)/bin))
+$(eval $(call gb_Package_Package,odk_share_readme,$(SRCDIR)))
$(eval $(call gb_Package_set_outdir,odk_share_readme,$(INSTDIR)))
$(eval $(call gb_Package_add_files,odk_share_readme,$(SDKDIRNAME)/share/readme,\
- LICENSE.html \
- osl/$(gb_LICENSE) \
- osl/$(call gb_README,en-US) \
+ readlicense_oo/html/LICENSE.html \
))
+ifneq ($(OS),WNT)
+# the stupid thing is renamed, see Package_files.mk
+$(eval $(call gb_Package_add_file,odk_share_readme,$(SDKDIRNAME)/share/readme/LICENSE,readlicense_oo/txt/license.txt))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/odk/Package_share_readme_generated.mk b/odk/Package_share_readme_generated.mk
new file mode 100644
index 0000000..c7ae0a8
--- /dev/null
+++ b/odk/Package_share_readme_generated.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,odk_share_readme_generated,$(WORKDIR)/CustomTarget/readlicense_oo))
+
+$(eval $(call gb_Package_set_outdir,odk_share_readme_generated,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,odk_share_readme_generated,$(SDKDIRNAME)/share/readme,\
+ $(if $(filter WNT,$(OS)),license/license.txt) \
+ readme/$(call gb_README,en-US) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/Module_readlicense_oo.mk b/readlicense_oo/Module_readlicense_oo.mk
index 89f5ae3..3170e13 100644
--- a/readlicense_oo/Module_readlicense_oo.mk
+++ b/readlicense_oo/Module_readlicense_oo.mk
@@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,readlicense_oo))
$(eval $(call gb_Module_add_targets,readlicense_oo,\
CustomTarget_readme \
Package_files \
- Package_readme \
))
+
ifeq (WNT,$(OS))
$(eval $(call gb_Module_add_targets,readlicense_oo,\
CustomTarget_license \
diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index 19cf8fd..74fac27 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -9,18 +9,15 @@
$(eval $(call gb_Package_Package,readlicense_oo_files,$(SRCDIR)/readlicense_oo))
-$(eval $(call gb_Package_set_outdir,readlicense_oo_files,$(OUTDIR)))
-
# LICENSE (upper case) is copied without EOL conversion from license.txt
# license.txt is converted, prior to copy, see Package_license.mk
-$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/osl/LICENSE,txt/license.txt))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE,txt/license.txt))
-$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/NOTICE,txt/NOTICE))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,NOTICE,txt/NOTICE))
-$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/osl/LICENSE.odt,odt/LICENSE.odt))
-$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/LICENSE.odt,odt/LICENSE.odt))
-$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/CREDITS.odt,odt/CREDITS.odt))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.odt,odt/LICENSE.odt))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,CREDITS.odt,odt/CREDITS.odt))
-$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/LICENSE.html,html/LICENSE.html))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.html,html/LICENSE.html))
# vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/Package_license.mk b/readlicense_oo/Package_license.mk
index 877db23..7dd1d8c 100644
--- a/readlicense_oo/Package_license.mk
+++ b/readlicense_oo/Package_license.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,readlicense_oo_license,$(call gb_CustomTarget_get_workdir,readlicense_oo/license)))
-$(eval $(call gb_Package_set_outdir,readlicense_oo_license,$(OUTDIR)))
-
-$(eval $(call gb_Package_add_file,readlicense_oo_license,bin/osl/license.txt,license.txt))
+$(eval $(call gb_Package_add_file,readlicense_oo_license,license.txt,license.txt))
# vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/Package_readme.mk b/readlicense_oo/Package_readme.mk
deleted file mode 100644
index 1e30ba3..0000000
--- a/readlicense_oo/Package_readme.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,readlicense_oo_readme_inc,$(call gb_CustomTarget_get_workdir,readlicense_oo/readme)))
-
-$(eval $(call gb_Package_set_outdir,readlicense_oo_readme_inc,$(OUTDIR)))
-
-$(eval $(call gb_Package_add_files,readlicense_oo_readme_inc,bin/osl,\
- $(foreach lang,en-US $(filter-out en-US,$(gb_WITH_LANG)),\
- $(if $(filter-out WNT,$(OS)),README_$(lang),readme_$(lang).txt) \
- ) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index e9ba29c..c03b664 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -66,13 +66,21 @@ Module gid_Module_Root_SDK
Files = (auto_sdk_ALL);
End
-File gid_File_Pakage_odk_share_readme
+File gid_File_Package_odk_share_readme
TXT_FILE_BODY;
Dir = FILELIST_SDK_DIR;
Name = "odk_share_readme.filelist";
Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
+File gid_File_Package_odk_share_readme_generated
+ TXT_FILE_BODY;
+ Dir = FILELIST_SDK_DIR;
+ Name = "odk_share_readme_generated.filelist";
+ Styles = (FILELIST,USE_INTERNAL_RIGHTS);
+End
+
+
#if defined(WNT)
File gid_File_Package_odk_cli
TXT_FILE_BODY;
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 96cfb5d..7d4fc6c 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -261,7 +261,7 @@ gb_CliAssemblyTarget_get_dll :=
# Extension class
-gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE
+gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE
# UnpackedTarget class
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 55776b3..11aadc6 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -544,7 +544,7 @@ gb_CliAssemblyTarget_get_dll = $(call gb_Library__get_dir_for_layer,NONE)/$(1)$(
# Extension class
-gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt
+gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/license.txt
# UnpackedTarget class
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 0389eed..8ccec37 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -350,7 +350,7 @@ gb_CliAssemblyTarget_get_dll :=
# Extension class
-gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE
+gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE
# UnpackedTarget class
diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk
index 29ac9c4..fb00181 100644
--- a/solenv/gbuild/platform/mingw.mk
+++ b/solenv/gbuild/platform/mingw.mk
@@ -357,7 +357,7 @@ gb_CliAssemblyTarget_get_dll :=
# Extension class
-gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt
+gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/license.txt
# UnpackedTarget class
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 295fce6..2115a4a 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -374,7 +374,7 @@ gb_CliAssemblyTarget_get_dll :=
# Extension class
-gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE
+gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE
# UnpackedTarget class
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 81137a3..75d5d21 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -375,7 +375,7 @@ gb_CliAssemblyTarget_get_dll :=
# Extension class
-gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE
+gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE
# UnpackedTarget class
commit 6cf65f96123772565b76898dc6892f692696e673
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 30 21:18:16 2013 +0100
odk: merge Package_config_notwin into Packge_config
Change-Id: I021ae1bc6d816d359be364c221d70a0e178a8b80
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 56b9405..2fe4b61 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -36,10 +36,6 @@ $(eval $(call gb_Module_add_targets,odk,\
CustomTarget_config_win \
Package_config_win \
))
-else
-$(eval $(call gb_Module_add_targets,odk,\
- Package_config_notwin \
-))
endif
ifneq ($(ENABLE_JAVA),)
diff --git a/odk/Package_config.mk b/odk/Package_config.mk
index 6efe33b..e9c495e 100644
--- a/odk/Package_config.mk
+++ b/odk/Package_config.mk
@@ -7,21 +7,23 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,odk_config,$(SRCDIR)/odk/config))
+$(eval $(call gb_Package_Package,odk_config,$(SRCDIR)))
$(eval $(call gb_Package_set_outdir,odk_config,$(INSTDIR)))
ifeq ($(OS),WNT)
$(eval $(call gb_Package_add_files,odk_config,$(SDKDIRNAME),\
- cfgWin.js \
- setsdkenv_windows.template \
- setsdkname.bat \
+ odk/config/cfgWin.js \
+ odk/config/setsdkenv_windows.template \
+ odk/config/setsdkname.bat \
))
else
$(eval $(call gb_Package_add_files,odk_config,$(SDKDIRNAME),\
- configure.pl \
- setsdkenv_unix \
- setsdkenv_unix.sh.in \
+ config.guess \
+ config.sub \
+ odk/config/configure.pl \
+ odk/config/setsdkenv_unix \
+ odk/config/setsdkenv_unix.sh.in \
))
endif
diff --git a/odk/Package_config_notwin.mk b/odk/Package_config_notwin.mk
deleted file mode 100644
index 8bd2d51..0000000
--- a/odk/Package_config_notwin.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,odk_config_notwin,$(SRCDIR)))
-
-$(eval $(call gb_Package_set_outdir,odk_config_notwin,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,odk_config_notwin,$(SDKDIRNAME),\
- config.guess \
- config.sub \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 06fef8e..e9ba29c 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -96,13 +96,6 @@ File gid_File_Package_odk_config_win
Name = "odk_config_win.filelist";
Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
-#else
-File gid_File_Package_odk_config_notwin
- TXT_FILE_BODY;
- Dir = FILELIST_SDK_DIR;
- Name = "odk_config_notwin.filelist";
- Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
#endif
File gid_File_Package_odk_docs
commit 2b16f68044aa05e6d50537ba3b26a97571a7161e
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 30 17:00:29 2013 +0100
setup_native: remove Package_ulf
... instead hard-code macinstall.ulf location in installer.
Change-Id: I4a6b35c093ff3f4a19d84e8803821909a5ae03db
diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk
index 4228ea8..19226c2 100644
--- a/setup_native/Module_setup_native.mk
+++ b/setup_native/Module_setup_native.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_Module_add_targets,setup_native,\
ifeq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,setup_native,\
CustomTarget_mac \
- Package_ulf \
))
endif
diff --git a/setup_native/Package_ulf.mk b/setup_native/Package_ulf.mk
deleted file mode 100644
index 1f58bca..0000000
--- a/setup_native/Package_ulf.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,setup_native/ulf,$(call gb_CustomTarget_get_workdir,setup_native/mac)))
-
-$(eval $(call gb_Package_set_outdir,setup_native/ulf,$(OUTDIR)))
-
-$(eval $(call gb_Package_add_file,setup_native/ulf,bin/macinstall.ulf,macinstall.ulf))
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 23b76d0..bf0dba6 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -244,7 +244,7 @@ BEGIN
@packagelistitems = ("module", "solarispackagename", "packagename", "copyright", "vendor", "description" );
@featurecollector =();
$msiassemblyfiles = "";
- $macinstallfilename = "macinstall.ulf";
+ $macinstallfilename = $ENV{'WORKDIR'} . "/CustomTarget/setup_native/mac/macinstall.ulf";
$extensioninstalldir = "gid_Dir_Share_Extension_Install";
@languagenames = ();
%componentcondition = ();
commit 2a0a670945f9af760a1e8471427b63099dde9f56
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 30 16:56:19 2013 +0100
setup_native: remove Package_scripts_generated
... instead add an include path to the installer.
Change-Id: I5650d5d1d84620a04a9a92825733f3927da2053d
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 9467574..68febd5 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -78,7 +78,7 @@ LibreOffice
downloadname LibreOffice_{productversion}_{os}_install_{languages}
langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages}
- include {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
+ include {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native/scripts,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
}
}
@@ -131,7 +131,7 @@ LibreOffice_Dev
downloadname LibreOfficeDev_{productversion}_{os}_install_{languages}
langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
- include {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
+ include {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native/scripts,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
}
}
diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk
index 2e0c6ec..4228ea8 100644
--- a/setup_native/Module_setup_native.mk
+++ b/setup_native/Module_setup_native.mk
@@ -57,7 +57,6 @@ endif
$(eval $(call gb_Module_add_targets,setup_native,\
CustomTarget_scripts \
Package_scripts \
- Package_scripts_generated \
))
endif
diff --git a/setup_native/Package_scripts_generated.mk b/setup_native/Package_scripts_generated.mk
deleted file mode 100644
index ef15731..0000000
--- a/setup_native/Package_scripts_generated.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,scripts_generated,$(call gb_CustomTarget_get_workdir,setup_native/scripts)))
-
-$(eval $(call gb_Package_set_outdir,scripts_generated,$(OUTDIR)))
-
-ifeq ($(OS),SOLARIS)
-$(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/install,install))
-$(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/uninstall,uninstall))
-endif
-
-ifeq ($(OS),LINUX)
-ifneq ($(filter rpm,$(PKGFORMAT)),)
-$(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/install,install))
-$(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/uninstall,uninstall))
-endif
-endif
-# vim: set noet sw=4 ts=4:
commit 1860d65a78740eae66515cedefbcd3bf3ca37d5b
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 30 16:50:51 2013 +0100
setup_native: Package_packinfo to INSTDIR
Change-Id: I2d7804541e13f1696318059488acbcd8fea37fc3
diff --git a/setup_native/Package_packinfo.mk b/setup_native/Package_packinfo.mk
index 72fc10b..2519ead 100644
--- a/setup_native/Package_packinfo.mk
+++ b/setup_native/Package_packinfo.mk
@@ -7,10 +7,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,setup_native/packinfo,$(SRCDIR)/setup_native/source/packinfo))
+$(eval $(call gb_Package_Package,setup_native_packinfo,$(SRCDIR)/setup_native/source/packinfo))
-$(eval $(call gb_Package_set_outdir,setup_native/packinfo,$(OUTDIR)))
-
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/package.txt,package.txt))
+$(eval $(call gb_Package_add_file,setup_native_packinfo,$(LIBO_SHARE_FOLDER)/extensions/package.txt,package.txt))
# vim: set noet sw=4 ts=4:
commit 4066d3190305613ed042cad3978b5d737420cd2c
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 30 16:48:58 2013 +0100
setup_native: Package_misc to INSTDIR
Change-Id: Ieaceb78438712bf4bde05daf3a7fd0a82ad9baed
diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk
index 3daff3f..2e0c6ec 100644
--- a/setup_native/Module_setup_native.mk
+++ b/setup_native/Module_setup_native.mk
@@ -13,7 +13,6 @@ $(eval $(call gb_Module_add_targets,setup_native,\
$(if $(filter LINUX SOLARIS,$(OS)),Library_getuid) \
CustomTarget_spell \
Package_packinfo \
- Package_misc \
))
ifeq ($(OS),MACOSX)
@@ -23,6 +22,12 @@ $(eval $(call gb_Module_add_targets,setup_native,\
))
endif
+ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,setup_native,\
+ Package_misc \
+))
+endif
+
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_Module_add_targets,setup_native,\
Library_instooofiltmsi \
diff --git a/setup_native/Package_misc.mk b/setup_native/Package_misc.mk
index e03e5ca..a90a399 100644
--- a/setup_native/Package_misc.mk
+++ b/setup_native/Package_misc.mk
@@ -7,10 +7,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,setup_native/misc,$(SRCDIR)/setup_native/source))
+$(eval $(call gb_Package_Package,setup_native_misc,$(SRCDIR)/setup_native/source))
-$(eval $(call gb_Package_set_outdir,setup_native/misc,$(OUTDIR)))
-
-$(eval $(call gb_Package_add_file,setup_native/misc,bin/desktophelper.txt,win32/desktophelper.txt))
+$(eval $(call gb_Package_add_file,setup_native_misc,$(LIBO_BIN_FOLDER)/desktophelper.txt,win32/desktophelper.txt))
# vim: set noet sw=4 ts=4:
commit 862b9390b4fbfae37d01e06c954dd72eb9a008e1
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 30 16:42:30 2013 +0100
setup_native: find all static files in source/packinfo
... and move the OSX specific files there too so we don't need several
include paths.
Change-Id: I9368e12d4cf85da3795939b51540eaf7f5d0a7d3
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 2d886bb..9467574 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -78,7 +78,7 @@ LibreOffice
downloadname LibreOffice_{productversion}_{os}_install_{languages}
langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages}
- include {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir}
+ include {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
}
}
@@ -131,7 +131,7 @@ LibreOffice_Dev
downloadname LibreOfficeDev_{productversion}_{os}_install_{languages}
langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
- include {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir}
+ include {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
}
}
@@ -170,7 +170,7 @@ LibreOffice_SDK
active 1
compression 5
script sdkoo
- include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib
+ include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath}
}
}
@@ -216,6 +216,6 @@ LibreOffice_Dev_SDK
active 1
compression 5
script sdkoo
- include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib
+ include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath}
}
}
diff --git a/setup_native/Package_misc.mk b/setup_native/Package_misc.mk
index d154c88..e03e5ca 100644
--- a/setup_native/Package_misc.mk
+++ b/setup_native/Package_misc.mk
@@ -11,10 +11,6 @@ $(eval $(call gb_Package_Package,setup_native/misc,$(SRCDIR)/setup_native/source
$(eval $(call gb_Package_set_outdir,setup_native/misc,$(OUTDIR)))
-$(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store,mac/ooo/DS_Store))
-$(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store_Dev,mac/ooo/DS_Store_Dev))
-$(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store_Langpack,mac/ooo/DS_Store_Langpack))
-$(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/osxdndinstall.png,mac/ooo/osxdndinstall.png))
$(eval $(call gb_Package_add_file,setup_native/misc,bin/desktophelper.txt,win32/desktophelper.txt))
# vim: set noet sw=4 ts=4:
diff --git a/setup_native/Package_packinfo.mk b/setup_native/Package_packinfo.mk
index 7daaa28..72fc10b 100644
--- a/setup_native/Package_packinfo.mk
+++ b/setup_native/Package_packinfo.mk
@@ -11,24 +11,6 @@ $(eval $(call gb_Package_Package,setup_native/packinfo,$(SRCDIR)/setup_native/so
$(eval $(call gb_Package_set_outdir,setup_native/packinfo,$(OUTDIR)))
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/solariscopyrightfile,solariscopyrightfile))
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/linuxcopyrightfile,linuxcopyrightfile))
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/libreoffice.pcp,libreoffice.pcp))
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/openofficelanguagepack.pcp,openofficelanguagepack.pcp))
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/ure.pcp,ure.pcp))
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/finals_instsetoo.txt,finals_instsetoo.txt))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/package.txt,package.txt))
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/package_names.txt,package_names.txt))
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/package_names_ext.txt,package_names_ext.txt))
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_accessories.txt,packinfo_accessories.txt))
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_brand.txt,packinfo_brand.txt))
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_extensions.txt,packinfo_extensions.txt))
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_office.txt,packinfo_office.txt))
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_office_help.txt,packinfo_office_help.txt))
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_office_lang.txt,packinfo_office_lang.txt))
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_sdkoo.txt,packinfo_sdkoo.txt))
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_ure.txt,packinfo_ure.txt))
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/shellscripts_module.txt,shellscripts_module.txt))
-$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/spellchecker_selection.txt,spellchecker_selection.txt))
# vim: set noet sw=4 ts=4:
diff --git a/setup_native/source/mac/ooo/DS_Store b/setup_native/source/packinfo/DS_Store
similarity index 100%
rename from setup_native/source/mac/ooo/DS_Store
rename to setup_native/source/packinfo/DS_Store
diff --git a/setup_native/source/mac/ooo/DS_Store_Dev b/setup_native/source/packinfo/DS_Store_Dev
similarity index 100%
rename from setup_native/source/mac/ooo/DS_Store_Dev
rename to setup_native/source/packinfo/DS_Store_Dev
diff --git a/setup_native/source/mac/ooo/DS_Store_Langpack b/setup_native/source/packinfo/DS_Store_Langpack
similarity index 100%
rename from setup_native/source/mac/ooo/DS_Store_Langpack
rename to setup_native/source/packinfo/DS_Store_Langpack
diff --git a/setup_native/source/mac/ooo/osxdndinstall.png b/setup_native/source/packinfo/osxdndinstall.png
similarity index 100%
rename from setup_native/source/mac/ooo/osxdndinstall.png
rename to setup_native/source/packinfo/osxdndinstall.png
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 6e81431..573f731 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -271,6 +271,7 @@ sub check_system_environment
LOCAL_OUT
LOCAL_COMMON_OUT
WORKDIR
+ SRCDIR
);
for my $key ( @environmentvariables )
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index c777125..124ed58 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -70,6 +70,9 @@ sub create_pathvariables
my $filelistpath = $environment->{'WORKDIR'};
$variables{'filelistpath'} = $filelistpath;
+ my $packinfopath = $environment->{'SRCDIR'} . $installer::globals::separator . "setup_native/source/packinfo";
+ $variables{'packinfopath'} = $packinfopath;
+
return \%variables;
}
commit ded43f722664799c8bcd035289f60d37020f3c5d
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 30 16:25:35 2013 +0100
setup_native: deliver Package_scripts to INSTDIR
Change-Id: I34512ab58696405cb439593e91995284ccbf7436
diff --git a/setup_native/Package_scripts.mk b/setup_native/Package_scripts.mk
index 238c371..53ddd96 100644
--- a/setup_native/Package_scripts.mk
+++ b/setup_native/Package_scripts.mk
@@ -7,12 +7,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,setup_native/scripts,$(SRCDIR)/setup_native/scripts))
-
-$(eval $(call gb_Package_set_outdir,setup_native/scripts,$(OUTDIR)))
+$(eval $(call gb_Package_Package,setup_native_scripts,$(SRCDIR)/setup_native/scripts))
ifeq ($(ENABLE_ONLINE_UPDATE),TRUE)
-$(eval $(call gb_Package_add_file,setup_native/scripts,bin/unpack_update,unpack_update.sh))
+$(eval $(call gb_Package_add_file,setup_native_scripts,$(LIBO_BIN_FOLDER)/unpack_update,unpack_update.sh))
endif
# vim: set noet sw=4 ts=4:
commit ee27b235f620b09845f6909fffad6bb120222464
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 30 16:24:45 2013 +0100
setup_native: use various scripts directly from SRCDIR
Change-Id: I6c53fed0a4eace9b306ce0ab425f16fa0ca7d7b3
diff --git a/setup_native/Package_scripts.mk b/setup_native/Package_scripts.mk
index 997f122..238c371 100644
--- a/setup_native/Package_scripts.mk
+++ b/setup_native/Package_scripts.mk
@@ -11,11 +11,6 @@ $(eval $(call gb_Package_Package,setup_native/scripts,$(SRCDIR)/setup_native/scr
$(eval $(call gb_Package_set_outdir,setup_native/scripts,$(OUTDIR)))
-$(eval $(call gb_Package_add_file,setup_native/scripts,bin/mac_install.script,mac_install.script))
-$(eval $(call gb_Package_add_file,setup_native/scripts,bin/osx_install_languagepack.applescript,osx_install_languagepack.applescript))
-$(eval $(call gb_Package_add_file,setup_native/scripts,bin/langpackscript.sh,langpackscript.sh))
-$(eval $(call gb_Package_add_file,setup_native/scripts,bin/downloadscript.sh,downloadscript.sh))
-
ifeq ($(ENABLE_ONLINE_UPDATE),TRUE)
$(eval $(call gb_Package_add_file,setup_native/scripts,bin/unpack_update,unpack_update.sh))
endif
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 6f83943..4d3bd67 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -741,23 +741,12 @@ sub create_download_sets
else
{
# find and read setup script template
- my $scriptfilename = "downloadscript.sh";
+ my $scriptfilename = $ENV{'SRCDIR'} . "/setup_native/scripts/downloadscript.sh";
- my $scriptref = "";
+ if (! -f $scriptfilename) { installer::exiter::exit_program("ERROR: Could not find script file $scriptfilename!", "create_download_sets"); }
+ my $scriptfile = installer::files::read_file($scriptfilename);
- if ( $installer::globals::include_paths_read )
- {
- $scriptref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptfilename, $includepatharrayref, 0);
- }
- else
- {
- $scriptref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$scriptfilename, $includepatharrayref, 0);
- }
-
- if ($$scriptref eq "") { installer::exiter::exit_program("ERROR: Could not find script file $scriptfilename!", "create_download_sets"); }
- my $scriptfile = installer::files::read_file($$scriptref);
-
- $infoline = "Found script file $scriptfilename: $$scriptref \n";
+ $infoline = "Found script file $scriptfilename \n";
push( @installer::globals::logfileinfo, $infoline);
# add product name into script template
diff --git a/solenv/bin/modules/installer/languagepack.pm b/solenv/bin/modules/installer/languagepack.pm
index 6288d35..cc927b1 100644
--- a/solenv/bin/modules/installer/languagepack.pm
+++ b/solenv/bin/modules/installer/languagepack.pm
@@ -454,12 +454,11 @@ sub build_installer_for_languagepack
# find and read setup script template
- my $scriptfilename = "langpackscript.sh";
- my $scriptref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptfilename, $includepatharrayref, 0);
- if ($$scriptref eq "") { installer::exiter::exit_program("ERROR: Could not find script file $scriptfilename!", "build_installer_for_languagepack"); }
- my $scriptfile = installer::files::read_file($$scriptref);
+ my $scriptfilename = $ENV{'SRCDIR'} . "/setup_native/scripts/langpackscript.sh";
+ if (! -f $scriptfilename) { installer::exiter::exit_program("ERROR: Could not find script file $scriptfilename!", "build_installer_for_languagepack"); }
+ my $scriptfile = installer::files::read_file($scriptfilename);
- my $infoline = "Found script file $scriptfilename: $$scriptref \n";
+ my $infoline = "Found script file $scriptfilename: $scriptfile \n";
push( @installer::globals::logfileinfo, $infoline);
# find and read english license file
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index ef42bdb..554e0d8 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -342,25 +342,24 @@ sub create_package
my $scriptfilename = "";
if ( $installer::globals::languagepack ) { $scriptfilename = "osx_install_languagepack.applescript"; }
if ( $installer::globals::helppack ) { $scriptfilename = "osx_install_helppack.applescript"; }
- my $scripthelpersolverfilename = "mac_install.script";
+ my $scripthelperfilename = $ENV{'SRCDIR'} . "/setup_native/scripts/mac_install.script";
# my $scripthelperrealfilename = $volume_name;
my $scripthelperrealfilename = $volume_name_classic_app;
my $translationfilename = $installer::globals::macinstallfilename;
# Finding both files in solver
- my $scriptref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$scriptfilename, $includepatharrayref, 0);
- if ($$scriptref eq "") { installer::exiter::exit_program("ERROR: Could not find Apple script $scriptfilename!", "create_package"); }
- my $scripthelperref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$scripthelpersolverfilename, $includepatharrayref, 0);
- if ($$scripthelperref eq "") { installer::exiter::exit_program("ERROR: Could not find Apple script $scripthelpersolverfilename!", "create_package"); }
+ my $scriptref = $ENV{'SRCDIR'} . "/setup_native/scripts/" . $scriptfilename;
+ if (! -f $scriptref) { installer::exiter::exit_program("ERROR: Could not find Apple script $scriptfilename ($scriptref)!", "create_package"); }
+ if (! -f $scripthelperfilename) { installer::exiter::exit_program("ERROR: Could not find Apple script $scripthelperfilename!", "create_package"); }
my $translationfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$translationfilename, $includepatharrayref, 0);
if ($$translationfileref eq "") { installer::exiter::exit_program("ERROR: Could not find Apple script translation file $translationfilename ( includepatharrayref = $includepatharrayref )", "create_package"); }
$scriptfilename = $contentsfolder . "/" . $scriptrealfilename;
$scripthelperrealfilename = $contentsfolder . "/" . $scripthelperrealfilename;
- installer::systemactions::copy_one_file($$scriptref, $scriptfilename);
- installer::systemactions::copy_one_file($$scripthelperref, $scripthelperrealfilename);
+ installer::systemactions::copy_one_file($scriptref, $scriptfilename);
+ installer::systemactions::copy_one_file($scripthelperfilename, $scripthelperrealfilename);
# Replacing variables in script $scriptfilename
# Localizing script $scriptfilename
commit bdd97ec6ee5ad96fd2452ce99b3ebd28e540629a
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 30 15:58:42 2013 +0100
setup_native: remove obsolete scripts
- update.sh is broken by design (i#116865)
- javaloader.sh belongs to the obsolete Java GUI installer
- admin.pl is not used by the build and is possibly useful
Change-Id: I5e4c43b09a1726075e6d5ddd85cae6109788e51e
diff --git a/setup_native/Package_scripts.mk b/setup_native/Package_scripts.mk
index e944743..997f122 100644
--- a/setup_native/Package_scripts.mk
+++ b/setup_native/Package_scripts.mk
@@ -11,12 +11,9 @@ $(eval $(call gb_Package_Package,setup_native/scripts,$(SRCDIR)/setup_native/scr
$(eval $(call gb_Package_set_outdir,setup_native/scripts,$(OUTDIR)))
-$(eval $(call gb_Package_add_file,setup_native/scripts,bin/admin.pl,admin.pl))
$(eval $(call gb_Package_add_file,setup_native/scripts,bin/mac_install.script,mac_install.script))
$(eval $(call gb_Package_add_file,setup_native/scripts,bin/osx_install_languagepack.applescript,osx_install_languagepack.applescript))
$(eval $(call gb_Package_add_file,setup_native/scripts,bin/langpackscript.sh,langpackscript.sh))
-$(eval $(call gb_Package_add_file,setup_native/scripts,bin/javaloader.sh,javaloader.sh))
-$(eval $(call gb_Package_add_file,setup_native/scripts,bin/update,update.sh))
$(eval $(call gb_Package_add_file,setup_native/scripts,bin/downloadscript.sh,downloadscript.sh))
ifeq ($(ENABLE_ONLINE_UPDATE),TRUE)
diff --git a/setup_native/scripts/javaloader.sh b/setup_native/scripts/javaloader.sh
deleted file mode 100644
index 1b20899..0000000
--- a/setup_native/scripts/javaloader.sh
+++ /dev/null
@@ -1,565 +0,0 @@
-#!/bin/sh
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-jarfilename="JavaSetup.jar"
-tempdir=/var/tmp/install_$$
-java_runtime="java"
-java_runtime_set="no"
-java_runtime_found="no"
-java_runtime_sufficient="no"
-java_versions_supported="1.4 1.5 1.6"
-rpm2cpio_found="no"
-rpm_found="no"
-is_64bit_arch="no"
-arch64string="x86_64"
-arch64string2="64-bit"
-sunjavahotspot="HotSpot"
-errortext=""
-errorcode=""
-
-start_java()
-{
- umask 022
-
- echo "Using $java_runtime"
- echo `$java_runtime -version`
- echo "Running installer"
-
- # looking for environment variables
-
- home=""
- if [ "x" != "x$HOME" ]; then
- home=-DHOME=$HOME
- fi
-
- log_module_states=""
- if [ "x" != "x$LOG_MODULE_STATES" ]; then
- log_module_states=-DLOG_MODULE_STATES=$LOG_MODULE_STATES
- fi
-
- getuid_path=""
- if [ "x" != "x$GETUID_PATH" ]; then
- getuid_path=-DGETUID_PATH=$GETUID_PATH
- fi
-
- if [ "x" != "x$jrefile" ]; then
- jrecopy=-DJRE_FILE=$jrefile
- fi
-
- # run the installer class file
- echo $java_runtime $home $log_module_states $getuid_path $jrecopy -jar $jarfilename
- $java_runtime $home $log_module_states $getuid_path $jrecopy -jar $jarfilename
-}
-
-cleanup()
-{
- if [ "x$tempdir" != "x" -a -d "$tempdir" ]; then
- rm -rf $tempdir
- fi
-}
-
-do_exit()
-{
- exitstring=$errortext
- if [ "x" != "x$errorcode" ]; then
- exitstring="$exitstring (exit code $errorcode)"
- fi
-
- # simply echo the exitstring or open a xterm
- # -> dependent from tty
-
- if tty ; then
- echo $exitstring
- else
- mkdir $tempdir
-
- # creating error file
- errorfile=$tempdir/error
-
- cat > $errorfile << EOF
-echo "$exitstring"
-echo "Press return to continue ..."
-read a
-EOF
-
- chmod 755 $errorfile
-
- # searching for xterm in path
- xtermname="xterm"
- xtermfound="no";
- for i in `echo $PATH | sed -e 's/^:/.:/g' -e 's/:$/:./g' -e 's/::/:.:/g' -e 's/:/ /g'`; do
- if [ -x "$i/$xtermname" -a ! -d "$i/$xtermname" ]; then
- xtermname="$i/$xtermname"
- xtermfound="yes"
- break
- fi
- done
-
- if [ $xtermfound = "no" -a "`uname -s`" = "SunOS" ]; then
- if [ -x /usr/openwin/bin/xterm ]; then
- xtermname=/usr/openwin/bin/xterm
- xtermfound="yes"
- fi
- fi
-
- if [ $xtermfound = "yes" ]; then
- $xtermname -e $errorfile
- fi
- fi
-
- cleanup
-
- exit $errorcode
-}
-
-set_jre_for_uninstall()
-{
- # if "uninstalldata" exists, this is not required
- if [ ! -d "uninstalldata" ]; then
- packagepath="RPMS"
- jrefile=`find $packagepath -type f -name "jre*.rpm" -print`
- jrefile=`basename $jrefile`
- if [ -z "$jrefile" ]; then
- jrefile="notfound"
- fi
-
- # check existence of jre rpm
- if [ ! -f $packagepath/$jrefile ]; then
- errortext="Error: Java Runtime Environment (JRE) not found in directory: $packagepath"
- errorcode="4"
- do_exit
- fi
- fi
-}
-
-install_linux_rpm()
-{
- # Linux requires usage of rpm2cpio to install JRE with user privileges
- # 1. --relocate /usr/java=/var/tmp does not work, because not all files are
- # relocatable. Some are always installed into /etc
- # 2. --root only works with root privileges. With user privileges only the
- # database is shifted, but not the files.
-
- # On Linux currently rpm2cpio is required (and rpm anyhow)
-
- find_rpm2cpio()
-
- if [ ! "$rpm2cpio_found" = "yes" ]; then
- errortext="Error: Did not find rpm2cpio. rpm2cpio is currently required for installations on Linux."
- errorcode="11"
- do_exit
- fi
-
- find_rpm()
-
- if [ ! "$rpm_found" = "yes" ]; then
- errortext="Error: Did not find rpm. rpm is currently required for installations on Linux."
- errorcode="12"
- do_exit
- fi
-
- # jrefile=jre-6-linux-i586.rpm
- # javahome=usr/java/jre1.6.0
-
- packagepath="RPMS"
-
- # using "uninstalldata" for uninstallation
- if [ -d "uninstalldata" ]; then
- packagepath="uninstalldata/jre"
- fi
-
- jrefile=`find $packagepath -type f -name "jre*.rpm" -print`
- jrefile=`basename $jrefile`
- if [ -z "$jrefile" ]; then
- jrefile="notfound"
- fi
-
- # check existence of jre rpm
- if [ ! -f $packagepath/$jrefile ]; then
- errortext="Error: Java Runtime Environment (JRE) not found in directory: $packagepath"
- errorcode="4"
- do_exit
- fi
-
- PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar"
-
- mkdir $tempdir
-
- trap 'rm -rf $tempdir; exit 1' HUP INT QUIT TERM
-
- tempjrefile=$tempdir/$jrefile
- cp $packagepath/$jrefile $tempjrefile
-
- if [ ! -f "$tempjrefile" ]; then
- errortext="Error: Failed to copy Java Runtime Environment (JRE) temporarily."
- errorcode="5"
- do_exit
- fi
-
- # check if copy was successful
- if [ -x /usr/bin/sum ]; then
-
- echo "Checksumming..."
-
- sumA=`/usr/bin/sum $packagepath/$jrefile`
- index=1
- for s in $sumA; do
- case $index in
- 1)
- sumA1=$s;
- index=2;
- ;;
- 2)
- sumA2=$s;
- index=3;
- ;;
- esac
- done
-
- sumB=`/usr/bin/sum $tempjrefile`
- index=1
- for s in $sumB; do
- case $index in
- 1)
- sumB1=$s;
- index=2;
- ;;
- 2)
- sumB2=$s;
- index=3;
- ;;
- esac
- done
-
- # echo "Checksum 1: A1: $sumA1 B1: $sumB1"
- # echo "Checksum 2: A2: $sumA2 B2: $sumB2"
-
- if [ $sumA1 -ne $sumB1 ] || [ $sumA2 -ne $sumB2 ]; then
- errortext="Error: Failed to install Java Runtime Environment (JRE) temporarily."
- errorcode="6"
- do_exit
- fi
- else
- echo "Can't find /usr/bin/sum to do checksum. Continuing anyway."
- fi
-
- # start to install jre
- echo "Extracting ..."
- olddir=`pwd`
- cd "$tempdir"
- rpm2cpio $tempjrefile | cpio -i --make-directories
- rm -f $tempjrefile # we do not need it anymore, so conserve discspace
-
- javahomeparent=usr/java
- javahomedir=`find $javahomeparent -maxdepth 1 -type d -name "jre*" -print`
- javahomedir=`basename $javahomedir`
- if [ -z "$javahomedir" ]; then
- javahomedir="notfound"
- fi
-
- javahome=$javahomeparent/$javahomedir
-
- if [ ! -d ${javahome} ]; then
- errortext="Error: Failed to extract the Java Runtime Environment (JRE) files."
- errorcode="7"
- do_exit
- fi
-
- UNPACK_EXE=$javahome/bin/unpack200
- if [ -f $UNPACK_EXE ]; then
- chmod +x $UNPACK_EXE
- packerror=""
- for i in $PACKED_JARS; do
- if [ -f $javahome/`dirname $i`/`basename $i .jar`.pack ]; then
- # printf "Creating %s\n" $javahome/$i
- $UNPACK_EXE $javahome/`dirname $i`/`basename $i .jar`.pack $javahome/$i
- if [ $? -ne 0 ] || [ ! -f $javahome/$i ]; then
- printf "ERROR: Failed to unpack JAR file:\n\n\t%s\n\n" $i
- printf "Installation failed. Please refer to the Troubleshooting Section of\n"
- printf "the Installation Instructions on the download page.\n"
- packerror="1"
- break
- fi
-
- # remove the old pack file
- rm -f $javahome/`dirname $i`/`basename $i .jar`.pack
- fi
- done
- if [ "$packerror" = "1" ]; then
- if [ -d $javahome ]; then
- /bin/rm -rf $javahome
- fi
-
- errortext="Error: Failed to extract the Java Runtime Environment (JRE) files."
- errorcode="8"
- do_exit
- fi
- fi
-
- PREFS_LOCATION="`echo \"${javahome}\" | sed -e 's/^jdk.*/&\/jre/'`/.systemPrefs"
-
- if [ ! -d "${PREFS_LOCATION}" ]; then
- mkdir -m 755 "${PREFS_LOCATION}"
- fi
- if [ ! -f "${PREFS_LOCATION}/.system.lock" ]; then
- touch "${PREFS_LOCATION}/.system.lock"
- chmod 644 "${PREFS_LOCATION}/.system.lock"
- fi
- if [ ! -f "${PREFS_LOCATION}/.systemRootModFile" ]; then
- touch "${PREFS_LOCATION}/.systemRootModFile"
- chmod 644 "${PREFS_LOCATION}/.systemRootModFile"
- fi
-
- if [ x$ARCH = "x32" ] && [ -f "$javahome/bin/java" ]; then
- "$javahome/bin/java" -client -Xshare:dump > /dev/null 2>&1
- fi
-
- java_runtime=$tempdir/$javahome/bin/java
-
- # Make symbolic links to all TrueType font files installed in the system
- # to avoid garbles for Japanese, Korean or Chinese
- language=`printenv LANG | cut -c 1-3`
- if [ x$language = "xja_" -o x$language = "xko_" -o x$language = "xzh_" ]; then
- font_fallback_dir=$javahome/lib/fonts/fallback
- echo "Making symbolic links to TrueType font files into $font_fallback_dir."
- mkdir -p $font_fallback_dir
- ttf_files=`locate "*.ttf" | xargs`
- if [ x$ttf_files = "x" ]; then
- ttf_files=`find /usr/share/fonts/ -name "*ttf"`
- if [ x$ttf_files = "x" ]; then
- ttf_files=`find /usr/X11R6/lib/ -name "*ttf"`
- fi
- fi
- ln -s $ttf_files $font_fallback_dir
- fi
-
- echo "Done."
- cd "$olddir"
-}
-
-find_rpm2cpio()
-{
- # searching for rpm2cpio in path
- for i in `echo $PATH | sed -e 's/^:/.:/g' -e 's/:$/:./g' -e 's/::/:.:/g' -e 's/:/ /g'`; do
- if [ -x "$i/rpm2cpio" -a ! -d "$i/$rpm2cpio" ]; then
- rpm2cpio_found="yes"
- break
- fi
- done
-}
-
-find_rpm()
-{
- # searching for rpm in path
- for i in `echo $PATH | sed -e 's/^:/.:/g' -e 's/:$/:./g' -e 's/::/:.:/g' -e 's/:/ /g'`; do
- if [ -x "$i/rpm" -a ! -d "$i/$rpm" ]; then
- rpm_found="yes"
- break
- fi
- done
-}
-
-check_architecture()
-{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list