[Libreoffice-commits] core.git: 3 commits - Repository.mk scp2/InstallModule_ooo.mk scp2/source setup_native/Module_setup_native.mk setup_native/Package_scripts.mk
Matúš Kukan
matus.kukan at gmail.com
Fri Dec 2 19:16:31 UTC 2016
Repository.mk | 7 +
scp2/InstallModule_ooo.mk | 8 -
scp2/source/onlineupdate/file_onlineupdate.scp | 9 --
scp2/source/onlineupdate/module_onlineupdate.scp | 1
scp2/source/ooo/common_brand.scp | 95 ++---------------------
scp2/source/ooo/common_brand_readme.scp | 33 -------
scp2/source/ooo/ure.scp | 16 ---
setup_native/Module_setup_native.mk | 24 +----
setup_native/Package_scripts.mk | 4
9 files changed, 26 insertions(+), 171 deletions(-)
New commits:
commit f80d618cedafef73eb27fd994a1b5356ea693585
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Dec 2 16:16:53 2016 +0100
scp2: Bin not defined gids and not used defines
And a little cleanup.
Change-Id: Id066b4d37e217b8ab21ea162c23a999566a9e190
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index a681f18..ade0cbd 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -38,16 +38,9 @@ $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\
))
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
- $(if $(WINDOWS_SDK_HOME),\
- -DHAVE_WINDOWS_SDK \
- ) \
$(if $(SYSTEM_HSQLDB),\
-DHSQLDB_JAR=\""$(call gb_Helper_make_path,$(HSQLDB_JAR))"\" \
) \
- $(if $(MACOSX_SDK_VERSION),\
- -DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION) \
- ) \
- $(if $(filter MSC,$(COM)),$(if $(MSVC_USE_DEBUG_RUNTIME),-DMSVC_PKG_DEBUG_RUNTIME)) \
))
ifeq ($(USING_X11),TRUE)
@@ -71,7 +64,6 @@ $(eval $(call gb_InstallModule_add_templates,scp2/ooo,\
$(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
scp2/source/ooo/common_brand \
- scp2/source/ooo/common_brand_readme \
scp2/source/ooo/directory_ooo \
scp2/source/ooo/directory_ooo_macosx \
scp2/source/ooo/file_extra_ooo \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 2bb6801..1f88ada 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -58,19 +58,10 @@ Module gid_Module_Root_Brand
gid_Brand_File_Gdb_Trace,
gid_Brand_File_Bin_Unoinfo,
gid_Brand_File_Desktophelper_Txt,
- gid_Brand_File_Lib_Dbghelp,
- gid_Brand_File_Lib_Mingw_GccS,
- gid_Brand_File_Lib_Mingw_Stdcpp,
- gid_Brand_File_Lib_Msvcr80,
- gid_Brand_File_Lib_Msvcp80,
- gid_Brand_File_Lib_Msvcm80,
- gid_Brand_File_Msvcm80crt_Manifest,
- gid_Brand_File_Share_Registry_O5oo_Xcd,
gid_Brand_File_Script_Unopkg,
gid_Brand_File_Share_Xdg_Base,
gid_Brand_File_Share_Xdg_Calc,
gid_Brand_File_Share_Xdg_Draw,
- gid_Brand_File_Share_Xdg_Extension,
gid_Brand_File_Share_Xdg_Impress,
gid_Brand_File_Share_Xdg_Math,
gid_Brand_File_Share_Xdg_QStart,
@@ -90,8 +81,7 @@ Module gid_Module_Langpack_Brand_Template
Dirs = (gid_Brand_Dir_Program_Shell,
gid_Brand_Dir_Readme);
Files = (gid_Brand_File_Readme_Readme,
- gid_Brand_File_Share_Registry_Cjk_Xcd,
- gid_Brand_File_Txt_Readme);
+ gid_Brand_File_Share_Registry_Cjk_Xcd);
End
// Directories
@@ -503,6 +493,18 @@ File gid_Brand_File_Script_Unopkg
End
#endif
+File gid_Brand_File_Readme_Readme
+ TXT_FILE_BODY;
+ Dir = gid_Brand_Dir_Readme;
+ #ifdef UNX
+ README_ALL_LANG(Name, README);
+ #endif
+ #ifdef WNT
+ README_TXT_ALL_LANG(Name, readme, txt);
+ #endif
+ Styles = (PACKED, SCPZIP_REPLACE);
+End
+
File gid_Brand_File_Share_Registry_Cjk_Xcd
TXT_FILE_BODY;
Styles = (PACKED,MAKE_LANG_SPECIFIC);
diff --git a/scp2/source/ooo/common_brand_readme.scp b/scp2/source/ooo/common_brand_readme.scp
deleted file mode 100644
index be3469d..0000000
--- a/scp2/source/ooo/common_brand_readme.scp
+++ /dev/null
@@ -1,33 +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"
-
-// Files
-
-File gid_Brand_File_Readme_Readme
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Readme;
- #ifdef UNX
- README_ALL_LANG(Name, README);
- #endif
- #ifdef WNT
- README_TXT_ALL_LANG(Name, readme, txt);
- #endif
- Styles = (PACKED, SCPZIP_REPLACE);
-End
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 61af96a..ec1cafe 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -293,9 +293,6 @@ Module gid_Module_Root_Ure_Hidden
Styles = (HIDDEN_ROOT);
Dirs = (gid_Dir_Ure_Share_Misc);
Files = (auto_ure_ALL,
- gid_File_ThirdpartylicensereadmeHtml_Ure,
- gid_File_Readme_Ure,
- gid_File_License_Ure,
gid_File_Dl_Cli_Ure_Assembly,
gid_File_Dl_Policy_Cli_Ure_Assembly,
gid_File_Dl_Policy_Cli_Ure_Config,
@@ -311,25 +308,13 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Lib_Cli_Cppuhelper_Assembly,
gid_File_Lib_Policy_Cli_Cppuhelper_Assembly,
gid_File_Lib_Policy_Cli_Cppuhelper_Config,
- gid_File_Dl_Cppu,
gid_Unixlink_File_Dl_Cppu,
- gid_File_Dl_Cppuhelper,
gid_Unixlink_File_Dl_Cppuhelper,
- gid_File_Dl_PurpEnvHelper,
gid_Unixlink_File_Dl_PurpEnvHelper,
- gid_File_Dl_Sal,
gid_Unixlink_File_Dl_Sal,
- gid_File_Dl_Salhelper,
gid_Unixlink_File_Dl_Salhelper,
- gid_File_Dl_Profile_Uno,
- gid_Unixlink_File_Dl_Rmcxt,
gid_File_Lib_Mingw_GccS_Ure,
gid_File_Lib_Mingw_Stdcpp_Ure,
- gid_File_Dl_Uwinapi,
- gid_File_Lib_Msvcr80_Ure,
- gid_File_Lib_Msvcp80_Ure,
- gid_File_Lib_Msvcm80_Ure,
- gid_File_Msvcm80crt_Manifest_Ure,
gid_File_Misc_TypesRdb,
gid_File_Misc_ServicesRdb);
Unixlinks = (gid_Unixlink_File_Dl_Sal,
@@ -337,7 +322,6 @@ Module gid_Module_Root_Ure_Hidden
gid_Unixlink_File_Dl_Cppu,
gid_Unixlink_File_Dl_Cppuhelper,
gid_Unixlink_File_Dl_PurpEnvHelper,
- gid_Unixlink_File_Dl_Rmcxt,
gid_Unixlink_File_Dl_Libxml2);
End
commit 6de5cf050c1324cb97404486e541472e74a7dd19
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Dec 2 11:31:50 2016 +0100
tdf#90753: AutoInstall readlicense_oo packages
Change-Id: I5bd3a5f6168b20c925f5713085fcb0918bcccc8e
diff --git a/Repository.mk b/Repository.mk
index 0be3d13..b5326e9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -909,6 +909,8 @@ $(eval $(call gb_Helper_register_packages_for_install,brand,\
desktop_branding \
$(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \
$(if $(and $(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),desktop_soffice_sh) \
+ readlicense_oo_files \
+ $(if $(filter WNT,$(OS)),readlicense_oo_license) \
$(call gb_Helper_optional,DESKTOP,setup_native_packinfo) \
))
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 68eb9cb..2bb6801 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -58,7 +58,6 @@ Module gid_Module_Root_Brand
gid_Brand_File_Gdb_Trace,
gid_Brand_File_Bin_Unoinfo,
gid_Brand_File_Desktophelper_Txt,
- gid_Brand_File_Html_Thirdpartylicensereadme,
gid_Brand_File_Lib_Dbghelp,
gid_Brand_File_Lib_Mingw_GccS,
gid_Brand_File_Lib_Mingw_Stdcpp,
@@ -77,11 +76,7 @@ Module gid_Module_Root_Brand
gid_Brand_File_Share_Xdg_QStart,
gid_Brand_File_Share_Xdg_StartCenter,
gid_Brand_File_Share_Xdg_Writer,
- gid_Brand_File_Share_Xdg_XsltFilter,
- gid_License_Txt,
- git_License_Odt,
- gid_Credits_Odt,
- gid_Apache_Notice);
+ gid_Brand_File_Share_Xdg_XsltFilter);
End
// Language specific brand module
@@ -469,17 +464,6 @@ End
// Files
-File gid_Brand_File_Html_Thirdpartylicensereadme
- Name = "LICENSE.html";
-#if defined MACOSX
- Dir = gid_Dir_Bundle_Contents_Resources;
-#else
- Dir = gid_Dir_Brand_Root;
-#endif
- Styles = (WORKSTATION);
- TXT_FILE_BODY;
-End
-
#if defined UNX && !defined MACOSX
File gid_Brand_File_Gdb_Trace
@@ -1231,52 +1215,3 @@ ProfileItem gid_Brand_Profileitem_Setup_Install
Styles = (INIFILETABLE);
End
#endif
-
-File gid_License_Txt
- TXT_FILE_BODY;
-#if defined MACOSX
- Dir = gid_Dir_Bundle_Contents_Resources;
-#else
- Dir = gid_Dir_Brand_Root;
-#endif
- #ifdef UNX
- Name = "LICENSE";
- #endif
- #ifdef WNT
- Name = "license.txt";
- #endif
- Styles = (PACKED);
-End
-
-File gid_License_Odt
- TXT_FILE_BODY;
-#if defined MACOSX
- Dir = gid_Dir_Bundle_Contents_Resources;
-#else
- Dir = gid_Dir_Brand_Root;
-#endif
- Name = "LICENSE.fodt";
- Styles = (PACKED);
-End
-
-File gid_Credits_Odt
- TXT_FILE_BODY;
-#if defined MACOSX
- Dir = gid_Dir_Bundle_Contents_Resources;
-#else
- Dir = gid_Dir_Brand_Root;
-#endif
- Name = "CREDITS.fodt";
- Styles = (PACKED);
-End
-
-File gid_Apache_Notice
- TXT_FILE_BODY;
-#if defined MACOSX
- Dir = gid_Dir_Bundle_Contents_Resources;
-#else
- Dir = gid_Dir_Brand_Root;
-#endif
- Name = "NOTICE";
- Styles = (PACKED);
-End
commit 67398a8d9746dbed743beb702a8cff2eac2bbf99
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Dec 1 22:19:04 2016 +0100
tdf#90753: AutoInstall setup_native packages
Change-Id: Iecf059b974b996fceb57b04197c7dac9b7c8dd47
diff --git a/Repository.mk b/Repository.mk
index bcf63d4..0be3d13 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -909,6 +909,7 @@ $(eval $(call gb_Helper_register_packages_for_install,brand,\
desktop_branding \
$(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \
$(if $(and $(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),desktop_soffice_sh) \
+ $(call gb_Helper_optional,DESKTOP,setup_native_packinfo) \
))
ifeq ($(USING_X11), TRUE)
@@ -937,6 +938,10 @@ $(eval $(call gb_Helper_register_packages_for_install,writer_brand,\
))
endif # USING_X11=TRUE
+$(eval $(call gb_Helper_register_packages_for_install,onlineupdate,\
+ $(if $(ENABLE_ONLINE_UPDATE),$(if $(filter LINUX SOLARIS,$(OS)),setup_native_scripts)) \
+))
+
ifneq ($(DISABLE_PYTHON),TRUE)
$(eval $(call gb_Helper_register_packages_for_install,python, \
pyuno_pythonloader_ini \
diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
index 442d9ce..98a5da5 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -25,12 +25,3 @@ File gid_File_Share_Registry_Onlineupdate_Xcd
Name = "onlineupdate.xcd";
ComponentCondition="ISCHECKFORPRODUCTUPDATES=1";
End
-
-#if defined LINUX || defined SOLARIS
-File gid_File_Bin_UnpackUpdate
- BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "unpack_update";
- Styles = (PACKED);
-End
-#endif
diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp
index a2afd3a..4225bb7 100644
--- a/scp2/source/onlineupdate/module_onlineupdate.scp
+++ b/scp2/source/onlineupdate/module_onlineupdate.scp
@@ -28,6 +28,5 @@ Module gid_Module_Optional_Onlineupdate
Default = YES;
Styles = ();
Files = (auto_onlineupdate_ALL,
- gid_File_Bin_UnpackUpdate,
gid_File_Share_Registry_Onlineupdate_Xcd);
End
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 8e90992..68eb9cb 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -78,7 +78,6 @@ Module gid_Module_Root_Brand
gid_Brand_File_Share_Xdg_StartCenter,
gid_Brand_File_Share_Xdg_Writer,
gid_Brand_File_Share_Xdg_XsltFilter,
- gid_Brand_File_Txt_Package,
gid_License_Txt,
git_License_Odt,
gid_Credits_Odt,
@@ -520,13 +519,6 @@ File gid_Brand_File_Script_Unopkg
End
#endif
-File gid_Brand_File_Txt_Package
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Share_Extensions;
- Name = "package.txt";
- Styles = (PACKED);
-End
-
File gid_Brand_File_Share_Registry_Cjk_Xcd
TXT_FILE_BODY;
Styles = (PACKED,MAKE_LANG_SPECIFIC);
diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk
index d0f935e..163bd4e 100644
--- a/setup_native/Module_setup_native.mk
+++ b/setup_native/Module_setup_native.mk
@@ -11,25 +11,19 @@ $(eval $(call gb_Module_Module,setup_native))
$(eval $(call gb_Module_add_targets,setup_native,\
$(if $(filter LINUX SOLARIS,$(OS)),Library_getuid) \
+ $(if $(filter MACOSX,$(OS)),CustomTarget_mac) \
CustomTarget_spell \
+ $(if $(filter WNT,$(OS)),Package_misc) \
Package_packinfo \
+ $(if $(filter LINUX SOLARIS,$(OS)), \
+ CustomTarget_scripts \
+ $(if $(ENABLE_ONLINE_UPDATE),Package_scripts) \
+ ) \
))
-ifeq ($(OS),MACOSX)
-$(eval $(call gb_Module_add_targets,setup_native,\
- CustomTarget_mac \
-))
-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 \
+ Library_instooofiltmsi \
Library_qslnkmsi \
Library_reg4allmsdoc \
$(if $(DISABLE_ACTIVEX),,Library_regactivex) \
@@ -52,10 +46,6 @@ $(eval $(call gb_Module_add_targets,setup_native,\
))
endif
-$(eval $(call gb_Module_add_targets,setup_native,\
- CustomTarget_scripts \
- Package_scripts \
-))
endif
# vim: set noet sw=4 ts=4:
diff --git a/setup_native/Package_scripts.mk b/setup_native/Package_scripts.mk
index da754e1..2f8fb79 100644
--- a/setup_native/Package_scripts.mk
+++ b/setup_native/Package_scripts.mk
@@ -9,10 +9,6 @@
$(eval $(call gb_Package_Package,setup_native_scripts,$(SRCDIR)/setup_native/scripts))
-ifeq ($(ENABLE_ONLINE_UPDATE),TRUE)
-ifneq ($(filter LINUX SOLARIS,$(OS)),)
$(eval $(call gb_Package_add_file,setup_native_scripts,$(LIBO_BIN_FOLDER)/unpack_update,unpack_update.sh))
-endif
-endif
# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list