diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-06-02 22:44:19 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-06-02 23:01:12 +0200 |
| commit | 9c9109c6e09890ac6f6596cdfbe3b6e1f7cfded7 (patch) | |
| tree | 97dc6686c5012b22ac7c2a27d56f018374946f59 | |
| parent | bb90b21dbdd50e6d7e5378a0f1d6bbb595af5087 (diff) | |
scp2: move package desktop_scripts_install to AutoInstall
Change-Id: I96baefdb6511f4bd632a0044b26074834615bc57
| -rw-r--r-- | Repository.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 32 |
2 files changed, 1 insertions, 33 deletions
diff --git a/Repository.mk b/Repository.mk index e889e8ea678d..9fbd91ca23b7 100644 --- a/Repository.mk +++ b/Repository.mk @@ -791,7 +791,6 @@ endif $(eval $(call gb_Helper_register_packages, \ test_unittest \ cli_basetypes_copy \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \ extras_wordbook \ $(if $(filter MSC,$(COM)),msvc_dlls) \ instsetoo_native_setup \ @@ -994,6 +993,7 @@ $(eval $(call gb_Helper_register_packages_for_install,xsltfilter,\ $(eval $(call gb_Helper_register_packages_for_install,brand,\ desktop_branding \ $(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \ + $(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \ $(if $(and $(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),\ $(if $(ENABLE_HEADLESS),, \ desktop_soffice_sh \ diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index e36f8741de6b..a9e53ab7906e 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -52,10 +52,7 @@ Module gid_Module_Root_Brand gid_Brand_Dir_Share_Registry, gid_Brand_Dir_Share_Xdg); Files = (auto_brand_ALL, - gid_Brand_File_Gdb_Trace, - gid_Brand_File_Bin_Unoinfo, gid_Brand_File_Desktophelper_Txt, - gid_Brand_File_Script_Unopkg, gid_Brand_File_Share_Xdg_Base, gid_Brand_File_Share_Xdg_Calc, gid_Brand_File_Share_Xdg_Draw, @@ -162,17 +159,6 @@ End // Files -#if defined UNX && !defined MACOSX - -File gid_Brand_File_Gdb_Trace - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = gdbtrace; - Styles = (PACKED); -End - -#endif - #ifdef WNT File gid_Brand_File_Desktophelper_Txt TXT_FILE_BODY; @@ -183,24 +169,6 @@ File gid_Brand_File_Desktophelper_Txt End #endif -#if !defined WNT -File gid_Brand_File_Bin_Unoinfo - BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "unoinfo"; - Styles = (PACKED); -End -#endif - -#if defined UNX && !defined MACOSX -File gid_Brand_File_Script_Unopkg - BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); - Name = "unopkg"; -End -#endif - File gid_Brand_File_Readme_Readme TXT_FILE_BODY; Dir = gid_Brand_Dir_Readme; |