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

fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO

Browse Source 
Change-Id: I7a3511172ac8ddd060c51c0339a4b9ff16216668
This commit is contained in:
Marcos Paulo de Souza
2013-06-13 11:32:09 -03:00
committed by Matúš Kukan
parent 03420d69e2
commit 1492a2f09c
3 changed files with 13 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Repository.mk
View File

@@ -291,6 +291,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
log \ log \
lng \ lng \
lnth \ lnth \
$(if $(filter $(OS),MACOSX),macbe1) \
$(if $(MERGELIBS),merged) \ $(if $(MERGELIBS),merged) \
migrationoo2 \ migrationoo2 \
migrationoo3 \ migrationoo3 \
@@ -373,7 +374,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
adabas \ adabas \
adabasui \ adabasui \
ado \
agg \ agg \
$(if $(filter $(OS),ANDROID),, \ $(if $(filter $(OS),ANDROID),, \
basebmp \ basebmp \
@@ -382,10 +382,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
oox \ oox \
ooxml \ ooxml \
sdbc \ sdbc \
AppleRemote \
avmediaQuickTime \ avmediaQuickTime \
filtertracer \ filtertracer \
MacOSXSpell \
mork \ mork \
mozab2 \ mozab2 \
mozabdrv \ mozabdrv \
@@ -514,9 +512,20 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
xmlsecurity \ xmlsecurity \
xsec_fw \ xsec_fw \
xstor \ xstor \
$(if $(filter $(OS),WNT), \
ado \
$(if $(ENABLE_DIRECTX),avmediawin) \
$(if $(DISABLE_ATL),,oleautobridge) \
smplmail \
wininetbe1 \
) \
$(if $(filter $(OS),MACOSX), \
AppleRemote \
fps_aqua \
MacOSXSpell \
) \
)) ))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
avmediawin \
bluez_bluetooth \ bluez_bluetooth \
emboleobj \ emboleobj \
java_uno_accessbridge \ java_uno_accessbridge \
@@ -578,20 +587,11 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
cmdmail \ cmdmail \
macbe1 \
OGLTrans \ OGLTrans \
pdfimport \ pdfimport \
postgresql-sdbc \ postgresql-sdbc \
postgresql-sdbc-impl \ postgresql-sdbc-impl \
pythonloader \ pythonloader \
$(if $(filter $(OS),MACOSX), \
fps_aqua \
) \
$(if $(filter $(OS),WNT), \
oleautobridge \
smplmail \
wininetbe1 \
) \
)) ))
$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \

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

