libwps: convert to gbuild

Change-Id: I8f5312d9751d4bc4f26feb1d58b1c4b3184441c0

16 files changed, 117 insertions, 72 deletions

diff --git a/Makefile.top b/Makefile.top
index d94075d79c2e..c06521c000db 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -87,6 +87,7 @@ jvmaccess\
 jvmfwk\
 l10ntools\
 libvisio\
+libwps\
 lingucomponent\
 linguistic\
 lotuswordpro\
@@ -216,7 +217,6 @@ libpng\
 librsvg\
 libwpd\
 libwpg\
-libwps\
 libxml2\
 libxmlsec\
 libxslt\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index dd80586d2fe2..2f121ea4d203 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 \
 	libvisio \
+	libwps \
     lingucomponent \
     linguistic \
     lotuswordpro \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 27ee9207175c..bcedba4dfd9d 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -83,6 +83,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     jvmfwk \
     l10ntools \
 	libvisio \
+	libwps \
     lingucomponent \
     linguistic \
     lotuswordpro \
diff --git a/config_host.mk.in b/config_host.mk.in
index bd44460724e9..c20b6335ab73 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -622,6 +622,7 @@ export WPG_CFLAGS=@WPG_CFLAGS@
 export WPG_LIBS=@WPG_LIBS@
 export WPS_CFLAGS=@WPS_CFLAGS@
 export WPS_LIBS=@WPS_LIBS@
+export WPS_TARBALL=@WPS_TARBALL@
 export XCLASSPATH=@XCLASSPATH@
 export XINERAMA_LINK=@XINERAMA_LINK@
 export XRANDR_CFLAGS=@XRANDR_CFLAGS@
diff --git a/configure.in b/configure.in
index a35194c76d13..0a9ca222e6ce 100644
--- a/configure.in
+++ b/configure.in
@@ -6770,11 +6770,12 @@ elif test $_os = iOS; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBWPS=NO
-    BUILD_TYPE="$BUILD_TYPE LIBWPS"
+    WPS_TARBALL=d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
 fi
 AC_SUBST(SYSTEM_LIBWPS)
 AC_SUBST(WPS_CFLAGS)
 AC_SUBST(WPS_LIBS)
+AC_SUBST(WPS_TARBALL)
 
 dnl ===================================================================
 dnl Check for system libwpg
