libwpg: convert to gbuild

Change-Id: If440c551aedf805eb364c0fe575e8c5f4f66c18f

9 files changed, 98 insertions, 82 deletions

diff --git a/libwpg/Makefile b/libwpg/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/libwpg/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/libwpg/Module_libwpg.mk b/libwpg/Module_libwpg.mk
new file mode 100644
index 000000000000..9e271dc08511
--- /dev/null
+++ b/libwpg/Module_libwpg.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,libwpg))
+
+ifeq ($(SYSTEM_LIBWPG),NO)
+
+$(eval $(call gb_Module_add_targets,libwpg,\
+	Package_libwpg \
+	StaticLibrary_wpg \
+	UnpackedTarball_wpg \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwpg/Package_libwpg.mk b/libwpg/Package_libwpg.mk
new file mode 100644
index 000000000000..6a1f6a4a3b99
--- /dev/null
+++ b/libwpg/Package_libwpg.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,libwpg_inc,$(call gb_UnpackedTarball_get_dir,wpg/src/lib)))
+
+$(eval $(call gb_Package_use_unpacked,libwpg_inc,wpg))
+
+$(eval $(call gb_Package_add_files,libwpg_inc,inc/external/libwpg,\
+	libwpg.h \
+	WPGPaintInterface.h \
+	WPGraphics.h \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwpg/StaticLibrary_wpg.mk b/libwpg/StaticLibrary_wpg.mk
new file mode 100644
index 000000000000..6ce7499877b8
--- /dev/null
+++ b/libwpg/StaticLibrary_wpg.mk
@@ -0,0 +1,35 @@
+# -*- 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,wpglib))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,wpglib,wpg))
+
+$(eval $(call gb_StaticLibrary_use_package,wpglib,libwpg_inc))
+
+$(eval $(call gb_StaticLibrary_use_externals,wpglib,\
+	wpd \
+))
+
+$(eval $(call gb_StaticLibrary_set_cxx_suffix,wpglib,cpp))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpglib,\
+	UnpackedTarball/wpg/src/lib/WPG1Parser \
+	UnpackedTarball/wpg/src/lib/WPG2Parser \
+	UnpackedTarball/wpg/src/lib/WPGBitmap \
+	UnpackedTarball/wpg/src/lib/WPGColor \
+	UnpackedTarball/wpg/src/lib/WPGDashArray \
+	UnpackedTarball/wpg/src/lib/WPGHeader \
+	UnpackedTarball/wpg/src/lib/WPGInternalStream \
+	UnpackedTarball/wpg/src/lib/WPGraphics \
+	UnpackedTarball/wpg/src/lib/WPGSVGGenerator \
+	UnpackedTarball/wpg/src/lib/WPGXParser \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwpg/UnpackedTarball_wpg.mk b/libwpg/UnpackedTarball_wpg.mk
new file mode 100644
index 000000000000..00c127c77449
--- /dev/null
+++ b/libwpg/UnpackedTarball_wpg.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,wpg))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,wpg,$(WPG_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwpg/libwpg-0.2.1-build.patch b/libwpg/libwpg-0.2.1-build.patch
deleted file mode 100644
index 1b9240e19dc8..000000000000
--- a/libwpg/libwpg-0.2.1-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/libwpg-0.2.1/src/lib/makefile.mk	2011-09-12 09:04:43.000000000 +0200
-+++ misc/build/libwpg-0.2.1/src/lib/makefile.mk	2011-10-05 14:47:18.028693834 +0200
-@@ -17,7 +17,7 @@
- .ENDIF
- 
- .IF "$(SYSTEM_LIBWPD)" == "YES"
--INCPRE+=$(LIBWPD_CFLAGS) -I..
-+INCPRE+=$(WPD_CFLAGS) -I..
- .ELSE
- INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
- .ENDIF
diff --git a/libwpg/makefile.mk b/libwpg/makefile.mk
deleted file mode 100644
index 7888b55133bc..000000000000
--- a/libwpg/makefile.mk
+++ /dev/null
@@ -1,65 +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=wpg
-TARGET=wpg
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_LIBWPG)" == "YES"
-@all:
-    @echo "Using system libwpg..."
-.ENDIF
-
-# libwpg 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=libwpg-0.2.1
-TARFILE_MD5=9d283e02441d8cebdcd1e5d9df227d67
-
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-BUILD_DIR=src/lib
-
-PATCH_FILES=\
-	libwpg-0.2.1-build.patch
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE :	target.mk
-.INCLUDE :	tg_ext.mk
diff --git a/libwpg/prj/d.lst b/libwpg/prj/d.lst
index a6a84a396e28..e69de29bb2d1 100644
--- a/libwpg/prj/d.lst
+++ b/libwpg/prj/d.lst
@@ -1,6 +0,0 @@
-mkdir: %_DEST%\inc\libwpg
-..\%__SRC%\misc\build\libwpg*\src\lib\libwpg.h %_DEST%\inc\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGPaintInterface.h %_DEST%\inc\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGraphics.h %_DEST%\inc\libwpg\
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libwpg/prj/dmake b/libwpg/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/libwpg/prj/dmake
+++ /dev/null