Kaydet (Commit) b0c43257 authored tarafından Marcos Paulo de Souza's avatar Marcos Paulo de Souza Kaydeden (comit) Fridrich Strba

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

Change-Id: I89a661908fe7d679aa68d5ba9ead41d6b0a0d6bf
Reviewed-on: https://gerrit.libreoffice.org/5039Reviewed-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
Tested-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
üst 75ef95eb
......@@ -358,9 +358,24 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
xsltfilter \
$(if $(filter $(OS),WNT), \
ado \
$(if $(DISABLE_ATL),,oleautobridge) \
dnd \
dtrans \
fps \
ftransl \
$(if $(SOLAR_JAVA),java_uno_accessbridge) \
$(if $(DISABLE_ATL),,oleautobridge \
inprocserv \
) \
$(if $(HAVE_WINDOWS_SDK),instooofiltmsi \
qslnkmsi \
reg4allmsdoc \
sdqsmsi \
sellangmsi \
sn_tools \
) \
smplmail \
wininetbe1 \
xmlsec1 \
) \
$(if $(filter $(OS),MACOSX), \
AppleRemote \
......@@ -528,7 +543,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
bluez_bluetooth \
emboleobj \
java_uno_accessbridge \
libreoffice \
macab1 \
macabdrv1 \
......@@ -549,28 +563,17 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
dnd \
dtrans \
fop \
fps \
ftransl \
inprocserv \
instooofiltmsi \
jfregca \
ooofilt \
ooofilt_x64 \
propertyhdl \
propertyhdl_x64 \
qslnkmsi \
reg4allmsdoc \
regactivex \
regpatchactivex \
sdqsmsi \
sellangmsi \
shlxthdl \
shlxthdl_x64 \
shlxtmsi \
sn_tools \
so_activex \
so_activex_x64 \
sysdtrans \
......@@ -613,7 +616,6 @@ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
xmlsec1 \
xmlsec1-nss \
))
ifneq ($(CROSS_COMPILING),YES)
......
......@@ -26,15 +26,6 @@
************************************************************************/
#include "macros.inc"
#if defined SOLAR_JAVA && defined WNT
File gid_File_Lib_Accessbridge
LIB_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
Name = "java_uno_accessbridge.dll";
End
#endif
#ifndef SYSTEM_CLUCENE
File gid_File_Lib_CLucene
LIB_FILE_BODY;
......@@ -121,44 +112,11 @@ End
#endif
#ifdef WNT
File gid_File_Lib_Dnd
LIB_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
Name = "dnd.dll";
End
#endif
#ifdef WNT
File gid_File_Lib_Dtrans
LIB_FILE_BODY;
Name = "dtrans.dll";
Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
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
#if defined(WNT) && !defined(DISABLE_ATL)
File gid_File_Lib_Inprocserv
LIB_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
Name = "inprocserv.dll";
End
#endif
#ifdef UNX
#ifdef MACOSX
......@@ -179,17 +137,6 @@ End
#endif // #ifdef UNX
#ifdef WNT
File gid_File_Lib_Fps
LIB_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
Name = "fps.dll";
End
#endif
#if defined UNX && ! defined MACOSX
#ifdef ENABLE_TDE
File gid_File_Bin_TdeFilePicker
......@@ -284,17 +231,6 @@ End
#endif
#ifdef WNT
File gid_File_Lib_Ftransl
LIB_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
Name = "ftransl.dll";
End
#endif
#ifndef SYSTEM_ICU
File gid_File_Lib_Icudata
......@@ -344,17 +280,6 @@ End
#endif
#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
File gid_File_Lib_sn_tools
LIB_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH);
Dir = SCP2_OOO_BIN_DIR;
Name = "sn_tools.dll";
End
#endif
#if defined(WNT)
#if defined WITH_MOZAB4WIN
......@@ -455,45 +380,8 @@ End
#endif
#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
File gid_File_Lib_Reg4allmsdoc
LIB_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
Dir = SCP2_OOO_BIN_DIR;
Name = "reg4allmsdoc.dll";
End
File gid_File_Lib_Qslnkmsi
LIB_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
Dir = SCP2_OOO_BIN_DIR;
Name = "qslnkmsi.dll";
End
File gid_File_Lib_Sdqsmsi
LIB_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
Dir = SCP2_OOO_BIN_DIR;
Name = "sdqsmsi.dll";
End
#endif /* WNT && HAVE_WINDOWS_SDK */
STD_LIB_FILE( gid_File_Lib_Oox , oox)
#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
File gid_File_Lib_Instooofiltmsi
LIB_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
Dir = SCP2_OOO_BIN_DIR;
Name = "instooofiltmsi.dll";
End
#endif
#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
File gid_File_Lib_Spa
......@@ -604,16 +492,6 @@ End
#endif
#ifdef WNT
File gid_File_Lib_LibXMLSec_xmlseccore
LIB_FILE_BODY;
#ifdef _gcc3
Name = "libxmlsec1.dll";
#else
Name = "libxmlsec.dll";
#endif
Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
#ifdef CROSS_COMPILING
File gid_File_Lib_LibXMLSec_xmlsecnss
......@@ -744,14 +622,3 @@ File gid_File_Lib_Rdf
#endif
End
#endif // SYSTEM_REDLAND
#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
File gid_File_Lib_sellangmsi
LIB_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
Dir = gid_Brand_Dir_Program;
Name = "sellangmsi.dll";
End
#endif
......@@ -109,7 +109,6 @@ Module gid_Module_Root_Files_3
Files = (gid_File_Dat_Root3,
gid_File_Jar_Unoil,
gid_File_Jar_Hsqldb_Sdbc,
gid_File_Jar_Accessbridge,
gid_File_Jar_Officebean,
gid_File_Jar_Report,
gid_File_Jar_Smoketest,
......@@ -210,24 +209,13 @@ Module gid_Module_Root_Files_5
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_XmlSec,
gid_File_Lib_Cmdmail,
gid_File_Lib_I18n,
gid_File_Lib_Accessbridge,
gid_File_Lib_Dl,
gid_File_Lib_Dnd,
gid_File_Lib_Dtrans,
gid_File_Lib_Inprocserv,
gid_File_Lib_Fps,
gid_File_Lib_Ftransl,
gid_File_Lib_sn_tools,
GID_FILE_LIB_WPD,
gid_File_Lib_Reg4allmsdoc,
gid_File_Lib_Qslnkmsi,
gid_File_Lib_Sdqsmsi,
gid_File_Lib_Instooofiltmsi,
gid_File_Lib_Cli_Oootypes_Assembly,
gid_File_Lib_Policy_Cli_Oootypes_Assembly,
gid_File_Lib_Policy_Cli_Oootypes_Config);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment