[Libreoffice-commits] core.git: 2 commits - Repository.mk scp2/InstallModule_ooo.mk scp2/source
Matúš Kukan
matus.kukan at gmail.com
Wed Jun 12 23:58:55 PDT 2013
Repository.mk | 50 ++++++------
scp2/InstallModule_ooo.mk | 3
scp2/source/ooo/file_library_ooo.scp | 138 ----------------------------------
scp2/source/ooo/module_hidden_ooo.scp | 22 -----
4 files changed, 25 insertions(+), 188 deletions(-)
New commits:
commit f5d3fb36ab240407433e7435b4d1e23380678465
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Jun 13 07:49:15 2013 +0200
scp2: remove unused defines
Change-Id: Icac7b4dd5dd31f39e0db09e251e7136e61a064aa
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index b8c6130..611e252 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -23,8 +23,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
ENABLE_CAIRO_CANVAS \
ENABLE_DIRECTX \
ENABLE_EVOAB2 \
- ENABLE_GSTREAMER \
- ENABLE_GSTREAMER_0_10 \
ENABLE_GTK \
ENABLE_GTK3 \
ENABLE_KAB \
@@ -38,7 +36,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
ENABLE_OPENGL \
ENABLE_TDE \
ENABLE_TDEAB \
- MERGELIBS \
SYSTEM_APACHE_COMMONS \
SYSTEM_BOOST \
SYSTEM_CAIRO \
commit 1c2ab8f7871e5b29f5c0025edfdd2ef9e1f795fa
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date: Tue Jun 11 19:37:26 2013 -0300
fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Conflicts:
Repository.mk
Change-Id: I1553317afe8df9877a41b1d4087c96d861ed1377
diff --git a/Repository.mk b/Repository.mk
index 074b2d9..543275e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -297,6 +297,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
lng \
lnth \
$(if $(MERGELIBS),merged) \
+ migrationoo2 \
+ migrationoo3 \
msfilter \
$(if $(DISABLE_SCRIPTING),,msforms) \
mtfrenderer \
@@ -334,12 +336,17 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(if $(ENABLE_TDEAB),tdeab1) \
$(if $(ENABLE_TDEAB),tdeabdrv1) \
textconversiondlgs \
+ textfd \
tk \
tl \
$(if $(ENABLE_TELEPATHY),tubes) \
ucpexpand1 \
+ ucpext \
+ ucpcmis1 \
+ ucptdoc1 \
unordf \
unoxml \
+ updatefeed \
utl \
uui \
$(if $(DISABLE_SCRIPTING),,vbaevents) \
@@ -394,7 +401,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
spa \
spell \
sts \
- textfd \
vclplug_tde \
vclplug_kde \
vclplug_kde4 \
@@ -474,13 +480,22 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
))
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
+ $(if $(ENABLE_GSTREAMER),avmediagst) \
+ $(if $(ENABLE_GSTREAMER_0_10),avmediagst_0_10) \
cached1 \
+ collator_data \
comphelper \
+ dbpool2 \
deployment \
+ deploymentgui \
+ dict_ja \
+ dict_zh \
+ embobj \
fileacc \
$(if $(SOLAR_JAVA),hsqldb) \
i18nlangtag \
i18nutil \
+ index_data \
localedata_en \
localedata_es \
localedata_euro \
@@ -490,25 +505,25 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(if $(DISABLE_SCRIPTING),,scriptframe) \
sdbc2 \
sofficeapp \
+ srtrs1 \
+ textconv_dict \
tvhlp1 \
ucb1 \
ucbhelper \
ucpfile1 \
+ ucpftp1 \
+ ucpchelp1 \
+ ucphier1 \
+ ucppkg1 \
+ unopkgapp \
+ xmlsecurity \
+ xsec_fw \
xstor \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- avmediagst \
- avmediagst_0_10 \
avmediawin \
bluez_bluetooth \
- collator_data \
- dbpool2 \
- deploymentgui \
- dict_ja \
- dict_zh \
- embobj \
emboleobj \
- index_data \
java_uno_accessbridge \
libreoffice \
macab1 \
@@ -518,16 +533,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
pyuno \
pyuno_wrapper \
recentfile \
- srtrs1 \
- textconv_dict \
ucpdav1 \
- ucpftp1 \
- ucpchelp1 \
- ucphier1 \
- ucppkg1 \
- unopkgapp \
- xmlsecurity \
- xsec_fw \
xsec_xmlsec \
$(if $(filter $(OS),ANDROID), \
lo-bootstrap \
@@ -578,17 +584,11 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
cmdmail \
macbe1 \
- migrationoo2 \
- migrationoo3 \
OGLTrans \
pdfimport \
postgresql-sdbc \
postgresql-sdbc-impl \
pythonloader \
- ucpcmis1 \
- ucpext \
- ucptdoc1 \
- updatefeed \
$(if $(filter $(OS),MACOSX), \
fps_aqua \
) \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index a16c0ab..8e57fb7 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -125,72 +125,6 @@ End
#endif
-File gid_File_Lib_Dbpool
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- #ifdef UNX
- Name = STRING(CONCAT2(libdbpool2,UNXSUFFIX));
- #else
- Name = "dbpool2.dll";
- #endif
-End
-
-File gid_File_Lib_Dict_Ja
- LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT2(libdict_ja,UNXSUFFIX));
- #else
- Name = "dict_ja.dll";
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
-File gid_File_Lib_Dict_Zh
- LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT2(libdict_zh,UNXSUFFIX));
- #else
- Name = "dict_zh.dll";
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
-File gid_File_Lib_Collator_Data
- LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT2(libcollator_data,UNXSUFFIX));
- #else
- Name = "collator_data.dll";
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
-File gid_File_Lib_Index_Data
- LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT2(libindex_data,UNXSUFFIX));
- #else
- Name = "index_data.dll";
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
-File gid_File_Lib_Textconv_Dict
- LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT2(libtextconv_dict,UNXSUFFIX));
- #else
- Name = "textconv_dict.dll";
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
#ifdef WNT
File gid_File_Lib_Dnd
@@ -213,8 +147,6 @@ End
#endif
-SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj)
-
/* fdo#60491 always need emboleobj library on non-WNT platforms */
#if !defined(WNT) || !defined(DISABLE_ATL)
SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
@@ -497,8 +429,6 @@ End
STD_LIB_FILE( gid_File_Lib_Ole, oleautobridge )
#endif
-SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui)
-
#if defined ENABLE_NPAPI_FROM_BROWSER
STD_LIB_FILE( gid_File_Lib_Pl , pl)
#endif
@@ -631,8 +561,6 @@ End
STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
#endif
-SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
-
#if ! defined UNX
File gid_File_Lib_Sysdtrans
LIB_FILE_BODY;
@@ -651,17 +579,6 @@ STD_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1 )
STD_LIB_FILE( gid_File_Lib_Macbe, macbe1 )
#endif
-File gid_File_Lib_Ucpchelp1
- LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT2(libucpchelp1,UNXSUFFIX));
- #else
- Name = "ucpchelp1.dll";
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
#ifndef DISABLE_NEON
SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
#ifndef SYSTEM_NEON
@@ -701,20 +618,6 @@ End
#endif
-SPECIAL_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1)
-
-SPECIAL_LIB_FILE(gid_File_Lib_Ucphier1,ucphier1)
-
-SPECIAL_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1)
-
-STD_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1)
-
-STD_LIB_FILE(gid_File_Ucpext, ucpext)
-
-STD_LIB_FILE(gid_File_Ucpcmis, ucpcmis1)
-
-STD_LIB_FILE( gid_File_Lib_Textfd, textfd )
-
#ifndef SYSTEM_LIBXSLT
File gid_File_Lib_Xslt
LIB_FILE_BODY;
@@ -754,40 +657,12 @@ File gid_File_Lib_eXslt
End
#endif
-#if defined ENABLE_GSTREAMER
-SPECIAL_LIB_FILE( gid_File_Lib_AVMediaGStreamer, avmediagst )
-#endif
-#if defined ENABLE_GSTREAMER_0_10
-SPECIAL_LIB_FILE( gid_File_Lib_AVMediaGStreamer_0_10, avmediagst_0_10 )
-#endif
#if defined WNT
#ifdef ENABLE_DIRECTX
SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
#endif
#endif
-File gid_File_Lib_XSec_XMLSecurity
- LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT2(libxmlsecurity,UNXSUFFIX));
- #else
- Name = "xmlsecurity.dll";
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
-File gid_File_Lib_XSec_Framework
- LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT2(libxsec_fw,UNXSUFFIX));
- #else
- Name = "xsec_fw.dll";
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
#ifdef WNT
File gid_File_Lib_LibXMLSec_xmlseccore
LIB_FILE_BODY;
@@ -825,12 +700,6 @@ End
#endif
#endif
-STD_LIB_FILE( gid_File_Lib_Migrationoo2, migrationoo2 )
-
-STD_LIB_FILE( gid_File_Lib_Migrationoo3, migrationoo3 )
-
-STD_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed )
-
#ifndef SYSTEM_OPENSSL
File gid_File_Lib_Openssl
LIB_FILE_BODY;
@@ -854,13 +723,6 @@ File gid_File_Lib_Crypto
End
#endif
-File gid_File_Lib_Unopkgapp
- LIB_FILE_BODY;
- Dir = SCP2_OOO_BIN_DIR;
- Name = SCP2_URE_DL_NORMAL("unopkgapp");
- Styles = (PACKED);
-End
-
#if defined WNT && !defined _gcc3 && defined WITH_MOZAB4WIN
// see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
// gid_Brand_File_Lib_Msvcr80
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 64f7072..59ab1d4 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -90,7 +90,6 @@ Module gid_Module_Root_Files_2
gid_File_Bin_Uri_Encode,
gid_File_Bin_UIPreviewer,
gid_File_Exe_Nsplugin,
- gid_File_Lib_Unopkgapp,
gid_File_Txt_Pagein_Common,
gid_File_Txt_Pagein_Calc,
gid_File_Txt_Pagein_Draw,
@@ -149,8 +148,6 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Pl,
gid_File_Lib_Spa,
gid_File_Lib_AVMediaWin,
- gid_File_Lib_AVMediaGStreamer,
- gid_File_Lib_AVMediaGStreamer_0_10,
gid_File_Lib_Sysdtrans,
gid_File_Lib_BaseBmp,
gid_File_Lib_Zip,
@@ -170,19 +167,12 @@ Module gid_Module_Root_Files_5
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Dat_Root5,
- gid_File_Lib_Dict_Ja,
- gid_File_Lib_Dict_Zh,
- gid_File_Lib_Collator_Data,
- gid_File_Lib_Index_Data,
- gid_File_Lib_Textconv_Dict,
gid_File_Lib_Crypto,
#if ! defined SYSTEM_CLUCENE
gid_File_Lib_CLucene,
#endif
gid_File_Lib_Curl,
gid_Unixlink_File_Lib_Curl,
- gid_File_Lib_Dbpool,
- gid_File_Lib_Embobj,
gid_File_Lib_Emboleobj,
gid_File_Lib_Macab_1,
gid_File_Lib_Macab_Drv_1,
@@ -195,14 +185,9 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Mozbootstrap,
gid_File_Lib_Officebean,
gid_File_Lib_Openssl,
- gid_File_Lib_DeploymentGui,
gid_File_Lib_Recentfile,
- gid_File_Lib_Srtrs1,
gid_File_Lib_Tab,
gid_File_Lib_Tab2,
- gid_File_Lib_Migrationoo2,
- gid_File_Lib_Migrationoo3,
- gid_File_Ucptdoc1,
gid_File_Lib_Raptor,
gid_Unixlink_File_Lib_Raptor,
gid_File_Lib_Rasqal,
@@ -222,20 +207,14 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Sqlite3,
gid_File_Lib_Ssl3,
gid_File_Lib_Sndfile,
- gid_File_Lib_Ucpchelp1,
gid_File_Lib_Ucpdav1,
gid_File_Lib_Neon,
- gid_File_Lib_Ucpftp1,
- gid_File_Lib_Ucphier1,
- gid_File_Lib_Ucppkg1,
gid_File_Lib_Xslt,
gid_Unixlink_File_Lib_Xslt,
gid_Unixlink_File_Lib_eXslt,
gid_File_Lib_LibXMLSec_xmlsecnss,
gid_File_Lib_LibXMLSec_xmlseccore,
gid_File_Lib_LibXMLSec_xmlsecmscrypto,
- gid_File_Lib_XSec_XMLSecurity,
- gid_File_Lib_XSec_Framework,
gid_File_Lib_XSec_XmlSec,
gid_File_Lib_Cmdmail,
gid_File_Lib_I18n,
@@ -257,7 +236,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Smplmail,
gid_File_Lib_Wininetbe,
gid_File_Lib_Macbe,
- gid_File_Lib_Updatefeed,
gid_File_Lib_Cli_Oootypes_Assembly,
gid_File_Lib_Policy_Cli_Oootypes_Assembly,
gid_File_Lib_Policy_Cli_Oootypes_Config);
More information about the Libreoffice-commits
mailing list