libcmis: convert to gbuild

Change-Id: I4586cb27505bbdc20a543fc812d8b480b4b94236

16 files changed, 146 insertions, 18 deletions

diff --git a/Makefile.top b/Makefile.top
index e0079a469188..132e03570b8d 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -87,6 +87,7 @@ jvmaccess\
 jvmfwk\
 l10ntools\
 libcdr\
+libcmis\
 libmspub\
 libvisio\
 libwpd\
@@ -209,7 +210,6 @@ instsetoo_native\
 jfreereport\
 jpeg\
 languagetool\
-libcmis\
 libcroco\
 libexttextcat\
 libgsf\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 414651c06212..0fb7b0859ee1 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -74,6 +74,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	io \
 	javaunohelper \
 	libcdr \
+	libcmis \
 	libmspub \
 	libvisio \
 	libwpd \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ed0f471b91c6..eef3e8faea25 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -349,9 +349,9 @@ ifeq ($(SYSTEM_LIBCMIS),YES)
 define gb_LinkTarget__use_cmis
 $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
-	$(LIBCMIS_CFLAGS) \
+	$(CMIS_CFLAGS) \
 )
-$(call gb_LinkTarget_add_libs,$(1),$(LIBCMIS_LIBS))
+$(call gb_LinkTarget_add_libs,$(1),$(CMIS_LIBS))
 
 endef
 
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index c9d93c2d7ae8..e110653b7077 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -83,6 +83,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     jvmfwk \
     l10ntools \
 	libcdr \
+	libcmis \
 	libmspub \
 	libvisio \
 	libwpd \
diff --git a/config_host.mk.in b/config_host.mk.in
index b63983a70881..21dc3753aa41 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -54,6 +54,9 @@ export CL_X64=@CL_X64@
 export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@
 export CLUCENE_LIBS=@CLUCENE_LIBS@
 export CLUCENE_TARBALL=@CLUCENE_TARBALL@
+export CMIS_CFLAGS=@CMIS_CFLAGS@
+export CMIS_LIBS=@CMIS_LIBS@
+export CMIS_TARBALL=@CMIS_TARBALL@
 export COM=@COM@
 export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@
 export COMEX=@COMEX@
@@ -279,8 +282,6 @@ export LCMS2_CFLAGS=@LCMS2_CFLAGS@
 export LCMS2_LIBS=@LCMS2_LIBS@
 export LFS_CFLAGS=@LFS_CFLAGS@
 export LIBBASE_JAR=@LIBBASE_JAR@
-export LIBCMIS_CFLAGS=@LIBCMIS_CFLAGS@
-export LIBCMIS_LIBS=@LIBCMIS_LIBS@
 export LIBDIR=@LIBDIR@
 export LIBEXSLT_CFLAGS=@LIBEXSLT_CFLAGS@
 export LIBEXSLT_LIBS=@LIBEXSLT_LIBS@
diff --git a/configure.in b/configure.in
index f7569c5d1d9c..8d27fa96fb6d 100644
--- a/configure.in
+++ b/configure.in
@@ -6676,15 +6676,16 @@ AC_MSG_CHECKING([which libcmis to use])
 if test "$with_system_libcmis" = "yes"; then
     AC_MSG_RESULT([external])
     SYSTEM_LIBCMIS=YES
-    PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 >= 0.2.1 )
+    PKG_CHECK_MODULES( CMIS, libcmis-0.2 >= 0.2.1 )
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBCMIS=NO
-    BUILD_TYPE="$BUILD_TYPE LIBCMIS"
+    CMIS_TARBALL=0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
 fi
 AC_SUBST(SYSTEM_LIBCMIS)
-AC_SUBST(LIBCMIS_CFLAGS)
-AC_SUBST(LIBCMIS_LIBS)
+AC_SUBST(CMIS_CFLAGS)
+AC_SUBST(CMIS_LIBS)
+AC_SUBST(CMIS_TARBALL)
 
 
 dnl ===================================================================
