From a51b09f105dd69837654cf2afa93124d5ecd25ff Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 3 Oct 2012 00:21:51 +0200 Subject: gbuildification of languagetool It is not clear how to remove a file: REMOVE_FILES=openoffice/images/dialogh.png. Let it for now in place. Change-Id: Ie8739fd207ca7dc9343c92c93cf092b3af674bf0 Reviewed-on: https://gerrit.libreoffice.org/753 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- languagetool/ExternalProject_languagetool.mk | 33 ++++++++++++++ languagetool/Makefile | 7 +++ languagetool/Module_languagetool.mk | 22 ++++++++++ languagetool/Package_languagetool.mk | 16 +++++++ languagetool/UnpackedTarball_languagetool.mk | 19 +++++++++ languagetool/makefile.mk | 64 ---------------------------- languagetool/prj/build.lst | 3 +- languagetool/prj/d.lst | 1 - languagetool/prj/dmake | 0 9 files changed, 98 insertions(+), 67 deletions(-) create mode 100644 languagetool/ExternalProject_languagetool.mk create mode 100644 languagetool/Makefile create mode 100644 languagetool/Module_languagetool.mk create mode 100644 languagetool/Package_languagetool.mk create mode 100644 languagetool/UnpackedTarball_languagetool.mk delete mode 100644 languagetool/makefile.mk delete mode 100644 languagetool/prj/dmake (limited to 'languagetool') diff --git a/languagetool/ExternalProject_languagetool.mk b/languagetool/ExternalProject_languagetool.mk new file mode 100644 index 000000000000..60b70e63632b --- /dev/null +++ b/languagetool/ExternalProject_languagetool.mk @@ -0,0 +1,33 @@ +# -*- 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_ExternalProject_ExternalProject,languagetool)) + +$(eval $(call gb_ExternalProject_use_unpacked,languagetool,languagetool)) + +$(eval $(call gb_ExternalProject_register_targets,languagetool,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,languagetool,build) : + cd "$(call gb_UnpackedTarball_get_dir,languagetool)" && \ + "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-libreoffice" \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + $(if $(debug),-Dbuild.debug="on") \ + -Dsolver.ooo.dir="$(OUTDIR_FOR_BUILD)/bin" dist && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/languagetool/Makefile b/languagetool/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/languagetool/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/languagetool/Module_languagetool.mk b/languagetool/Module_languagetool.mk new file mode 100644 index 000000000000..f869d493baaf --- /dev/null +++ b/languagetool/Module_languagetool.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,languagetool)) + +ifneq ($(SOLAR_JAVA),) +ifneq ($(filter LANGUAGETOOL,$(BUILD_TYPE)),) +$(eval $(call gb_Module_add_targets,languagetool,\ + ExternalProject_languagetool \ + Package_languagetool \ + UnpackedTarball_languagetool \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/languagetool/Package_languagetool.mk b/languagetool/Package_languagetool.mk new file mode 100644 index 000000000000..1738c868b884 --- /dev/null +++ b/languagetool/Package_languagetool.mk @@ -0,0 +1,16 @@ +# -*- 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,languagetool,$(call gb_UnpackedTarball_get_dir,languagetool))) + +$(eval $(call gb_Package_use_external_project,languagetool,languagetool)) + +$(eval $(call gb_Package_add_file,languagetool,bin/LanguageTool.oxt,dist/LanguageTool.oxt)) + +# vim: set noet sw=4 ts=4: diff --git a/languagetool/UnpackedTarball_languagetool.mk b/languagetool/UnpackedTarball_languagetool.mk new file mode 100644 index 000000000000..6df1d1713561 --- /dev/null +++ b/languagetool/UnpackedTarball_languagetool.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_UnpackedTarball_UnpackedTarball,languagetool)) + +$(eval $(call gb_UnpackedTarball_set_tarball,languagetool,$(LANGUAGETOOL_TARBALL))) + +$(eval $(call gb_UnpackedTarball_add_patches,languagetool,\ + languagetool/JLanguageTool-1.7.0.patch \ + languagetool/JLanguageTool-1.4.0-no-hc.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/languagetool/makefile.mk b/languagetool/makefile.mk deleted file mode 100644 index 6f7daa5ed573..000000000000 --- a/languagetool/makefile.mk +++ /dev/null @@ -1,64 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# 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=languagetool -TARGET=languagetool - -.IF "$(SOLAR_JAVA)"!="" -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : antsettings.mk - -# --- Files -------------------------------------------------------- - -TARFILE_NAME=JLanguageTool-1.7.0 -TARFILE_MD5=b63e6340a02ff1cacfeadb2c42286161 -TARFILE_ROOTDIR=JLanguageTool-1.7.0 -PATCH_FILES=JLanguageTool-1.7.0.patch JLanguageTool-1.4.0-no-hc.patch -REMOVE_FILES=openoffice/images/dialogh.png - -.IF "$(JAVACISGCJ)"=="yes" -JAVA_HOME= -.EXPORT : JAVA_HOME -BUILD_ACTION="$(ANT)" -v -Dsolver.ooo.dir=$(SOLARVER)$/$(INPATH)$/bin -Dbuild.compiler=gcj dist -.ELSE -BUILD_ACTION="$(ANT)" -v -Dsolver.ooo.dir=$(SOLARVER)$/$(INPATH)$/bin -Dant.build.javac.target=$(JAVA_TARGET_VER) dist -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.INCLUDE : tg_ext.mk - -.ELSE -all: - @echo java disabled -.ENDIF diff --git a/languagetool/prj/build.lst b/languagetool/prj/build.lst index 98e25c36b3fc..cfc4052c3647 100644 --- a/languagetool/prj/build.lst +++ b/languagetool/prj/build.lst @@ -1,3 +1,2 @@ lt languagetool : javaunohelper jurt ridljar unoil NULL -lt languagetool usr1 - all lt_mkout NULL -lt languagatool nmake - all lt_languagetool NULL +lt languagatool\prj nmake - all lt_languagetool NULL diff --git a/languagetool/prj/d.lst b/languagetool/prj/d.lst index cdbabc31f919..e69de29bb2d1 100644 --- a/languagetool/prj/d.lst +++ b/languagetool/prj/d.lst @@ -1 +0,0 @@ -..\%__SRC%\misc\build\JLanguageTool*\dist\LanguageTool.oxt %_DEST%\bin\ diff --git a/languagetool/prj/dmake b/languagetool/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 -- cgit