From 687944efaa56b4d58525dd16f2059e5e6c769da3 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 24 Aug 2012 10:21:42 +0200 Subject: gbuildize hsqldb Change-Id: I35bf8094c9dcf0f70e59c1304ab5a6800393fa29 --- hsqldb/ExternalProject_hsqldb.mk | 36 +++++++++++++++ hsqldb/Makefile | 7 +++ hsqldb/Module_hsqldb.mk | 20 +++++++++ hsqldb/Package_hsqldb.mk | 16 +++++++ hsqldb/UnpackedTarball_hsqldb.mk | 33 ++++++++++++++ hsqldb/makefile.mk | 94 ---------------------------------------- hsqldb/prj/d.lst | 1 - hsqldb/prj/dmake | 0 8 files changed, 112 insertions(+), 95 deletions(-) create mode 100644 hsqldb/ExternalProject_hsqldb.mk create mode 100644 hsqldb/Makefile create mode 100644 hsqldb/Module_hsqldb.mk create mode 100644 hsqldb/Package_hsqldb.mk create mode 100644 hsqldb/UnpackedTarball_hsqldb.mk delete mode 100644 hsqldb/makefile.mk delete mode 100644 hsqldb/prj/dmake (limited to 'hsqldb') diff --git a/hsqldb/ExternalProject_hsqldb.mk b/hsqldb/ExternalProject_hsqldb.mk new file mode 100644 index 000000000000..c41d5dda65a0 --- /dev/null +++ b/hsqldb/ExternalProject_hsqldb.mk @@ -0,0 +1,36 @@ +# -*- 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/. +# + +# for RSCREVISION +include $(SOLARENV)/inc/minor.mk + +$(eval $(call gb_ExternalProject_ExternalProject,hsqldb)) + +$(eval $(call gb_ExternalProject_use_unpacked,hsqldb,hsqldb)) + +$(eval $(call gb_ExternalProject_register_targets,hsqldb,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,hsqldb,build) : + cd $(EXTERNAL_WORKDIR) && \ + $(ANT) \ + -q \ + -f build/build.xml \ + -Dbuild.label="build-$(RSCREVISION)" \ + $(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") \ + jar && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/hsqldb/Makefile b/hsqldb/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/hsqldb/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/hsqldb/Module_hsqldb.mk b/hsqldb/Module_hsqldb.mk new file mode 100644 index 000000000000..ef31358d3fcb --- /dev/null +++ b/hsqldb/Module_hsqldb.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_Module_Module,hsqldb)) + +ifneq ($(SOLAR_JAVA),) +$(eval $(call gb_Module_add_targets,hsqldb,\ + ExternalProject_hsqldb \ + Package_hsqldb \ + UnpackedTarball_hsqldb \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/hsqldb/Package_hsqldb.mk b/hsqldb/Package_hsqldb.mk new file mode 100644 index 000000000000..2088d6f43f8c --- /dev/null +++ b/hsqldb/Package_hsqldb.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,hsqldb_project,$(call gb_UnpackedTarball_get_dir,hsqldb))) + +$(eval $(call gb_Package_use_external_project,hsqldb_project,hsqldb)) + +$(eval $(call gb_Package_add_file,hsqldb_project,bin/hsqldb.jar,lib/hsqldb.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/hsqldb/UnpackedTarball_hsqldb.mk b/hsqldb/UnpackedTarball_hsqldb.mk new file mode 100644 index 000000000000..9c9b87a7ff0b --- /dev/null +++ b/hsqldb/UnpackedTarball_hsqldb.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_UnpackedTarball_UnpackedTarball,hsqldb)) + +include $(SRCDIR)/hsqldb/version.mk + +$(eval $(call gb_UnpackedTarball_set_tarball,hsqldb,17410483b5b5f267aa18b7e00b65e6e0-hsqldb_$(HSQLDB_VERSION).zip)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,hsqldb,\ + build/build.xml \ + src/org/hsqldb/Library.java \ + src/org/hsqldb/persist/HsqlDatabaseProperties.java \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\ + hsqldb/patches/i96823.patch \ + hsqldb/patches/i97032.patch \ + hsqldb/patches/i103528.patch \ + hsqldb/patches/i104901.patch \ + hsqldb/patches/fdo36824.patch \ + $(if $(filter-out 1.5,$(JAVA_SOURCE_VER)),\ + hsqldb/patches/jdbc-4.1.patch \ + ) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk deleted file mode 100644 index fe1c9d95b234..000000000000 --- a/hsqldb/makefile.mk +++ /dev/null @@ -1,94 +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=hsqldb -TARGET=so_hsqldb - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# override buildfile -ANT_BUILDFILE=build$/build.xml - -.INCLUDE : antsettings.mk - -.INCLUDE : tg_javav.mk - -.INCLUDE : version.mk - -.IF "$(SOLAR_JAVA)" != "" -# --- Files -------------------------------------------------------- - -TARFILE_NAME=hsqldb_$(HSQLDB_VERSION) -TARFILE_MD5=17410483b5b5f267aa18b7e00b65e6e0 - -TARFILE_ROOTDIR=hsqldb - -CONVERTFILES=build$/build.xml \ - src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java \ - src$/org$/hsqldb$/Library.java - -PATCH_FILES=patches$/i96823.patch \ - patches$/i97032.patch \ - patches$/i103528.patch \ - patches$/i104901.patch \ - patches$/fdo36824.patch - -.IF "$(JAVANUMVER:s/.//)" >= "000100060000" -PATCH_FILES+= \ - patches$/jdbc-4.1.patch -.ENDIF - -.IF "$(JAVACISGCJ)"=="yes" || "$(JAVA_SOURCE_VER)"=="1.5" -JAVA_HOME= -.EXPORT : JAVA_HOME -.ENDIF - -.IF "$(JAVACISGCJ)"=="yes" -BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar -.ELSE -BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar -.ENDIF - -.IF "$(debug)"!="" -BUILD_ACTION+=-Dbuild.debug="on" -.ENDIF - -.ENDIF # $(SOLAR_JAVA)!= "" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk - -.IF "$(SOLAR_JAVA)" != "" -.INCLUDE : tg_ext.mk -.ENDIF - diff --git a/hsqldb/prj/d.lst b/hsqldb/prj/d.lst index d432e98eefe5..e69de29bb2d1 100644 --- a/hsqldb/prj/d.lst +++ b/hsqldb/prj/d.lst @@ -1 +0,0 @@ -..\%__SRC%\misc\build\hsqldb\lib\hsqldb.jar %_DEST%\bin\hsqldb.jar diff --git a/hsqldb/prj/dmake b/hsqldb/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 -- cgit v1.2.3