libmspub: convert to gbuild

Change-Id: I502c849e40d84e6038b0b83fe344699944ec4a8f

16 files changed, 118 insertions, 86 deletions

diff --git a/Makefile.top b/Makefile.top
index c06521c000db..feb226070351 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -86,6 +86,7 @@ jurt\
 jvmaccess\
 jvmfwk\
 l10ntools\
+libmspub\
 libvisio\
 libwps\
 lingucomponent\
@@ -211,7 +212,6 @@ libcroco\
 libexttextcat\
 libgsf\
 liblangtag\
-libmspub\
 liborcus\
 libpng\
 librsvg\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 2f121ea4d203..ad0cc622ae1c 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 \
+	libmspub \
 	libvisio \
 	libwps \
     lingucomponent \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index bcedba4dfd9d..18a29d0b8a8f 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     jvmaccess \
     jvmfwk \
     l10ntools \
+	libmspub \
 	libvisio \
 	libwps \
     lingucomponent \
diff --git a/config_host.mk.in b/config_host.mk.in
index c20b6335ab73..5ba74137daa1 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -390,6 +390,7 @@ export MOZ_LIB=@MOZ_LIB@
 export MOZ_LIB_XPCOM=@MOZ_LIB_XPCOM@
 export MSPUB_CFLAGS=@MSPUB_CFLAGS@
 export MSPUB_LIBS=@MSPUB_LIBS@
+export MSPUB_TARBALL=@MSPUB_TARBALL@
 export MYSQL_DEFINES=@MYSQL_DEFINES@
 export MYSQL_INC=@MYSQL_INC@
 export MYSQL_LIB=@MYSQL_LIB@
diff --git a/configure.in b/configure.in
index 0a9ca222e6ce..a7ebdf7d4207 100644
--- a/configure.in
+++ b/configure.in
@@ -6640,11 +6640,12 @@ elif test $_os = iOS; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBMSPUB=NO
-    BUILD_TYPE="$BUILD_TYPE LIBMSPUB"
+    MSPUB_TARBALL=b2db54b6e96287ac995d7ed654ace4fc-libmspub-0.0.3.tar.bz2
 fi
 AC_SUBST(SYSTEM_LIBMSPUB)
 AC_SUBST(MSPUB_CFLAGS)
 AC_SUBST(MSPUB_LIBS)
+AC_SUBST(MSPUB_TARBALL)
 
 dnl ===================================================================
 dnl Check for system libvisio
