[Libreoffice-commits] core.git: Repository.mk scp2/source
Marcos Paulo de Souza
marcos.souza.org at gmail.com
Mon Feb 10 05:23:57 PST 2014
Repository.mk | 22 ++++++++++++-------
scp2/source/ooo/file_library_ooo.scp | 38 ----------------------------------
scp2/source/ooo/module_hidden_ooo.scp | 2 -
scp2/source/ooo/ure.scp | 29 -------------------------
4 files changed, 14 insertions(+), 77 deletions(-)
New commits:
commit 4af38b099c741c3676aefeb20c515913aaeed666
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date: Thu Feb 6 13:53:17 2014 -0200
fdo#60924: Move some packages to autoinstall
Change-Id: I5805c8d1c9978b8625ba0e0ea6c4337baf5a6cb5
Reviewed-on: https://gerrit.libreoffice.org/7903
Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/Repository.mk b/Repository.mk
index 1b0396a..b702ae3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -451,9 +451,14 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
affine_uno_uno \
- $(if $(ENABLE_JAVA),java_uno) \
- $(if $(ENABLE_JAVA),juh) \
- $(if $(ENABLE_JAVA),juhx) \
+ $(if $(filter MSC,$(COM)),cli_uno) \
+ $(if $(ENABLE_JAVA), \
+ java_uno \
+ jpipe \
+ $(if $(filter $(OS),WNT),jpipx) \
+ juh \
+ juhx \
+ ) \
log_uno_uno \
unsafe_uno_uno \
$(if $(URELIBS),urelibs) \
@@ -491,11 +496,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
$(if $(filter MSC,$(COM)),cli_cppuhelper) \
))
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
- $(if $(filter MSC,$(COM)),cli_uno) \
- jpipe \
- $(if $(filter WNT,$(OS)),jpipx) \
-))
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(if $(ENABLE_VLC),avmediavlc) \
@@ -706,6 +706,12 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
) \
))
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+ $(if $(SYSTEM_CURL),,curl) \
+ $(if $(SYSTEM_LCMS2),,lcms2) \
+ $(if $(SYSTEM_LIBXSLT),,xslt) \
+))
+
# External executables
$(eval $(call gb_ExternalExecutable_register_executables,\
genbrk \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index c90e28a..c1a9304 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -82,17 +82,6 @@ End
#endif
-#ifndef SYSTEM_CURL
-
-File gid_File_Lib_Curl
- LIB_FILE_BODY;
- Styles = (FILELIST);
- Dir = FILELIST_DIR;
- Name = "curl.filelist";
-End
-
-#endif
-
#if defined UNX && ! defined MACOSX
#ifdef ENABLE_TDE
File gid_File_Bin_TdeFilePicker
@@ -132,26 +121,8 @@ End
#endif
#endif
-#ifndef SYSTEM_LCMS2
-
-File gid_File_Lib_Lcms2
- LIB_FILE_BODY;
- Styles = (FILELIST);
- Dir = FILELIST_DIR;
- Name = "lcms2.filelist";
-End
-
-#endif
-
#ifdef NEED_CAIRO
-File gid_File_Lib_Cairo
- LIB_FILE_BODY;
- Styles = (FILELIST);
- Dir = FILELIST_DIR;
- Name = "cairo.filelist";
-End
-
#ifndef WNT
File gid_File_Lib_Pixman
@@ -270,15 +241,6 @@ End
#endif
-#ifndef SYSTEM_LIBXSLT
-File gid_File_Lib_Xslt
- LIB_FILE_BODY;
- Styles = (FILELIST);
- Dir = FILELIST_DIR;
- Name = "xslt.filelist";
-End
-#endif
-
#ifdef WNT
File gid_File_Lib_LibXMLSec_xmlseccore
PACKED_LIB_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 0881652..6f29752 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -160,7 +160,6 @@ Module gid_Module_Root_Files_5
#if ! defined SYSTEM_CLUCENE
gid_File_Lib_CLucene,
#endif
- gid_File_Lib_Curl,
gid_Unixlink_File_Lib_Curl,
gid_File_Lib_Icudata,
gid_File_Lib_Icui18n,
@@ -190,7 +189,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Sndfile,
gid_File_Lib_Ucpdav1,
gid_File_Lib_Neon,
- gid_File_Lib_Xslt,
gid_Unixlink_File_Lib_Xslt,
gid_Unixlink_File_Lib_eXslt,
gid_File_Lib_LibXMLSec_xmlsecnss,
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 7069ee6..d690ed7 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -267,14 +267,6 @@ End
#if defined _MSC_VER
-File gid_File_Dl_Cli_Uno
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_NORMAL("cli_uno");
- Styles = (PACKED);
-
-End
-
File gid_File_Dl_Cli_Ure_Assembly
TXT_FILE_BODY;
Styles = (PACKED, ASSEMBLY);
@@ -413,24 +405,6 @@ End
#endif
-#if defined ENABLE_JAVA
-File gid_File_Dl_Jpipe
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_JDL_NORMAL("jpipe");
- Styles = (PACKED);
-End
-#endif
-
-#if defined ENABLE_JAVA && defined WNT
-File gid_File_Dl_Jpipx
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_NORMAL("jpipx");
- Styles = (PACKED);
-End
-#endif
-
#if !defined SYSTEM_LIBXML
File gid_File_Dl_Libxml2
LIB_FILE_BODY;
@@ -522,7 +496,6 @@ Module gid_Module_Root_Ure_Hidden
gid_File_ThirdpartylicensereadmeHtml_Ure,
gid_File_Readme_Ure,
gid_File_License_Ure,
- gid_File_Dl_Cli_Uno,
gid_File_Dl_Cli_Ure_Assembly,
gid_File_Dl_Policy_Cli_Ure_Assembly,
gid_File_Dl_Policy_Cli_Ure_Config,
@@ -550,8 +523,6 @@ Module gid_Module_Root_Ure_Hidden
gid_Unixlink_File_Dl_Salhelper,
gid_File_Dl_Profile_Uno,
gid_Unixlink_File_Dl_Rmcxt,
- gid_File_Dl_Jpipe,
- gid_File_Dl_Jpipx,
gid_File_Dl_Libxml2,
gid_File_Lib_Mingw_GccS_Ure,
gid_File_Lib_Mingw_Stdcpp_Ure,
More information about the Libreoffice-commits
mailing list