diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2016-12-01 22:19:04 +0100 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2016-12-02 20:14:39 +0100 |
commit | 67398a8d9746dbed743beb702a8cff2eac2bbf99 (patch) | |
tree | 6b07d35e8b4c926775cd403940c4ea0a862ff15e | |
parent | a779b5f7f0dec55482172ca5dbe978dffbd46dac (diff) |
tdf#90753: AutoInstall setup_native packages
Change-Id: Iecf059b974b996fceb57b04197c7dac9b7c8dd47
-rw-r--r-- | Repository.mk | 5 | ||||
-rw-r--r-- | scp2/source/onlineupdate/file_onlineupdate.scp | 9 | ||||
-rw-r--r-- | scp2/source/onlineupdate/module_onlineupdate.scp | 1 | ||||
-rw-r--r-- | scp2/source/ooo/common_brand.scp | 8 | ||||
-rw-r--r-- | setup_native/Module_setup_native.mk | 24 | ||||
-rw-r--r-- | setup_native/Package_scripts.mk | 4 |
6 files changed, 12 insertions, 39 deletions
diff --git a/Repository.mk b/Repository.mk index bcf63d473d84..0be3d13311b5 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 442d9ce96297..98a5da516383 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 a2afd3a07cfd..4225bb74f701 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 8e90992da81b..68eb9cb8bd90 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 d0f935e26240..163bd4e24a88 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 da754e11fee1..2f8fb7944d10 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: |