@@ -35,10 +35,6 @@ File gid_File_Lib_Accessbridge
End End
#endif #endif
#if defined(WNT)
STD_LIB_FILE( gid_File_Lib_Ado, ado)
#endif
#ifndef SYSTEM_CLUCENE #ifndef SYSTEM_CLUCENE
File gid_File_Lib_CLucene File gid_File_Lib_CLucene
LIB_FILE_BODY; LIB_FILE_BODY;
@@ -215,15 +211,6 @@ End
#endif #endif
#ifdef MACOSX #ifdef MACOSX
STD_LIB_FILE( gid_File_Lib_Fps_Aqua, fps_aqua )
File gid_File_Lib_MacOSXSpell
LIB_FILE_BODY;
Styles = (PACKED);
Name = LIBNAME(MacOSXSpell);
Dir = SCP2_OOO_BIN_DIR;
End
#ifndef X86_64 #ifndef X86_64
File gid_File_Lib_avmediaQuickTime File gid_File_Lib_avmediaQuickTime
LIB_FILE_BODY; LIB_FILE_BODY;
@@ -425,10 +412,6 @@ End
#endif #endif
#endif #endif
#if defined(WNT) && !defined(DISABLE_ATL)
STD_LIB_FILE( gid_File_Lib_Ole, oleautobridge )
#endif
#if defined ENABLE_NPAPI_FROM_BROWSER #if defined ENABLE_NPAPI_FROM_BROWSER
STD_LIB_FILE( gid_File_Lib_Pl , pl) STD_LIB_FILE( gid_File_Lib_Pl , pl)
#endif #endif
@@ -460,15 +443,6 @@ End
#endif #endif
#endif #endif
#if defined(MACOSX)
File gid_File_Lib_AppleRemote
Name = LIBNAME(AppleRemote);
LIB_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
End
#endif
#if defined(MACOSX) #if defined(MACOSX)
File gid_File_Lib_Basebmp File gid_File_Lib_Basebmp
Name = LIBNAME(basebmp); Name = LIBNAME(basebmp);
@@ -535,10 +509,6 @@ End
#endif #endif
#ifdef WNT
STD_LIB_FILE( gid_File_Lib_Smplmail, smplmail )
#endif
#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS) #if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
File gid_File_Lib_Spa File gid_File_Lib_Spa
@@ -570,15 +540,6 @@ File gid_File_Lib_Sysdtrans
End End
#endif #endif
#ifdef WNT
STD_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1 )
#endif
#ifdef MACOSX
STD_LIB_FILE( gid_File_Lib_Macbe, macbe1 )
#endif
#ifndef DISABLE_NEON #ifndef DISABLE_NEON
SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1) SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
#ifndef SYSTEM_NEON #ifndef SYSTEM_NEON
@@ -657,12 +618,6 @@ File gid_File_Lib_eXslt
End End
#endif #endif
#if defined WNT
#ifdef ENABLE_DIRECTX
SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
#endif
#endif
#ifdef WNT #ifdef WNT
File gid_File_Lib_LibXMLSec_xmlseccore File gid_File_Lib_LibXMLSec_xmlseccore
LIB_FILE_BODY; LIB_FILE_BODY;

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

@@ -146,7 +146,6 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Oox, gid_File_Lib_Oox,
gid_File_Lib_Pl, gid_File_Lib_Pl,
gid_File_Lib_Spa, gid_File_Lib_Spa,
gid_File_Lib_AVMediaWin,
gid_File_Lib_Sysdtrans, gid_File_Lib_Sysdtrans,
gid_File_Lib_BaseBmp, gid_File_Lib_BaseBmp,
gid_File_Lib_Zip, gid_File_Lib_Zip,
@@ -218,7 +217,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Cmdmail, gid_File_Lib_Cmdmail,
gid_File_Lib_I18n, gid_File_Lib_I18n,
gid_File_Lib_Accessbridge, gid_File_Lib_Accessbridge,
gid_File_Lib_Ado,
gid_File_Lib_Dl, gid_File_Lib_Dl,
gid_File_Lib_Dnd, gid_File_Lib_Dnd,
gid_File_Lib_Dtrans, gid_File_Lib_Dtrans,
@@ -227,14 +225,10 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Ftransl, gid_File_Lib_Ftransl,
gid_File_Lib_sn_tools, gid_File_Lib_sn_tools,
GID_FILE_LIB_WPD, GID_FILE_LIB_WPD,
gid_File_Lib_Ole,
gid_File_Lib_Reg4allmsdoc, gid_File_Lib_Reg4allmsdoc,
gid_File_Lib_Qslnkmsi, gid_File_Lib_Qslnkmsi,
gid_File_Lib_Sdqsmsi, gid_File_Lib_Sdqsmsi,
gid_File_Lib_Instooofiltmsi, gid_File_Lib_Instooofiltmsi,
gid_File_Lib_Smplmail,
gid_File_Lib_Wininetbe,
gid_File_Lib_Macbe,
gid_File_Lib_Cli_Oootypes_Assembly, gid_File_Lib_Cli_Oootypes_Assembly,
gid_File_Lib_Policy_Cli_Oootypes_Assembly, gid_File_Lib_Policy_Cli_Oootypes_Assembly,
gid_File_Lib_Policy_Cli_Oootypes_Config); gid_File_Lib_Policy_Cli_Oootypes_Config);