Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4268
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/68/4268/1
fdo#60924 autoinstall - gbuild/scp2: still more libs to OOO
Change-Id: Ia3a0a740263e92752115665ab5e25c5063b1858a
---
M Repository.mk
M scp2/source/ooo/file_library_ooo.scp
M scp2/source/ooo/module_hidden_ooo.scp
3 files changed, 16 insertions(+), 160 deletions(-)
diff --git a/Repository.mk b/Repository.mk
index 151df15..a71a7a0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -520,9 +520,24 @@
$(if $(filter $(OS),WNT), \
ado \
$(if $(ENABLE_DIRECTX),avmediawin) \
- $(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 \
+ ,sdqsmsi \
+ ,sellangmsi \
+ ,reg4allmsdoc \
+ ,sn_tools
+ ) \
smplmail \
wininetbe1 \
+ xmlsec1 \
) \
$(if $(filter $(OS),MACOSX), \
AppleRemote \
@@ -533,7 +548,6 @@
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
bluez_bluetooth \
emboleobj \
- java_uno_accessbridge \
libreoffice \
macab1 \
macabdrv1 \
@@ -554,28 +568,17 @@
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 \
@@ -618,7 +621,6 @@
ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- xmlsec1 \
xmlsec1-nss \
))
ifneq ($(CROSS_COMPILING),YES)
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index cad2d7c..036ca4a 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -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,42 +112,9 @@
#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
@@ -178,17 +136,6 @@
#endif // #ifdef MACOSX
#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
@@ -284,17 +231,6 @@
#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
@@ -355,17 +291,6 @@
#endif
Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
-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
@@ -470,44 +395,7 @@
#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)
@@ -619,17 +507,6 @@
#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
LIB_FILE_BODY;
@@ -759,14 +636,3 @@
#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
diff --git a/scp2/source/ooo/module_hidden_ooo.scp
b/scp2/source/ooo/module_hidden_ooo.scp
index 6f5325e..d2e3c43 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -110,7 +110,6 @@
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,
@@ -212,24 +211,13 @@
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);
--
To view, visit https://gerrit.libreoffice.org/4268
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3a0a740263e92752115665ab5e25c5063b1858a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza <marcos.souza....@gmail.com>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