diff --git a/libmspub/Makefile b/libmspub/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/libmspub/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/libmspub/Module_libmspub.mk b/libmspub/Module_libmspub.mk
new file mode 100644
index 000000000000..d81abdd60f29
--- /dev/null
+++ b/libmspub/Module_libmspub.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,libmspub))
+
+ifeq ($(SYSTEM_LIBMSPUB),NO)
+
+$(eval $(call gb_Module_add_targets,libmspub,\
+	Package_libmspub \
+	StaticLibrary_mspub \
+	UnpackedTarball_mspub \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libmspub/Package_libmspub.mk b/libmspub/Package_libmspub.mk
new file mode 100644
index 000000000000..af25dc129c74
--- /dev/null
+++ b/libmspub/Package_libmspub.mk
@@ -0,0 +1,20 @@
+# -*- 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,libmspub_inc,$(call gb_UnpackedTarball_get_dir,mspub/src/lib)))
+
+$(eval $(call gb_Package_use_unpacked,libmspub_inc,mspub))
+
+$(eval $(call gb_Package_add_files,libmspub_inc,inc/external/libmspub,\
+	libmspub.h \
+	MSPUBDocument.h \
+	MSPUBStringVector.h \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libmspub/StaticLibrary_mspub.mk b/libmspub/StaticLibrary_mspub.mk
new file mode 100644
index 000000000000..2d6ab4519f65
--- /dev/null
+++ b/libmspub/StaticLibrary_mspub.mk
@@ -0,0 +1,42 @@
+# -*- 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,mspublib))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,mspublib,mspub))
+
+$(eval $(call gb_StaticLibrary_use_package,mspublib,libmspub_inc))
+
+$(eval $(call gb_StaticLibrary_use_externals,mspublib,\
+	wpd \
+	wpg \
+	zlib \
+))
+
+$(eval $(call gb_StaticLibrary_set_cxx_suffix,mspublib,cpp))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,mspublib,\
+	UnpackedTarball/mspub/src/lib/ColorReference \
+	UnpackedTarball/mspub/src/lib/Dash \
+	UnpackedTarball/mspub/src/lib/Fill \
+	UnpackedTarball/mspub/src/lib/MSPUBCollector \
+	UnpackedTarball/mspub/src/lib/MSPUBDocument \
+	UnpackedTarball/mspub/src/lib/MSPUBParser2k \
+	UnpackedTarball/mspub/src/lib/MSPUBParser97 \
+	UnpackedTarball/mspub/src/lib/MSPUBParser \
+	UnpackedTarball/mspub/src/lib/MSPUBStringVector \
+	UnpackedTarball/mspub/src/lib/MSPUBSVGGenerator \
+	UnpackedTarball/mspub/src/lib/PolygonUtils \
+	UnpackedTarball/mspub/src/lib/Shadow \
+	UnpackedTarball/mspub/src/lib/ShapeGroupElement \
+	UnpackedTarball/mspub/src/lib/VectorTransformation2D \
+	UnpackedTarball/mspub/src/lib/libmspub_utils \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libmspub/UnpackedTarball_mspub.mk b/libmspub/UnpackedTarball_mspub.mk
new file mode 100644
index 000000000000..cb1503f513e9
--- /dev/null
+++ b/libmspub/UnpackedTarball_mspub.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,mspub))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,mspub,$(MSPUB_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_set_patches,mspub,\
+	libmspub/libmspub-0.0.3.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libmspub/makefile.mk b/libmspub/makefile.mk
deleted file mode 100644
index 635d8ed6c838..000000000000
--- a/libmspub/makefile.mk
+++ /dev/null
@@ -1,75 +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=mspub
-TARGET=mspub
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_LIBMSPUB)" == "YES"
-@all:
-    @echo "Using system libmspub..."
-.ENDIF
-
-# libcdr depends on the libwpd, libwpg and zlib
-.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_ZLIB)" == "YES"
-INCPRE+=$(ZLIB_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/zlib
-.ENDIF
-
-TARFILE_NAME=libmspub-0.0.3
-TARFILE_MD5=b2db54b6e96287ac995d7ed654ace4fc
-
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-BUILD_DIR=src$/lib
-
-PATCH_FILES=\
-	$(TARFILE_NAME).patch
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
diff --git a/libmspub/prj/d.lst b/libmspub/prj/d.lst
index 3a8654ef36ef..e69de29bb2d1 100644
--- a/libmspub/prj/d.lst
+++ b/libmspub/prj/d.lst
@@ -1,6 +0,0 @@
-mkdir: %_DEST%\inc\libmspub
-..\%__SRC%\misc\build\libmspub*\src\lib\libmspub.h %_DEST%\inc\libmspub
-..\%__SRC%\misc\build\libmspub*\src\lib\MSPUBDocument.h %_DEST%\inc\libmspub\
-..\%__SRC%\misc\build\libmspub*\src\lib\MSPUBStringVector.h %_DEST%\inc\libmspub\
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libmspub/prj/dmake b/libmspub/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/libmspub/prj/dmake
+++ /dev/null
diff --git a/ooo.lst.in b/ooo.lst.in
index 692f8b4f0e17..c04221501cdf 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -93,7 +93,7 @@ e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
 0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
 ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
-b2db54b6e96287ac995d7ed654ace4fc-libmspub-0.0.3.tar.bz2
+@MSPUB_TARBALL@
 fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
 @GOOGLE_DOCS_EXTENSION_PACK@
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 2d0cfeb0770f..79917683e39a 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 LIBMSPUB:libmspub 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 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\prj nmake - all tb_prj   NULL
diff --git a/writerperfect/prj/build.lst b/writerperfect/prj/build.lst
index 668dbc70f4f8..e6420965e709 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:libmspub LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
+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			usr1	-	all	wp_mkout NULL
 wp  writerperfect\prj		nmake	-	all	wp_prj NULL