[Libreoffice-commits] core.git: 2 commits - RepositoryExternal.mk Repository.mk scp2/source
Michael Stahl
mstahl at redhat.com
Mon Feb 17 11:45:00 CET 2014
Repository.mk | 10 +-------
RepositoryExternal.mk | 25 +++++++++++++++++++--
scp2/source/ooo/file_library_ooo.scp | 40 ----------------------------------
scp2/source/ooo/module_hidden_ooo.scp | 5 ----
4 files changed, 25 insertions(+), 55 deletions(-)
New commits:
commit 32a617d8f00636d5cf660577c8cd47633b0bcd7e
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Feb 17 11:23:19 2014 +0100
move external packages registration to RepositoryExternal.mk
(with condition from configure.ac for cairo)
Change-Id: I7f4864a7f331f1a3da9c796b51f4e16c58382580
diff --git a/Repository.mk b/Repository.mk
index 79afd37..87916df 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -706,15 +706,6 @@ $(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) \
- $(if $(SYSTEM_CAIRO),,cairo \
- $(if $(filter $(OS),WNT),,pixman) \
- ) \
-))
-
# External executables
$(eval $(call gb_ExternalExecutable_register_executables,\
genbrk \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 23d5a6a..1133bb9 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -871,6 +871,10 @@ endef
else # !SYSTEM_LIBXSLT
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+ xslt \
+))
+
define gb_LinkTarget__use_libxslt
$(call gb_LinkTarget_use_package,$(1),xslt)
$(call gb_LinkTarget_set_include,$(1),\
@@ -1073,6 +1077,8 @@ endif # ANDROID
endif # SYSTEM_REDLAND
+ifneq ($(filter unx,$(GUIBASE))$(ENABLE_CAIRO_CANVAS),) # or
+
ifneq ($(SYSTEM_CAIRO),)
define gb_LinkTarget__use_cairo
@@ -1087,6 +1093,11 @@ endef
else # !SYSTEM_CAIRO
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+ cairo \
+ $(if $(filter $(OS),WNT),,pixman) \
+))
+
define gb_LinkTarget__use_cairo
$(call gb_LinkTarget_use_package,$(1),cairo)
$(call gb_LinkTarget_use_package,$(1),pixman)
@@ -1107,6 +1118,8 @@ endef
endif # SYSTEM_CAIRO
+endif # CAIRO
+
ifneq ($(SYSTEM_FREETYPE),)
define gb_LinkTarget__use_freetype_headers
@@ -1810,6 +1823,10 @@ gb_ExternalProject__use_lcms2 :=
else # !SYSTEM_LCMS2
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+ lcms2 \
+))
+
define gb_ExternalProject__use_lcms2
$(call gb_ExternalProject_use_package,$(1),lcms2)
@@ -2093,6 +2110,10 @@ endef
else # !SYSTEM_CURL
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+ curl \
+))
+
define gb_LinkTarget__use_curl
$(call gb_LinkTarget_use_package,$(1),curl)
$(call gb_LinkTarget_set_include,$(1),\
commit f70343bbbb2dd1160edace1a2f457fb3b33a7322
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date: Wed Feb 12 06:53:02 2014 -0200
fdo#60924: Move more libs/packages to autoinstall
Change-Id: I687f45eeea1e60e8076222865bd803c2ad18f758
diff --git a/Repository.mk b/Repository.mk
index b702ae3..79afd37 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -530,9 +530,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
sdbc2 \
sofficeapp \
srtrs1 \
+ $(if $(filter $(OS),WNT),sysdtrans) \
textconv_dict \
ucb1 \
ucbhelper \
+ $(if $(DISABLE_NEON),,ucpdav1) \
ucpfile1 \
ucpftp1 \
ucpchelp1 \
@@ -561,7 +563,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
pyuno \
pyuno_wrapper \
- ucpdav1 \
xsec_xmlsec \
$(if $(filter $(OS),ANDROID), \
lo-bootstrap \
@@ -606,7 +607,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
regpatchactivex \
so_activex \
so_activex_x64 \
- sysdtrans \
thidxmsi \
))
endif
@@ -710,6 +710,9 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
$(if $(SYSTEM_CURL),,curl) \
$(if $(SYSTEM_LCMS2),,lcms2) \
$(if $(SYSTEM_LIBXSLT),,xslt) \
+ $(if $(SYSTEM_CAIRO),,cairo \
+ $(if $(filter $(OS),WNT),,pixman) \
+ ) \
))
# External executables
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index bb57257..23d5a6a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -969,7 +969,7 @@ endef
else # !SYSTEM_NEON
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
neon \
))
@@ -2218,7 +2218,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\
endef
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
clucene \
))
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index c1a9304..5aace43 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -26,17 +26,6 @@
************************************************************************/
#include "macros.inc"
-#ifndef SYSTEM_CLUCENE
-File gid_File_Lib_CLucene
- PACKED_LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT2(libclucene,UNXSUFFIX));
- #else
- Name = "clucene.dll";
- #endif
-End
-#endif
-
#if defined _MSC_VER
File gid_File_Lib_Cli_Oootypes_Assembly
@@ -121,21 +110,6 @@ End
#endif
#endif
-#ifdef NEED_CAIRO
-
-#ifndef WNT
-
-File gid_File_Lib_Pixman
- LIB_FILE_BODY;
- Styles = (FILELIST);
- Dir = FILELIST_DIR;
- Name = "pixman.filelist";
-End
-
-#endif
-
-#endif
-
#ifndef SYSTEM_ICU
File gid_File_Lib_Icudata
@@ -190,20 +164,6 @@ End
STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
#endif
-#if ! defined UNX
-File gid_File_Lib_Sysdtrans
- PACKED_LIB_FILE_BODY;
- Name = "sysdtrans.dll";
-End
-#endif
-
-#ifndef DISABLE_NEON
-SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
- #ifndef SYSTEM_NEON
- SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon)
- #endif
-#endif
-
#if !defined(ANDROID) && !defined(IOS) //FIXME: get nss&xmlsec building
//we need the nss libs for libxmlsec (or if the internal mozilla is enabled)
#ifndef SYSTEM_NSS
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 6f29752..0daac7f 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -142,7 +142,6 @@ Module gid_Module_Root_Files_4
auto_ooobinarytable_ALL,
gid_File_Lib_Bib,
gid_File_Lib_J,
- gid_File_Lib_Sysdtrans,
gid_File_Lib_BaseBmp,
gid_File_Lib_Zip);
End
@@ -157,9 +156,6 @@ Module gid_Module_Root_Files_5
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Lib_Crypto,
-#if ! defined SYSTEM_CLUCENE
- gid_File_Lib_CLucene,
-#endif
gid_Unixlink_File_Lib_Curl,
gid_File_Lib_Icudata,
gid_File_Lib_Icui18n,
@@ -187,7 +183,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Sqlite3,
gid_File_Lib_Ssl3,
gid_File_Lib_Sndfile,
- gid_File_Lib_Ucpdav1,
gid_File_Lib_Neon,
gid_Unixlink_File_Lib_Xslt,
gid_Unixlink_File_Lib_eXslt,
More information about the Libreoffice-commits
mailing list