diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-08-25 20:20:29 -0300 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-26 14:52:34 +0000 |
| commit | 32848f0a8d9e30f77bc482f9295b2561b94cf7ca (patch) | |
| tree | 5570aba223cceba9d1241906b32518d6b14745a5 /scp2 | |
| parent | 3cb10e9220da27ca7db2f68007be9e310bdefc4d (diff) | |
fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Change-Id: Ibb2c27a75d8cbaf5177f392930cc9e6effa48d1d
Reviewed-on: https://gerrit.libreoffice.org/5631
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 75 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 12 |
2 files changed, 1 insertions, 86 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 563843907001..a86e8d70a9fa 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -82,11 +82,6 @@ End #endif - -#if ! defined WNT // no longer supported on Windows -STD_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail ) -#endif - #ifndef SYSTEM_CURL File gid_File_Lib_Curl @@ -110,27 +105,6 @@ End #endif -/* fdo#60491 always need emboleobj library on non-WNT platforms */ -#if !defined(WNT) || !defined(DISABLE_ATL) -SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj) -#endif - -#ifdef UNX - -#ifdef MACOSX -File gid_File_Lib_Macab_1 - PACKED_LIB_FILE_BODY; - Name = STRING(CONCAT2(libmacab1,UNXSUFFIX)); -End - -File gid_File_Lib_Macab_Drv_1 - PACKED_LIB_FILE_BODY; - Name = STRING(CONCAT2(libmacabdrv1,UNXSUFFIX)); -End -#endif // #ifdef MACOSX - -#endif // #ifdef UNX - #if defined UNX && ! defined MACOSX #ifdef ENABLE_TDE File gid_File_Bin_TdeFilePicker @@ -260,50 +234,6 @@ End #endif -#if defined(WNT) - -#if defined WITH_MOZAB4WIN - -STD_LIB_FILE(gid_File_Lib_Mozab,mozab2) -STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv) - -#else - -File gid_File_Lib_Mozbootstrap - PACKED_LIB_FILE_BODY; - Name = "mozbootstrap.dll"; -End - -#endif - -#else - -STD_LIB_FILE(gid_File_Lib_Mork,mork) -SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap) - -#endif - -#ifdef ENABLE_JAVA -#ifndef MACOSX - -File gid_File_Lib_Officebean - TXT_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_LIB_DIR; - #ifdef UNX - Name = STRING(CONCAT2(libofficebean,UNXSUFFIX)); - #else - Name = "officebean.dll"; - #endif -End - -#endif -#endif - -#if defined ENABLE_NPAPI_FROM_BROWSER -STD_LIB_FILE( gid_File_Lib_Pl , pl) -#endif - #if defined(UNX) && ! defined(MACOSX) #ifdef ENABLE_TDE File gid_File_Lib_Vclplug_Tde @@ -359,11 +289,6 @@ End #endif -File gid_File_Lib_Spell - PACKED_LIB_FILE_BODY; - Name = LIBNAME(spell); -End - #if defined UNX && !defined MACOSX && !defined LIBO_HEADLESS STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx) #endif diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 1815346b46ae..f05cc5babb8e 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -143,7 +143,6 @@ Module gid_Module_Root_Files_4 gid_File_Lib_Bib, gid_File_Lib_J, gid_File_Lib_Oox, - gid_File_Lib_Pl, gid_File_Lib_Spa, gid_File_Lib_Sysdtrans, gid_File_Lib_BaseBmp, @@ -170,16 +169,9 @@ Module gid_Module_Root_Files_5 #endif gid_File_Lib_Curl, gid_Unixlink_File_Lib_Curl, - gid_File_Lib_Emboleobj, - gid_File_Lib_Macab_1, - gid_File_Lib_Macab_Drv_1, gid_File_Lib_Icudata, gid_File_Lib_Icui18n, gid_File_Lib_Icuuc, - gid_File_Lib_Mork, - gid_File_Lib_Mozabdrv, - gid_File_Lib_Mozbootstrap, - gid_File_Lib_Officebean, gid_File_Lib_Openssl, gid_File_Lib_Recentfile, gid_File_Lib_Tab, @@ -212,7 +204,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_LibXMLSec_xmlseccore, gid_File_Lib_LibXMLSec_xmlsecmscrypto, gid_File_Lib_XSec_XmlSec, - gid_File_Lib_Cmdmail, gid_File_Lib_I18n, gid_File_Lib_Accessbridge, gid_File_Lib_Dl, @@ -425,6 +416,5 @@ Module gid_Module_Oo_Linguistic ParentID = gid_Module_Root; Default = YES; Styles = (HIDDEN_ROOT); - Files = (gid_File_Lib_Spell, - gid_File_Share_Registry_Lingucomponent_Xcd); + Files = (gid_File_Share_Registry_Lingucomponent_Xcd); End |