libcdr: convert to gbuild

Change-Id: I067ab0a4559bf7ee0da36a67567e0db9a6e34f87

16 files changed, 121 insertions, 86 deletions

diff --git a/Makefile.top b/Makefile.top
index feb226070351..8a96a66104e0 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -86,6 +86,7 @@ jurt\
 jvmaccess\
 jvmfwk\
 l10ntools\
+libcdr\
 libmspub\
 libvisio\
 libwps\
@@ -206,7 +207,6 @@ instsetoo_native\
 jfreereport\
 jpeg\
 languagetool\
-libcdr\
 libcmis\
 libcroco\
 libexttextcat\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index ad0cc622ae1c..33ec2e1f3c9c 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     idl \
 	io \
 	javaunohelper \
+	libcdr \
 	libmspub \
 	libvisio \
 	libwps \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 18a29d0b8a8f..791cdff74ce5 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     jvmaccess \
     jvmfwk \
     l10ntools \
+	libcdr \
 	libmspub \
 	libvisio \
 	libwps \
diff --git a/config_host.mk.in b/config_host.mk.in
index 5ba74137daa1..b35aa222779d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -47,6 +47,7 @@ export CC=@CC@
 export CC_FOR_BUILD=@CC_FOR_BUILD@
 export CDR_CFLAGS=@CDR_CFLAGS@
 export CDR_LIBS=@CDR_LIBS@
+export CDR_TARBALL=@CDR_TARBALL@
 export CHECK_PARALLELISM=@CHECK_PARALLELISM@
 export CLASSPATH=@CLASSPATH@
 export CL_X64=@CL_X64@
diff --git a/configure.in b/configure.in
index a7ebdf7d4207..f5cb450534e6 100644
--- a/configure.in
+++ b/configure.in
@@ -6620,11 +6620,12 @@ elif test $_os = iOS; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBCDR=NO
-    BUILD_TYPE="$BUILD_TYPE LIBCDR"
+    CDR_TARBALL=ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
 fi
 AC_SUBST(SYSTEM_LIBCDR)
 AC_SUBST(CDR_CFLAGS)
 AC_SUBST(CDR_LIBS)
+AC_SUBST(CDR_TARBALL)
 
 dnl ===================================================================
 dnl Check for system libmspub
