On Tue, 2012-08-14 at 11:22 +0200, Michael Stahl wrote:
> On 14/08/12 11:18, Caolán McNamara wrote:
> > On Mon, 2012-08-13 at 17:17 +0200, Matúš Kukan wrote:
> > I think we really have to bite the bullet and just state that we *need*
> > nss (and we *need* xmlsec) and if the buildbots die with "can't find
> > mozilla-build tools required to build nss" then that's fine and the
> > buildbot needs to install the additional dependency.
>
> indeed, AFAIR --disable-xmlsec is not supposed to be used on desktop
> platforms, it is only for those weird smartphone things; perhaps we
> should add a platform check in configure...
Right, so I pushed Matúš's patch, which means that particular buildbot
gives the "real" error now that it doesn't have the tooling to build
nss.
@tml: On the --disable-xmlsec stuff in the Android and iOS default
configs. Why is that ?, it is because they don't build, because its just
handier to not worry about nss and xmlsec for now, or is there a
fundamental problem ?
C.
>From e363d6ee8444ca2b9498998a6af999bd53687ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caol...@redhat.com>
Date: Tue, 14 Aug 2012 10:38:35 +0100
Subject: [PATCH] drop disable-xmlsec, it's core functionality, have to live
with it
we basically need this functionality, the idea of it being optional
isn't really logical anymore with nss split out from mozilla.
Change-Id: I4b16c62553b12d3dcd340a0b5c5a4cbd807c2f02
---
config_host.mk.in | 1 -
configure.in | 17 -----------------
distro-configs/LibreOfficeAndroid.conf | 1 -
distro-configs/LibreOfficeAndroidX86.conf | 1 -
distro-configs/LibreOfficeiOS.conf | 1 -
libxmlsec/makefile.mk | 5 -----
postprocess/packcomponents/makefile.mk | 2 --
sc/CppunitTest_sc_subsequent_filters_test.mk | 2 --
scp2/InstallModule_ooo.mk | 1 -
scp2/source/ooo/file_library_ooo.scp | 6 +-----
tail_build/prj/build.lst | 2 +-
xmlsecurity/Module_xmlsecurity.mk | 2 +-
xmlsecurity/prj/build.lst | 2 +-
13 files changed, 4 insertions(+), 39 deletions(-)
diff --git a/config_host.mk.in b/config_host.mk.in
index 717383b..7289d55 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -150,7 +150,6 @@ export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@
export ENABLE_SYMBOLS=@ENABLE_SYMBOLS@
export ENABLE_SYSTRAY_GTK=@ENABLE_SYSTRAY_GTK@
export ENABLE_TELEPATHY=@ENABLE_TELEPATHY@
-export ENABLE_XMLSEC=@ENABLE_XMLSEC@
export ENABLE_ZENITY=@ENABLE_ZENITY@
export EPM=@EPM@
export EPM_FLAGS=@EPM_FLAGS@
diff --git a/configure.in b/configure.in
index fc14552..95bd0db 100644
--- a/configure.in
+++ b/configure.in
@@ -850,12 +850,6 @@ AC_ARG_ENABLE(build-mozilla,
the Mozilla source code but take precompiled zips.]),
,)
-AC_ARG_ENABLE(xmlsec,
- AS_HELP_STRING([--disable-xmlsec],
- [Whether to enable XMLsec for open document signing. Be warned,
- building without XML Security will likely give you test failures.]),
-)
-
AC_ARG_ENABLE(tde,
AS_HELP_STRING([--enable-tde],
[Determines whether to use TQt/TDE vclplug on platforms where TQt and
@@ -7710,17 +7704,6 @@ else
AC_MSG_RESULT([yes])
fi
-AC_MSG_CHECKING([whether to build XML Security support])
-if test "$enable_xmlsec" = "no"; then
- AC_MSG_RESULT([no])
- ENABLE_XMLSEC=
-else
- ENABLE_XMLSEC="YES"
- BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
- AC_MSG_RESULT([yes])
-fi
-AC_SUBST(ENABLE_XMLSEC)
-
dnl ===================================================================
dnl Check for system openldap
dnl ===================================================================
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index aac1da7..01f11ca 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -17,7 +17,6 @@
--disable-randr
--disable-randr-link
--disable-systray
---disable-xmlsec
--enable-mergelibs
--without-junit
--without-ppds
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index a60fec7..a3662d6 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -18,7 +18,6 @@
--disable-randr
--disable-randr-link
--disable-systray
---disable-xmlsec
--enable-mergelibs
--without-junit
--without-ppds
diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf
index 67afb67..89e88ed 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -20,7 +20,6 @@
--disable-randr-link
--disable-systray
--disable-vba
---disable-xmlsec
--without-afms
--without-fonts
--without-java
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 1470503..0977d54 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -35,11 +35,6 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
.INCLUDE : settings.mk
-.IF "$(ENABLE_XMLSEC)" != "YES"
-@all:
- @echo "XMLSec module disabled"
-.ENDIF
-
# --- Files --------------------------------------------------------
XMLSEC1VERSION=1.2.14
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index eb5574b..8c3fe1e 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -313,13 +313,11 @@ my_components += \
my_components += component/extensions/source/plugin/pl
.END
-.IF "$(ENABLE_XMLSEC)" == "YES"
.IF "$(OS)" == "WNT"
my_components += component/xmlsecurity/util/xsec_xmlsec.windows
.ELSE
my_components += component/xmlsecurity/util/xsec_xmlsec
.END
-.END
.IF "$(OS)" == "MACOSX"
my_components += \
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index 608fd66..34b646d 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -119,7 +119,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
xmlsecurity/util/xmlsecurity \
))
-ifeq ($(ENABLE_XMLSEC),YES)
ifeq ($(OS),WNT)
$(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
xmlsecurity/util/xsec_xmlsec.windows \
@@ -129,7 +128,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
xmlsecurity/util/xsec_xmlsec \
))
endif
-endif
$(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_filters_test))
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 4dff0df..97a007d 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
ENABLE_ONLINE_UPDATE \
ENABLE_OPENGL \
ENABLE_TELEPATHY \
- ENABLE_XMLSEC \
MERGELIBS \
SYSTEM_BOOST \
SYSTEM_CAIRO \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 7197986..58f4d85 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1342,8 +1342,7 @@ SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
#endif
#endif
-//we need the nss libs of libxmlsec is enabled, or if the internal mozilla is enabled
-#if defined(ENABLE_XMLSEC) || !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA)
+//we need the nss libs for libxmlsec (or if the internal mozilla is enabled)
#ifndef SYSTEM_NSS
SPECIAL_LIB_FILE(gid_File_Lib_Freebl3,freebl3)
SPECIAL_LIB_FILE(gid_File_Lib_Nss3,nss3)
@@ -1374,7 +1373,6 @@ End
#endif //WNT
SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3)
#endif //SYSTEM_NSS
-#endif //defined(ENABLE_XMLSEC) || !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA)
SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
@@ -1508,7 +1506,6 @@ File gid_File_Lib_XSec_Framework
Styles = (PACKED);
End
-#if defined(ENABLE_XMLSEC)
File gid_File_Lib_XSec_XmlSec
LIB_FILE_BODY;
#ifdef UNX
@@ -1543,7 +1540,6 @@ File gid_File_Lib_LibXMLSec_xmlsecmscrypto
Styles = (PACKED);
End
#endif
-#endif
File gid_File_Lib_Migrationoo2
LIB_FILE_BODY;
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 9461730..769a393 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBMSPUB:libmspub LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBMSPUB:libmspub LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
index ea5f5aa..2e6e8d9 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\
AllLangResTarget_xsec \
Library_xmlsecurity \
Library_xsec_fw \
- $(if $(filter YES,$(ENABLE_XMLSEC)),Library_xsec_xmlsec) \
+ Library_xsec_xmlsec \
))
# failing
diff --git a/xmlsecurity/prj/build.lst b/xmlsecurity/prj/build.lst
index d70a6db..9dfe04c 100644
--- a/xmlsecurity/prj/build.lst
+++ b/xmlsecurity/prj/build.lst
@@ -1,2 +1,2 @@
-xs xmlsecurity : TRANSLATIONS:translations xmloff unotools offapi unoil svx LIBXMLSEC:libxmlsec NSS:nss LIBXSLT:libxslt NEON:neon NULL
+xs xmlsecurity : TRANSLATIONS:translations xmloff unotools offapi unoil svx libxmlsec NSS:nss LIBXSLT:libxslt NEON:neon NULL
xs xmlsecurity\prj nmake - all xs_prj NULL
--
1.7.11.2
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