diff --git a/libcmis/Makefile b/libcmis/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/libcmis/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/libcmis/Module_libcmis.mk b/libcmis/Module_libcmis.mk
new file mode 100644
index 000000000000..c2c09f0f489a
--- /dev/null
+++ b/libcmis/Module_libcmis.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,libcmis))
+
+ifeq ($(SYSTEM_LIBCMIS),NO)
+
+$(eval $(call gb_Module_add_targets,libcmis,\
+	Package_libcmis \
+	StaticLibrary_cmis \
+	UnpackedTarball_cmis \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libcmis/Package_libcmis.mk b/libcmis/Package_libcmis.mk
new file mode 100644
index 000000000000..6039aadd45ff
--- /dev/null
+++ b/libcmis/Package_libcmis.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,libcmis_inc,$(call gb_UnpackedTarball_get_dir,cmis/src/libcmis)))
+
+$(eval $(call gb_Package_use_unpacked,libcmis_inc,cmis))
+
+$(eval $(call gb_Package_add_files,libcmis_inc,inc/external/libcmis,\
+	allowable-actions.hxx \
+	atom-document.hxx \
+	atom-folder.hxx \
+	atom-object-type.hxx \
+	atom-object.hxx \
+	atom-session.hxx \
+	atom-utils.hxx \
+	atom-workspace.hxx \
+	document.hxx \
+	exception.hxx \
+	folder.hxx \
+	object-type.hxx \
+	object.hxx \
+	property-type.hxx \
+	property.hxx \
+	repository.hxx \
+	session-factory.hxx \
+	session.hxx \
+	test-helpers.hxx \
+	xml-utils.hxx \
+	xmlserializable.hxx \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libcmis/StaticLibrary_cmis.mk b/libcmis/StaticLibrary_cmis.mk
new file mode 100644
index 000000000000..01aa3723673a
--- /dev/null
+++ b/libcmis/StaticLibrary_cmis.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,cmislib))
+
+$(eval $(call gb_StaticLibrary_set_warnings_not_errors,cmislib))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,cmislib,cmis))
+
+$(eval $(call gb_StaticLibrary_use_package,cmislib,libcmis_inc))
+
+$(eval $(call gb_StaticLibrary_use_externals,cmislib,\
+	curl \
+	libxml2 \
+))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,cmislib,\
+	UnpackedTarball/cmis/src/libcmis/allowable-actions \
+	UnpackedTarball/cmis/src/libcmis/atom-document \
+	UnpackedTarball/cmis/src/libcmis/atom-folder \
+	UnpackedTarball/cmis/src/libcmis/atom-object-type \
+	UnpackedTarball/cmis/src/libcmis/atom-object \
+	UnpackedTarball/cmis/src/libcmis/atom-session \
+	UnpackedTarball/cmis/src/libcmis/atom-utils \
+	UnpackedTarball/cmis/src/libcmis/atom-workspace \
+	UnpackedTarball/cmis/src/libcmis/property-type \
+	UnpackedTarball/cmis/src/libcmis/property \
+	UnpackedTarball/cmis/src/libcmis/session-factory \
+	UnpackedTarball/cmis/src/libcmis/xml-utils \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libcmis/UnpackedTarball_cmis.mk b/libcmis/UnpackedTarball_cmis.mk
new file mode 100644
index 000000000000..d75c5f673419
--- /dev/null
+++ b/libcmis/UnpackedTarball_cmis.mk
@@ -0,0 +1,25 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,cmis))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,cmis,$(CMIS_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,cmis,\
+	libcmis/libcmis-0.2.3.patch \
+	libcmis/libcmis-0.2.3-backports.patch \
+))
+
+ifeq ($(OS)$(COM),WNTMSC)
+$(eval $(call gb_UnpackedTarball_add_patches,cmis,libcmis/boost-win.patch))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libcmis/prj/d.lst b/libcmis/prj/d.lst
index fb52e94af688..e69de29bb2d1 100644
--- a/libcmis/prj/d.lst
+++ b/libcmis/prj/d.lst
@@ -1,6 +0,0 @@
-
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
-
-mkdir: %_DEST%\inc\libcmis
-..\%__SRC%\misc\build\libcmis*\src\libcmis\*.hxx %_DEST%\inc\libcmis\*.hxx
diff --git a/libcmis/prj/dmake b/libcmis/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/libcmis/prj/dmake
+++ /dev/null
diff --git a/ooo.lst.in b/ooo.lst.in
index 23080ee2a2a5..16b5149e48e7 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -90,7 +90,7 @@ a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
 @VISIO_TARBALL@
 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
-0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
+@CMIS_TARBALL@
 @CDR_TARBALL@
 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
 @MSPUB_TARBALL@
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 45f3d2a14639..20609e5be550 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 HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBORCUS:liborcus 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 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 HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBORCUS:liborcus 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 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/ucb/prj/build.lst b/ucb/prj/build.lst
index eb59cbef93cd..a47c955b3dee 100644
--- a/ucb/prj/build.lst
+++ b/ucb/prj/build.lst
@@ -1,4 +1,4 @@
-uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 LIBXSLT:libxslt LIBCMIS:libcmis offapi sal salhelper ucbhelper udkapi comphelper tools NULL
+uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 LIBXSLT:libxslt libcmis offapi sal salhelper ucbhelper udkapi comphelper tools NULL
 uc ucb\prj			nmake	-	all	uc_prj NULL
 #uc      ucb\qa\complex\ucb              nmake   -       all     uc_complex_ucb uc_inc NULL
 # fails, please fix