tdf#90753: Autoinstall sdk packages

Change-Id: I54de722335d443813cb4526716c0101a049db03f
Reviewed-on: https://gerrit.libreoffice.org/31370
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

4 files changed, 29 insertions, 142 deletions

diff --git a/Repository.mk b/Repository.mk
index 20155567eb5c..898a1127221e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -777,6 +777,29 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
 	) \
 ))
 
+$(eval $(call gb_Helper_register_packages_for_install,sdk,\
+	odk_share_readme \
+	odk_share_readme_generated \
+	$(if $(filter WNT,$(OS)),odk_cli) \
+	odk_config \
+	$(if $(filter WNT,$(OS)),odk_config_win) \
+	odk_docs \
+	$(if $(DOXYGEN),odk_doxygen) \
+	odk_examples \
+	odk_headers \
+	odk_html \
+	odk_lib \
+	odk_settings \
+	odk_settings_generated \
+	offapi_idl \
+	udkapi_idl \
+	$(if $(ENABLE_JAVA), \
+		odk_javadoc \
+		odk_uno_loader_classes \
+		odk_unowinreg \
+	) \
+))
+
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 	$(if $(SYSTEM_LIBEXTTEXTCAT),,libexttextcat_fingerprint) \
 	officecfg_misc \
diff --git a/scp2/InstallModule_sdkoo.mk b/scp2/InstallModule_sdkoo.mk
index 0669195323f5..7dfbcfaba49b 100644
--- a/scp2/InstallModule_sdkoo.mk
+++ b/scp2/InstallModule_sdkoo.mk
@@ -11,11 +11,9 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/sdkoo))
 
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/sdkoo,sdk))
 
-ifneq ($(DOXYGEN),)
 $(eval $(call gb_InstallModule_add_defs,scp2/sdkoo,\
-	-DDOXYGEN \
+	-DPACKAGE_FILELIST_DIR=FILELIST_SDK_DIR \
 ))
-endif
 
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/sdkoo,\
     scp2/source/sdkoo/sdkoo \
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 4de35db91e2e..a2e8daabe841 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -115,7 +115,7 @@
 
 #define PACKAGE_FILELIST(id,name) \
 File id \
-    Dir = FILELIST_DIR; \
+    Dir = PACKAGE_FILELIST_DIR; \
     Name = name; \
     Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); \
 End
@@ -469,6 +469,10 @@ End
 #endif
 #endif
 
+#if !defined PACKAGE_FILELIST_DIR
+#define PACKAGE_FILELIST_DIR FILELIST_DIR
+#endif
+
 #define UI_FILELIST(name, file) \
     File CONCAT2(gid_File_Share_Config_Sofficecfg_uiconfig_, name) \
         TXT_FILE_BODY; \
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index f73e3e8ef59e..e4ff95221013 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -71,141 +71,3 @@ Module gid_Module_Root_SDK
     Files = (auto_sdk_ALL);
 End
 
-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;
-    Dir = FILELIST_SDK_DIR;
-    Name = "odk_cli.filelist";
-    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-#endif
-
-File gid_File_Package_odk_config
-    TXT_FILE_BODY;
-    Dir = FILELIST_SDK_DIR;
-    Name = "odk_config.filelist";
-    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
-#if defined(WNT)
-File gid_File_Package_odk_config_win
-    TXT_FILE_BODY;
-    Dir = FILELIST_SDK_DIR;
-    Name = "odk_config_win.filelist";
-    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-#endif
-
-File gid_File_Package_odk_docs
-    TXT_FILE_BODY;
-    Dir = FILELIST_SDK_DIR;
-    Name = "odk_docs.filelist";
-    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
-File gid_File_Package_odk_html
-    TXT_FILE_BODY;
-    Dir = FILELIST_SDK_DIR;
-    Name = "odk_html.filelist";
-    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
-#if defined(ENABLE_JAVA)
-File gid_File_Package_odk_javadoc
-    TXT_FILE_BODY;
-    Dir = FILELIST_SDK_DIR;
-    Name = "odk_javadoc.filelist";
-    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-#endif
-
-File gid_File_Package_odk_lib
-    TXT_FILE_BODY;
-    Dir = FILELIST_SDK_DIR;
-    Name = "odk_lib.filelist";
-    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
-File gid_File_Package_odk_settings
-    TXT_FILE_BODY;
-    Dir = FILELIST_SDK_DIR;
-    Name = "odk_settings.filelist";
-    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
-File gid_File_Package_odk_settings_generated
-    TXT_FILE_BODY;
-    Dir = FILELIST_SDK_DIR;
-    Name = "odk_settings_generated.filelist";
-    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
-#if defined(ENABLE_JAVA)
-File gid_File_Package_odk_unowinreg
-    TXT_FILE_BODY;
-    Dir = FILELIST_SDK_DIR;
-    Name = "odk_unowinreg.filelist";
-    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-#endif
-
-#if defined(DOXYGEN)
-File gid_File_Zip_doxygen
-    TXT_FILE_BODY;
-    Dir = FILELIST_SDK_DIR;
-    Name = "odk_doxygen.filelist";
-    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-#endif
-
-File gid_File_Zip_Odkexamples
-    TXT_FILE_BODY;
-    Dir = FILELIST_SDK_DIR;
-    Name = "odk_examples.filelist";
-    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
-File gid_File_Zip_OdkIdl_udkapi
-    TXT_FILE_BODY;
-    Dir = FILELIST_SDK_DIR;
-    Name = "udkapi_idl.filelist";
-    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
-File gid_File_Zip_OdkIdl_offapi
-    TXT_FILE_BODY;
-    Dir = FILELIST_SDK_DIR;
-    Name = "offapi_idl.filelist";
-    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
-File gid_File_Zip_Odkheaders
-    TXT_FILE_BODY;
-    Dir = FILELIST_SDK_DIR;
-    Name = "odk_headers.filelist";
-    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
-#if defined(ENABLE_JAVA)
-File gid_File_Zip_uno_loader_classes
-    TXT_FILE_BODY;
-    Dir = FILELIST_SDK_DIR;
-    Name = "odk_uno_loader_classes.filelist";
-    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-#endif