mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#60924: Move more libs/packages to autoinstall

Browse Source 
Change-Id: I687f45eeea1e60e8076222865bd803c2ad18f758
This commit is contained in:
Marcos Paulo de Souza
2014-02-12 06:53:02 -02:00
committed by Michael Stahl
parent 067d080293
commit f70343bbbb
4 changed files with 7 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Repository.mk
View File

@@ -530,9 +530,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
sdbc2 \ sdbc2 \
sofficeapp \ sofficeapp \
srtrs1 \ srtrs1 \
$(if $(filter $(OS),WNT),sysdtrans) \
textconv_dict \ textconv_dict \
ucb1 \ ucb1 \
ucbhelper \ ucbhelper \
$(if $(DISABLE_NEON),,ucpdav1) \
ucpfile1 \ ucpfile1 \
ucpftp1 \ ucpftp1 \
ucpchelp1 \ ucpchelp1 \
@@ -561,7 +563,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
pyuno \ pyuno \
pyuno_wrapper \ pyuno_wrapper \
ucpdav1 \
xsec_xmlsec \ xsec_xmlsec \
$(if $(filter $(OS),ANDROID), \ $(if $(filter $(OS),ANDROID), \
lo-bootstrap \ lo-bootstrap \
@@ -606,7 +607,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
regpatchactivex \ regpatchactivex \
so_activex \ so_activex \
so_activex_x64 \ so_activex_x64 \
sysdtrans \
thidxmsi \ thidxmsi \
)) ))
endif endif
@@ -710,6 +710,9 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
$(if $(SYSTEM_CURL),,curl) \ $(if $(SYSTEM_CURL),,curl) \
$(if $(SYSTEM_LCMS2),,lcms2) \ $(if $(SYSTEM_LCMS2),,lcms2) \
$(if $(SYSTEM_LIBXSLT),,xslt) \ $(if $(SYSTEM_LIBXSLT),,xslt) \
$(if $(SYSTEM_CAIRO),,cairo \
$(if $(filter $(OS),WNT),,pixman) \
) \
)) ))
# External executables # External executables

4
RepositoryExternal.mk
View File

@@ -969,7 +969,7 @@ endef
else # !SYSTEM_NEON else # !SYSTEM_NEON
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
neon \ neon \
)) ))
@@ -2218,7 +2218,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\
endef endef
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
clucene \ clucene \
)) ))

40
scp2/source/ooo/file_library_ooo.scp
View File

@@ -26,17 +26,6 @@
************************************************************************/ ************************************************************************/
#include "macros.inc" #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 #if defined _MSC_VER
File gid_File_Lib_Cli_Oootypes_Assembly File gid_File_Lib_Cli_Oootypes_Assembly
@@ -121,21 +110,6 @@ End
#endif #endif
#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 #ifndef SYSTEM_ICU
File gid_File_Lib_Icudata File gid_File_Lib_Icudata
@@ -190,20 +164,6 @@ End
STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp ) STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
#endif #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 #if !defined(ANDROID) && !defined(IOS) //FIXME: get nss&xmlsec building
//we need the nss libs for libxmlsec (or if the internal mozilla is enabled) //we need the nss libs for libxmlsec (or if the internal mozilla is enabled)
#ifndef SYSTEM_NSS #ifndef SYSTEM_NSS

5
scp2/source/ooo/module_hidden_ooo.scp
View File

@@ -142,7 +142,6 @@ Module gid_Module_Root_Files_4
auto_ooobinarytable_ALL, auto_ooobinarytable_ALL,
gid_File_Lib_Bib, gid_File_Lib_Bib,
gid_File_Lib_J, gid_File_Lib_J,
gid_File_Lib_Sysdtrans,
gid_File_Lib_BaseBmp, gid_File_Lib_BaseBmp,
gid_File_Lib_Zip); gid_File_Lib_Zip);
End End
@@ -157,9 +156,6 @@ Module gid_Module_Root_Files_5
Default = YES; Default = YES;
Styles = (HIDDEN_ROOT); Styles = (HIDDEN_ROOT);
Files = (gid_File_Lib_Crypto, Files = (gid_File_Lib_Crypto,
#if ! defined SYSTEM_CLUCENE
gid_File_Lib_CLucene,
#endif
gid_Unixlink_File_Lib_Curl, gid_Unixlink_File_Lib_Curl,
gid_File_Lib_Icudata, gid_File_Lib_Icudata,
gid_File_Lib_Icui18n, gid_File_Lib_Icui18n,
@@ -187,7 +183,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Sqlite3, gid_File_Lib_Sqlite3,
gid_File_Lib_Ssl3, gid_File_Lib_Ssl3,
gid_File_Lib_Sndfile, gid_File_Lib_Sndfile,
gid_File_Lib_Ucpdav1,
gid_File_Lib_Neon, gid_File_Lib_Neon,
gid_Unixlink_File_Lib_Xslt, gid_Unixlink_File_Lib_Xslt,
gid_Unixlink_File_Lib_eXslt, gid_Unixlink_File_Lib_eXslt,