configure.in | 16 ++++++++++++----
libcmis/Module_libcmis.mk | 2 ++
postprocess/packcomponents/makefile.mk | 4 ++++
scp2/source/ooo/file_library_ooo.scp | 6 +++---
scp2/source/ooo/module_hidden_ooo.scp | 4 +++-
set_soenv.in | 1 +
ucb/prj/build.lst | 2 +-
ucb/source/ucp/cmis/makefile.mk | 3 +++
8 files changed, 29 insertions(+), 9 deletions(-)
New commits:
commit c45f59f062eb135463ea8ce0a06950eb9a6dfec2
Author: Cédric Bosdonnat <cedric.bosdonnat....@free.fr>
Date: Mon Oct 3 14:12:19 2011 +0200
Revert "Don't bother with libcmis on Windows for now"
This reverts commit 0dd1e3b1240e4d5a2c9ac6de0348658918e012a8. Use
--disable-cmis now to avoid building all CMIS-related code.
diff --git a/configure.in b/configure.in
index 2b58f78..550b3a2 100644
--- a/configure.in
+++ b/configure.in
@@ -4632,13 +4632,10 @@ if test -n "$with_system_libcmis" -a
"$with_system_libcmis" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_LIBCMIS=YES
PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 )
-elif test $_os != WINNT; then
+else
AC_MSG_RESULT([internal])
SYSTEM_LIBCMIS=NO
BUILD_TYPE="$BUILD_TYPE LIBCMIS"
-else
- AC_MSG_RESULT([none])
- SYSTEM_LIBCMIS=YES
fi
AC_SUBST(SYSTEM_LIBCMIS)
AC_SUBST(LIBCMIS_CFLAGS)
diff --git a/ucb/prj/build.lst b/ucb/prj/build.lst
index 5fc0179..350d3f9 100644
--- a/ucb/prj/build.lst
+++ b/ucb/prj/build.lst
@@ -16,7 +16,7 @@ uc ucb\source\ucp\tdoc nmake -
all uc_tdoc uc_inc NULL
uc ucb\source\ucp\expand nmake - all uc_expand
uc_inc NULL
uc ucb\source\ucp\ext nmake - all uc_ext
uc_inc NULL
uc ucb\source\ucp\odma nmake - w uc_odma
uc_inc NULL
-uc ucb\source\ucp\cmis nmake - u uc_cmis
uc_inc NULL
+uc ucb\source\ucp\cmis nmake - all uc_cmis
uc_inc NULL
#uc ucb\qa\complex\ucb nmake - all
uc_complex_ucb uc_inc NULL
# fails, please fix
# uc ucb\qa\complex\tdoc nmake - all
uc_complex_tdoc uc_complex_tdoc_interfaces uc_inc NULL
commit 5bd2890a56125d391b42f34d51e2e0c57b0a80b0
Author: Cédric Bosdonnat <cedric.bosdonnat....@free.fr>
Date: Mon Oct 3 14:10:10 2011 +0200
Added --disable-cmis flag for use while the feature is too unstable
diff --git a/configure.in b/configure.in
index f05a9bd..2b58f78 100644
--- a/configure.in
+++ b/configure.in
@@ -519,6 +519,11 @@ AC_ARG_ENABLE(release-build,
See http://wiki.documentfoundation.org/DevBuild]),
,)
+AC_ARG_ENABLE(cmis,
+ AS_HELP_STRING([--disable-cmis],
+ [Disable CMIS experimental feature.]),
+,enable_cmis=yes)
+
dnl ===================================================================
dnl Optional Packages (--with/without-)
dnl ===================================================================
@@ -7026,6 +7031,12 @@ if test "$enable_cairo_canvas" = "yes" ; then
fi
AC_SUBST(ENABLE_CAIRO_CANVAS)
+ENABLE_CMIS="FALSE"
+if test "$enable_cmis" = "yes" ; then
+ ENABLE_CMIS="TRUE"
+fi
+AC_SUBST(ENABLE_CMIS)
+
dnl ===================================================================
dnl Check whether the GStreamer libraries are available.
dnl ===================================================================
diff --git a/libcmis/Module_libcmis.mk b/libcmis/Module_libcmis.mk
index 0cf0d04..3c0beeb 100644
--- a/libcmis/Module_libcmis.mk
+++ b/libcmis/Module_libcmis.mk
@@ -27,9 +27,11 @@
$(eval $(call gb_Module_Module,libcmis))
+ifneq ($(ENABLE_CMIS),)
$(eval $(call gb_Module_add_targets,libcmis,\
ExternalLib_libcmis \
))
+endif
# vim: set noet sw=4 ts=4:
diff --git a/postprocess/packcomponents/makefile.mk
b/postprocess/packcomponents/makefile.mk
index 8b42349..8d6a363 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -221,6 +221,10 @@ my_components += gconfbe1
my_components += ucpgio
.END
+.IF "$(ENABLE_CMIS)" != ""
+my_components += ucpcmis
+.END
+
.IF "$(ENABLE_GNOMEVFS)" != ""
my_components += ucpgvfs
.END
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index 0377940..d5b62bc 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -186,8 +186,7 @@ End
#endif
-#ifndef WNT
-
+#if ENABLE_CMIS
File gid_File_Lib_Cmis
TXT_FILE_BODY;
Styles = (PACKED);
@@ -206,6 +205,7 @@ File gid_File_Lib_Cmis
#endif
#endif
End
+#endif
#endif
@@ -1356,7 +1356,7 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1,
ucpexpand1.uno)
SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1)
#endif
-#ifndef WNT
+#if ENABLE_CMIS
SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpcmis, ucpcmis1.uno)
#endif
diff --git a/scp2/source/ooo/module_hidden_ooo.scp
b/scp2/source/ooo/module_hidden_ooo.scp
index 0865fb8..826b6b4 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -327,6 +327,9 @@ Module gid_Module_Root_Files_5
#if ! defined SYSTEM_LIBGSF
gid_File_Lib_Libgsf,
#endif
+#if ENABLE_CMIS
+ gid_File_Lib_Cmis,
+#endif
gid_File_Lib_Dict_Ja,
gid_File_Lib_Dict_Zh,
gid_File_Lib_Collator_Data,
@@ -340,7 +343,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Ldapbe2,
gid_File_Lib_Comphelper2,
gid_File_Lib_Cached1,
- gid_File_Lib_Cmis,
gid_File_Lib_Curl,
gid_Unixlink_File_Lib_Curl,
gid_File_Lib_Db,
diff --git a/set_soenv.in b/set_soenv.in
index cf0ef7f..09cefdc 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1496,6 +1496,7 @@ ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
ToFile( "SPLIT_APP_MODULES", "@SPLIT_APP_MODULES@","e" );
ToFile( "SPLIT_OPT_FEATURES","@SPLIT_OPT_FEATURES@","e" );
ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@", "e" );
+ToFile( "ENABLE_CMIS", "@ENABLE_CMIS@", "e" );
ToFile( "ENABLE_OPENGL", "@ENABLE_OPENGL@", "e" );
ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" );
ToFile( "ENABLE_MINIMIZER", "@ENABLE_MINIMIZER@","e" );
diff --git a/ucb/source/ucp/cmis/makefile.mk b/ucb/source/ucp/cmis/makefile.mk
index 43b7c43..4068486 100644
--- a/ucb/source/ucp/cmis/makefile.mk
+++ b/ucb/source/ucp/cmis/makefile.mk
@@ -37,6 +37,8 @@ NO_BSYMBOLIC=TRUE
.INCLUDE: settings.mk
.IF "$(L10N_framework)"==""
+.IF "$(ENABLE_CMIS)"!=""
+
# no "lib" prefix
DLLPRE =
@@ -59,6 +61,7 @@ SHL1STDLIBS=\
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
+.ENDIF # "$(ENABLE_CMIS)"!=""
.ENDIF # L10N_framework
.INCLUDE: target.mk
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
