[Libreoffice-commits] core.git: Repository.mk scp2/inc scp2/InstallModule_sdkoo.mk scp2/source
Matúš Kukan
matus.kukan at gmail.com
Wed Nov 30 21:37:22 UTC 2016
Repository.mk | 23 +++++++
scp2/InstallModule_sdkoo.mk | 4 -
scp2/inc/macros.inc | 6 +
scp2/source/sdkoo/sdkoo.scp | 138 --------------------------------------------
4 files changed, 29 insertions(+), 142 deletions(-)
New commits:
commit fd7c94f0b201df7203410323fbabc9edcd2d69af
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon Nov 28 14:48:43 2016 +0100
tdf#90753: Autoinstall sdk packages
Change-Id: I54de722335d443813cb4526716c0101a049db03f
Reviewed-on: https://gerrit.libreoffice.org/31370
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/Repository.mk b/Repository.mk
index 2015556..898a112 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 0669195..7dfbcfa 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 4de35db..a2e8daa 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 f73e3e8..e4ff952 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
More information about the Libreoffice-commits
mailing list