diff --git a/libcdr/Makefile b/libcdr/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/libcdr/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/libcdr/Module_libcdr.mk b/libcdr/Module_libcdr.mk
new file mode 100644
index 000000000000..6fb369ab0eca
--- /dev/null
+++ b/libcdr/Module_libcdr.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,libcdr))
+
+ifeq ($(SYSTEM_LIBCDR),NO)
+
+$(eval $(call gb_Module_add_targets,libcdr,\
+	Package_libcdr \
+	StaticLibrary_cdr \
+	UnpackedTarball_cdr \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libcdr/Package_libcdr.mk b/libcdr/Package_libcdr.mk
new file mode 100644
index 000000000000..e7d21bcba5b6
--- /dev/null
+++ b/libcdr/Package_libcdr.mk
@@ -0,0 +1,21 @@
+# -*- 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,libcdr_inc,$(call gb_UnpackedTarball_get_dir,cdr/src/lib)))
+
+$(eval $(call gb_Package_use_unpacked,libcdr_inc,cdr))
+
+$(eval $(call gb_Package_add_files,libcdr_inc,inc/external/libcdr,\
+	libcdr.h \
+	CDRDocument.h \
+	CDRStringVector.h \
+	CMXDocument.h \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libcdr/StaticLibrary_cdr.mk b/libcdr/StaticLibrary_cdr.mk
new file mode 100644
index 000000000000..d0f07a27e63f
--- /dev/null
+++ b/libcdr/StaticLibrary_cdr.mk
@@ -0,0 +1,44 @@
+# -*- 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,cdrlib))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,cdrlib,cdr))
+
+$(eval $(call gb_StaticLibrary_use_package,cdrlib,libcdr_inc))
+
+$(eval $(call gb_StaticLibrary_use_externals,cdrlib,\
+	lcms2 \
+	wpd \
+	wpg \
+	zlib \
+))
+
+$(eval $(call gb_StaticLibrary_set_cxx_suffix,cdrlib,cpp))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,cdrlib,\
+    UnpackedTarball/cdr/src/lib/CDRCollector \
+    UnpackedTarball/cdr/src/lib/CDRContentCollector \
+    UnpackedTarball/cdr/src/lib/CDRDocument \
+    UnpackedTarball/cdr/src/lib/CDRInternalStream \
+    UnpackedTarball/cdr/src/lib/CDROutputElementList \
+    UnpackedTarball/cdr/src/lib/CDRParser \
+    UnpackedTarball/cdr/src/lib/CDRPath \
+    UnpackedTarball/cdr/src/lib/CDRStringVector \
+    UnpackedTarball/cdr/src/lib/CDRStylesCollector \
+    UnpackedTarball/cdr/src/lib/CDRSVGGenerator \
+    UnpackedTarball/cdr/src/lib/CDRTypes \
+    UnpackedTarball/cdr/src/lib/CDRZipStream \
+    UnpackedTarball/cdr/src/lib/CMXDocument \
+    UnpackedTarball/cdr/src/lib/CMXParser \
+    UnpackedTarball/cdr/src/lib/CommonParser \
+    UnpackedTarball/cdr/src/lib/libcdr_utils \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
new file mode 100644
index 000000000000..29ef930d21e9
--- /dev/null
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -0,0 +1,18 @@
+# -*- 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,cdr))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
+	libcdr/libcdr-0.0.8-msc.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
deleted file mode 100644
index 771ac46b0778..000000000000
--- a/libcdr/makefile.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=cdr
-TARGET=cdr
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_LIBCDR)" == "YES"
-@all:
-    @echo "Using system libcdr..."
-.ENDIF
-
-# libcdr depends on the libwpd, libwpg and lcms2
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(WPD_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpd
-INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpd-stream
-.ENDIF
-.IF "$(SYSTEM_LIBWPG)" == "YES"
-INCPRE+=$(WPG_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
-.ENDIF
-.IF "$(SYSTEM_LCMS2)" == "YES"
-INCPRE+=$(LCMS2_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2
-.ENDIF
-
-TARFILE_NAME=libcdr-0.0.8
-TARFILE_MD5=ce5a1def34578b75959ac31210f031f6
-
-PATCH_FILES = libcdr-0.0.8-msc.patch
-
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-BUILD_DIR=src$/lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
diff --git a/libcdr/prj/d.lst b/libcdr/prj/d.lst
index e3ec3bdb5075..e69de29bb2d1 100644
--- a/libcdr/prj/d.lst
+++ b/libcdr/prj/d.lst
@@ -1,7 +0,0 @@
-mkdir: %_DEST%\inc\libcdr
-..\%__SRC%\misc\build\libcdr*\src\lib\libcdr.h %_DEST%\inc\libcdr
-..\%__SRC%\misc\build\libcdr*\src\lib\CDRDocument.h %_DEST%\inc\libcdr\
-..\%__SRC%\misc\build\libcdr*\src\lib\CDRStringVector.h %_DEST%\inc\libcdr\
-..\%__SRC%\misc\build\libcdr*\src\lib\CMXDocument.h %_DEST%\inc\libcdr\
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libcdr/prj/dmake b/libcdr/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/libcdr/prj/dmake
+++ /dev/null
diff --git a/ooo.lst.in b/ooo.lst.in
index c04221501cdf..08658778f28a 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -91,7 +91,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
 @VISIO_TARBALL@
 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
 0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
-ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
+@CDR_TARBALL@
 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
 @MSPUB_TARBALL@
 fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 79917683e39a..7ddeefd19df9 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 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPD:libwpd 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 LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPD:libwpd 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/writerperfect/prj/build.lst b/writerperfect/prj/build.lst
index e6420965e709..2ca4fe6ddb95 100644
--- a/writerperfect/prj/build.lst
+++ b/writerperfect/prj/build.lst
@@ -1,3 +1,3 @@
-wp  writerperfect : LIBWPG:libwpg libwps LIBWPD:libwpd libvisio LIBCDR:libcdr libmspub LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
+wp  writerperfect : LIBWPG:libwpg libwps LIBWPD:libwpd libvisio libcdr libmspub LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
 wp  writerperfect			usr1	-	all	wp_mkout NULL
 wp  writerperfect\prj		nmake	-	all	wp_prj NULL