[Libreoffice-commits] .: config_host.mk.in configure.in distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf distro-configs/LibreOfficeiOS.conf libxmlsec/makefile.mk nss/makefile.mk postprocess/packcomponents sc/CppunitTest_sc_subsequent_filters_test.mk scp2/InstallModule_ooo.mk scp2/source tail_build/prj xmlsecurity/Module_xmlsecurity.mk xmlsecurity/prj
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Aug 14 04:48:03 PDT 2012
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 | 4 +--
nss/makefile.mk | 7 +++++-
postprocess/packcomponents/makefile.mk | 4 ---
sc/CppunitTest_sc_subsequent_filters_test.mk | 2 -
scp2/InstallModule_ooo.mk | 1
scp2/source/ooo/file_library_ooo.scp | 31 +++++++++++++--------------
tail_build/prj/build.lst | 2 -
xmlsecurity/Module_xmlsecurity.mk | 4 ++-
xmlsecurity/prj/build.lst | 2 -
14 files changed, 30 insertions(+), 48 deletions(-)
New commits:
commit ee93dfafddd0f14b9a1ac3c82b967bf3a65f64aa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 14 10:38:35 2012 +0100
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.
for iOS and Android where they doesn't build yet spit out lame fixme
nag warnings
Change-Id: I4b16c62553b12d3dcd340a0b5c5a4cbd807c2f02
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..18c46fb 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -35,9 +35,9 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
.INCLUDE : settings.mk
-.IF "$(ENABLE_XMLSEC)" != "YES"
+.IF "$(OS)" == "ANDROID" || "$(OS)" == "IOS"
@all:
- @echo "XMLSec module disabled"
+ @echo "FIXME: XMLSec module not buildable yet on this platform"
.ENDIF
# --- Files --------------------------------------------------------
diff --git a/nss/makefile.mk b/nss/makefile.mk
index 505bcfd..8603fbb 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -39,7 +39,12 @@ TARGET=nss
.IF "$(SYSTEM_NSS)"=="YES"
all:
@echo "NSS will not be built. Using system one instead."
-.ENDIF
+.ENDIF
+
+.IF "$(OS)" == "ANDROID" || "$(OS)" == "IOS"
+ at all:
+ @echo "FIXME: NSS module not buildable yet on this platform"
+.ENDIF
VER_MAJOR=3
VER_MINOR=13
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index eb5574b..a5f2f81 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
+.ELIF "$(OS)" != "ANDROID" && "$(OS)" != "IOS" #FIXME, get nss&xmlsec building
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..eb53f5c 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -119,12 +119,12 @@ $(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 \
))
else
+ifneq ($(filter-out IOS ANDROID,$(OS)),) #FIXME: get nss&xmlsec building
$(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
xmlsecurity/util/xsec_xmlsec \
))
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..de2c541 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1342,8 +1342,8 @@ 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)
+#if !defined(ANDROID) && !defined(IOS) //FIXME: get nss&xmlsec building
+//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 +1374,19 @@ End
#endif //WNT
SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3)
#endif //SYSTEM_NSS
-#endif //defined(ENABLE_XMLSEC) || !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA)
+
+File gid_File_Lib_XSec_XmlSec
+ LIB_FILE_BODY;
+ #ifdef UNX
+ Name = STRING(CONCAT2(libxsec_xmlsec,UNXSUFFIX));
+ #else
+ Name = "xsec_xmlsec.dll";
+ #endif
+ Dir = SCP2_OOO_BIN_DIR;
+ Styles = (PACKED);
+End
+
+#endif
SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
@@ -1508,18 +1520,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
- Name = STRING(CONCAT2(libxsec_xmlsec,UNXSUFFIX));
- #else
- Name = "xsec_xmlsec.dll";
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
#ifdef WNT
File gid_File_Lib_LibXMLSec_xmlseccore
LIB_FILE_BODY;
@@ -1543,7 +1543,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 u
dkapi 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 xmlr
eader 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..46646b0 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -32,9 +32,11 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\
AllLangResTarget_xsec \
Library_xmlsecurity \
Library_xsec_fw \
- $(if $(filter YES,$(ENABLE_XMLSEC)),Library_xsec_xmlsec) \
+ $(ifneq ($(filter-out IOS ANDROID,$(OS)),),Library_xsec_xmlsec) \
))
+#FIXME: ^^^, get nss&libxmlsec building on ios and android
+
# failing
#$(eval $(call gb_Module_add_check_targets,xmlsecurity,\
CppunitTest_qa_certext \
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
More information about the Libreoffice-commits
mailing list