[Libreoffice-commits] core.git: 2 commits - Repository.mk scp2/InstallModule_ooo.mk scp2/source

[Matúš Kukan]

 Repository.mk                    |    6 ++++++
 scp2/InstallModule_ooo.mk        |    5 -----
 scp2/source/ooo/common_brand.scp |   31 -------------------------------
 3 files changed, 6 insertions(+), 36 deletions(-)

New commits:
commit aabc5aab5af27e929a81a6036d2f470ab1f5ac4d
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sun Nov 20 10:35:38 2016 +0100

    tdf#90753: Move brand packages to AutoInstall
    
    gid_Brand_File_Bin_Soffice_Bin_Manifest was removed
    in 26bddf3e80865d847f52e649ab60f97269177a3e
    
    Change-Id: Iff5314e8c3c6191556c082bc30938dd177b254fc

diff --git a/Repository.mk b/Repository.mk
index 48ce934..60c9fa0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -836,6 +836,12 @@ $(eval $(call gb_Helper_register_packages_for_install,xsltfilter,\
 	filter_xslt \
 ))
 
+$(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) \
+))
+
 ifeq ($(USING_X11), TRUE)
 $(eval $(call gb_Helper_register_packages_for_install,base_brand,\
 	desktop_sbase_sh \
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 7a9bc37..a681f18 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\
 ))
 
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-	$(if $(CUSTOM_BRAND_DIR),-DCUSTOM_BRANDING) \
 	$(if $(WINDOWS_SDK_HOME),\
 		-DHAVE_WINDOWS_SDK \
 	) \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 6424960..8e90992 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -56,11 +56,7 @@ Module gid_Module_Root_Brand
             gid_Brand_Dir_Share_Xdg);
     Files = (auto_brand_ALL,
              gid_Brand_File_Gdb_Trace,
-             gid_Brand_File_Bin_Soffice,
-             gid_Brand_File_Bin_Soffice_Bin_Manifest,
              gid_Brand_File_Bin_Unoinfo,
-             gid_Brand_File_Bmp_IntroAboutShell,
-             gid_Brand_File_Bmp_IntroAboutShell_custom,
 	     gid_Brand_File_Desktophelper_Txt,
              gid_Brand_File_Html_Thirdpartylicensereadme,
              gid_Brand_File_Lib_Dbghelp,
@@ -496,17 +492,6 @@ End
 
 #endif
 
-#if !defined MACOSX && !defined WNT
-
-File gid_Brand_File_Bin_Soffice
-    BIN_FILE_BODY;
-    Dir = FILELIST_DIR;
-    Name = "desktop_soffice_sh.filelist";
-    Styles = (FILELIST, PACKED);
-End
-
-#endif
-
 #ifdef WNT
 File gid_Brand_File_Desktophelper_Txt
     TXT_FILE_BODY;
@@ -535,22 +520,6 @@ File gid_Brand_File_Script_Unopkg
 End
 #endif
 
-File gid_Brand_File_Bmp_IntroAboutShell
-    TXT_FILE_BODY;
-    Dir = FILELIST_DIR;
-    Name = "desktop_branding.filelist";
-    Styles = (FILELIST);
-End
-
-#if defined CUSTOM_BRANDING
-File gid_Brand_File_Bmp_IntroAboutShell_custom
-    TXT_FILE_BODY;
-    Dir = FILELIST_DIR;
-    Name = "desktop_branding_custom.filelist";
-    Styles = (FILELIST);
-End
-#endif
-
 File gid_Brand_File_Txt_Package
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Share_Extensions;
commit c1b50e6d8c1f925aa09a5522d5f83f5204c62670
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Nov 25 22:03:58 2016 +0100

    scp2: ICU was moved to AutoInstall
    
    ..in e759269e373fa02d3e8566d1edc9fb9526de6640
    
    Change-Id: I670cd35f64f1784b4150a8c3ab310bd1c88e6ed0

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 35db721..7a9bc37 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -63,10 +63,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 ))
 endif
 
-$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-	-DICU_MAJOR=$(ICU_MAJOR) \
-))
-
 $(eval $(call gb_InstallModule_add_templates,scp2/ooo,\
     scp2/source/templates/module_helppack \
     scp2/source/templates/module_helppack_root \