diff --git a/libwps/Makefile b/libwps/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/libwps/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/libwps/Module_libwps.mk b/libwps/Module_libwps.mk
new file mode 100644
index 000000000000..aacdb0e274b5
--- /dev/null
+++ b/libwps/Module_libwps.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,libwps))
+
+ifeq ($(SYSTEM_LIBWPS),NO)
+
+$(eval $(call gb_Module_add_targets,libwps,\
+	Package_libwps \
+	StaticLibrary_wps \
+	UnpackedTarball_wps \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwps/Package_libwps.mk b/libwps/Package_libwps.mk
new file mode 100644
index 000000000000..6ebee913b92d
--- /dev/null
+++ b/libwps/Package_libwps.mk
@@ -0,0 +1,19 @@
+# -*- 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,libwps_inc,$(call gb_UnpackedTarball_get_dir,wps/src/lib)))
+
+$(eval $(call gb_Package_use_unpacked,libwps_inc,wps))
+
+$(eval $(call gb_Package_add_files,libwps_inc,inc/external/libwps,\
+	libwps.h \
+	WPSDocument.h \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwps/StaticLibrary_wps.mk b/libwps/StaticLibrary_wps.mk
new file mode 100644
index 000000000000..150d8cd98f05
--- /dev/null
+++ b/libwps/StaticLibrary_wps.mk
@@ -0,0 +1,46 @@
+# -*- 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,wpslib))
+
+$(eval $(call gb_StaticLibrary_set_warnings_not_errors,wpslib))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,wpslib,wps))
+
+$(eval $(call gb_StaticLibrary_use_package,wpslib,libwps_inc))
+
+$(eval $(call gb_StaticLibrary_use_externals,wpslib,\
+	wpd \
+))
+
+$(eval $(call gb_StaticLibrary_set_cxx_suffix,wpslib,cpp))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpslib,\
+	UnpackedTarball/wps/src/lib/libwps_internal \
+	UnpackedTarball/wps/src/lib/libwps_tools_win \
+	UnpackedTarball/wps/src/lib/WPS4 \
+	UnpackedTarball/wps/src/lib/WPS4Graph \
+	UnpackedTarball/wps/src/lib/WPS4Text \
+	UnpackedTarball/wps/src/lib/WPS8 \
+	UnpackedTarball/wps/src/lib/WPSCell \
+	UnpackedTarball/wps/src/lib/WPSContentListener \
+	UnpackedTarball/wps/src/lib/WPSDebug \
+	UnpackedTarball/wps/src/lib/WPSDocument \
+	UnpackedTarball/wps/src/lib/WPSHeader \
+	UnpackedTarball/wps/src/lib/WPSList \
+	UnpackedTarball/wps/src/lib/WPSOLEParser \
+	UnpackedTarball/wps/src/lib/WPSOLEStream \
+	UnpackedTarball/wps/src/lib/WPSPageSpan \
+	UnpackedTarball/wps/src/lib/WPSParagraph \
+	UnpackedTarball/wps/src/lib/WPSParser \
+	UnpackedTarball/wps/src/lib/WPSSubDocument \
+	UnpackedTarball/wps/src/lib/WPSTable \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwps/UnpackedTarball_wps.mk b/libwps/UnpackedTarball_wps.mk
new file mode 100644
index 000000000000..c5698f7fc94a
--- /dev/null
+++ b/libwps/UnpackedTarball_wps.mk
@@ -0,0 +1,14 @@
+# -*- 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,wps))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,wps,$(WPS_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwps/makefile.mk b/libwps/makefile.mk
deleted file mode 100644
index cea290effc2f..000000000000
--- a/libwps/makefile.mk
+++ /dev/null
@@ -1,62 +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=wps
-TARGET=wps
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_LIBWPS)" == "YES"
-@all:
-    @echo "Using system libwps..."
-.ENDIF
-
-# libwps depends on the libwpd framework
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(WPD_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
-.ENDIF
-
-TARFILE_NAME=libwps-0.2.7
-TARFILE_MD5=d197bd6211669a2fa4ca648faf04bcb1
-
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-BUILD_DIR=src/lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE :	target.mk
-.INCLUDE :	tg_ext.mk
diff --git a/libwps/prj/d.lst b/libwps/prj/d.lst
index 3923a1834f85..e69de29bb2d1 100644
--- a/libwps/prj/d.lst
+++ b/libwps/prj/d.lst
@@ -1,5 +0,0 @@
-mkdir: %_DEST%\inc\libwps
-..\%__SRC%\misc\build\libwps*\src\lib\libwps.h %_DEST%\inc\libwps\
-..\%__SRC%\misc\build\libwps*\src\lib\WPSDocument.h %_DEST%\inc\libwps\
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libwps/prj/dmake b/libwps/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/libwps/prj/dmake
+++ /dev/null
diff --git a/ooo.lst.in b/ooo.lst.in
index bd14256e9e65..692f8b4f0e17 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -83,7 +83,7 @@ b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
 a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
 9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
 c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
-d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
+@WPS_TARBALL@
 @MDDS_TARBALL@
 @BOOST_TARBALL@
 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 333bc5e733bb..2d0cfeb0770f 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 LIBWPS:libwps 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 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\prj nmake - all tb_prj   NULL
diff --git a/writerperfect/prj/build.lst b/writerperfect/prj/build.lst
index e7f72211647d..668dbc70f4f8 100644
--- a/writerperfect/prj/build.lst
+++ b/writerperfect/prj/build.lst
@@ -1,3 +1,3 @@
-wp  writerperfect : LIBWPG:libwpg LIBWPS: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: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