From 97ed2616bdc104a86655f4f629870193a6b222ce Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Mon, 3 Sep 2012 13:57:46 +0200 Subject: libvisio: convert to gbuild Change-Id: Ie52c2ed87bf7631877bdf9a4cffc2f0a8fb3736c --- libvisio/Makefile | 7 ++++ libvisio/Module_libvisio.mk | 22 +++++++++++++ libvisio/Package_libvisio.mk | 20 ++++++++++++ libvisio/StaticLibrary_visio.mk | 45 ++++++++++++++++++++++++++ libvisio/UnpackedTarball_visio.mk | 14 ++++++++ libvisio/makefile.mk | 67 --------------------------------------- libvisio/prj/d.lst | 6 ---- libvisio/prj/dmake | 0 8 files changed, 108 insertions(+), 73 deletions(-) create mode 100644 libvisio/Makefile create mode 100644 libvisio/Module_libvisio.mk create mode 100644 libvisio/Package_libvisio.mk create mode 100644 libvisio/StaticLibrary_visio.mk create mode 100644 libvisio/UnpackedTarball_visio.mk delete mode 100644 libvisio/makefile.mk delete mode 100644 libvisio/prj/dmake (limited to 'libvisio') diff --git a/libvisio/Makefile b/libvisio/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/libvisio/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/libvisio/Module_libvisio.mk b/libvisio/Module_libvisio.mk new file mode 100644 index 000000000000..6c4190d7251f --- /dev/null +++ b/libvisio/Module_libvisio.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,libvisio)) + +ifeq ($(SYSTEM_LIBVISIO),NO) + +$(eval $(call gb_Module_add_targets,libvisio,\ + Package_libvisio \ + StaticLibrary_visio \ + UnpackedTarball_visio \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/libvisio/Package_libvisio.mk b/libvisio/Package_libvisio.mk new file mode 100644 index 000000000000..54bb8f416c0c --- /dev/null +++ b/libvisio/Package_libvisio.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,libvisio_inc,$(call gb_UnpackedTarball_get_dir,visio/src/lib))) + +$(eval $(call gb_Package_use_unpacked,libvisio_inc,visio)) + +$(eval $(call gb_Package_add_files,libvisio_inc,inc/external/libvisio,\ + libvisio.h \ + VisioDocument.h \ + VSDStringVector.h \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/libvisio/StaticLibrary_visio.mk b/libvisio/StaticLibrary_visio.mk new file mode 100644 index 000000000000..c917b6f5fa36 --- /dev/null +++ b/libvisio/StaticLibrary_visio.mk @@ -0,0 +1,45 @@ +# -*- 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,visiolib)) + +$(eval $(call gb_StaticLibrary_use_unpacked,visiolib,visio)) + +$(eval $(call gb_StaticLibrary_use_package,visiolib,libvisio_inc)) + +$(eval $(call gb_StaticLibrary_use_externals,visiolib,\ + wpd \ + wpg \ +)) + +$(eval $(call gb_StaticLibrary_set_cxx_suffix,visiolib,cpp)) + +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,visiolib,\ + UnpackedTarball/visio/src/lib/libvisio_utils \ + UnpackedTarball/visio/src/lib/VisioDocument \ + UnpackedTarball/visio/src/lib/VSD11Parser \ + UnpackedTarball/visio/src/lib/VSD6Parser \ + UnpackedTarball/visio/src/lib/VSDInternalStream \ + UnpackedTarball/visio/src/lib/VSDStringVector \ + UnpackedTarball/visio/src/lib/VSDSVGGenerator \ + UnpackedTarball/visio/src/lib/VSDXCharacterList \ + UnpackedTarball/visio/src/lib/VSDXContentCollector \ + UnpackedTarball/visio/src/lib/VSDXFieldList \ + UnpackedTarball/visio/src/lib/VSDXGeometryList \ + UnpackedTarball/visio/src/lib/VSDXOutputElementList \ + UnpackedTarball/visio/src/lib/VSDXPages \ + UnpackedTarball/visio/src/lib/VSDXParagraphList \ + UnpackedTarball/visio/src/lib/VSDXParser \ + UnpackedTarball/visio/src/lib/VSDXShapeList \ + UnpackedTarball/visio/src/lib/VSDXStencils \ + UnpackedTarball/visio/src/lib/VSDXStyles \ + UnpackedTarball/visio/src/lib/VSDXStylesCollector \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk new file mode 100644 index 000000000000..aa9113bafd6d --- /dev/null +++ b/libvisio/UnpackedTarball_visio.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,visio)) + +$(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk deleted file mode 100644 index ab696923748b..000000000000 --- a/libvisio/makefile.mk +++ /dev/null @@ -1,67 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=. - -PRJNAME=visio -TARGET=visio - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(SYSTEM_LIBVISIO)" == "YES" -@all: - @echo "Using system libvisio..." -.ENDIF - -# libvisio depends on the libwpd and libwpg -.IF "$(SYSTEM_LIBWPD)" == "YES" -INCPRE+=$(WPD_CFLAGS) -.ELSE -INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd -INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream -.ENDIF -.IF "$(SYSTEM_LIBWPG)" == "YES" -INCPRE+=$(WPG_CFLAGS) -.ELSE -INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg -.ENDIF - -TARFILE_NAME=libvisio-0.0.19 -TARFILE_MD5=94e7f271e38c976462558b4278590178 - -BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) -BUILD_DIR=src$/lib - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.INCLUDE : tg_ext.mk diff --git a/libvisio/prj/d.lst b/libvisio/prj/d.lst index 5680abe12d5b..e69de29bb2d1 100644 --- a/libvisio/prj/d.lst +++ b/libvisio/prj/d.lst @@ -1,6 +0,0 @@ -mkdir: %_DEST%\inc\libvisio -..\%__SRC%\misc\build\libvisio*\src\lib\libvisio.h %_DEST%\inc\libvisio -..\%__SRC%\misc\build\libvisio*\src\lib\VisioDocument.h %_DEST%\inc\libvisio\ -..\%__SRC%\misc\build\libvisio*\src\lib\VSDStringVector.h %_DEST%\inc\libvisio\ -..\%__SRC%\lib\*.a %_DEST%\lib\*.a -..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib diff --git a/libvisio/prj/dmake b/libvisio/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 -- cgit