From 311babc08009ff4014f9b6b14d82ca41f5e6f942 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 29 Sep 2012 02:02:03 -0500 Subject: gbuildify tomcat Change-Id: Ibd7b71292450db8e3e98f9ede5a836182eb38770 --- tomcat/ExternalProject_tomcat.mk | 36 ++++++++++++++++++++++++++++++++++++ tomcat/Makefile | 7 +++++++ tomcat/Module_tomcat.mk | 22 ++++++++++++++++++++++ tomcat/Package_tomcat.mk | 16 ++++++++++++++++ tomcat/UnpackedTarball_tomcat.mk | 17 +++++++++++++++++ tomcat/build.xml | 31 +++++++++++++++++++++++++++++++ tomcat/prj/build.lst | 2 +- tomcat/prj/d.lst | 2 +- tomcat/prj/dmake | 0 tomcat/tomcat.patch | 35 ----------------------------------- 10 files changed, 131 insertions(+), 37 deletions(-) create mode 100644 tomcat/ExternalProject_tomcat.mk create mode 100644 tomcat/Makefile create mode 100644 tomcat/Module_tomcat.mk create mode 100644 tomcat/Package_tomcat.mk create mode 100644 tomcat/UnpackedTarball_tomcat.mk create mode 100644 tomcat/build.xml delete mode 100644 tomcat/prj/dmake delete mode 100644 tomcat/tomcat.patch (limited to 'tomcat') diff --git a/tomcat/ExternalProject_tomcat.mk b/tomcat/ExternalProject_tomcat.mk new file mode 100644 index 000000000000..48c063f7c8f8 --- /dev/null +++ b/tomcat/ExternalProject_tomcat.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,tomcat)) + +$(eval $(call gb_ExternalProject_use_unpacked,tomcat,tomcat)) + +$(eval $(call gb_ExternalProject_register_targets,tomcat,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,tomcat,build) : + cd "$(call gb_UnpackedTarball_get_dir,tomcat)/jakarta-servletapi-5" && \ + "$(ANT)" \ + -q \ + -f 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") \ + && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/tomcat/Makefile b/tomcat/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/tomcat/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/tomcat/Module_tomcat.mk b/tomcat/Module_tomcat.mk new file mode 100644 index 000000000000..ffe909089a3a --- /dev/null +++ b/tomcat/Module_tomcat.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,tomcat)) + +ifneq ($(SOLAR_JAVA),) +ifneq ($(filter TOMCAT,$(BUILD_TYPE)),) +$(eval $(call gb_Module_add_targets,tomcat,\ + ExternalProject_tomcat \ + Package_tomcat \ + UnpackedTarball_tomcat \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/tomcat/Package_tomcat.mk b/tomcat/Package_tomcat.mk new file mode 100644 index 000000000000..8cd451254f69 --- /dev/null +++ b/tomcat/Package_tomcat.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,tomcat_inc,$(call gb_UnpackedTarball_get_dir,tomcat))) + +$(eval $(call gb_Package_use_external_project,tomcat_inc,tomcat)) + +$(eval $(call gb_Package_add_file,tomcat_inc,bin/servlet-api.jar,jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/tomcat/UnpackedTarball_tomcat.mk b/tomcat/UnpackedTarball_tomcat.mk new file mode 100644 index 000000000000..6e6a71631491 --- /dev/null +++ b/tomcat/UnpackedTarball_tomcat.mk @@ -0,0 +1,17 @@ +# -*- 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,tomcat)) + +$(eval $(call gb_UnpackedTarball_set_tarball,tomcat,$(TOMCAT_TARBALL))) + + +$(eval $(call gb_UnpackedTarball_add_file,tomcat,jakarta-servletapi-5/build.xml,tomcat/build.xml)) + +# vim: set noet sw=4 ts=4: diff --git a/tomcat/build.xml b/tomcat/build.xml new file mode 100644 index 000000000000..2d54d3df39da --- /dev/null +++ b/tomcat/build.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + diff --git a/tomcat/prj/build.lst b/tomcat/prj/build.lst index 184f6dd19b3e..eca653ba9490 100644 --- a/tomcat/prj/build.lst +++ b/tomcat/prj/build.lst @@ -1,2 +1,2 @@ to tomcat : solenv NULL -to tomcat nmake - all to_mkout NULL +to tomcat/prj nmake - all to_prj NULL diff --git a/tomcat/prj/d.lst b/tomcat/prj/d.lst index 41530ac07cf4..8b137891791f 100644 --- a/tomcat/prj/d.lst +++ b/tomcat/prj/d.lst @@ -1 +1 @@ -..\%__SRC%\misc\build\jakarta-tomcat-5.0.30-src\jakarta-servletapi-5\jsr154\dist\lib\servlet-api.jar %_DEST%\bin\servlet-api.jar + diff --git a/tomcat/prj/dmake b/tomcat/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/tomcat/tomcat.patch b/tomcat/tomcat.patch deleted file mode 100644 index 1815660b1b5b..000000000000 --- a/tomcat/tomcat.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- misc/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/build.xml Thu Jun 19 16:03:59 2008 -+++ misc/build/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/build.xml Thu Jun 19 15:56:18 2008 -@@ -1,1 +1,31 @@ --dummy -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -- cgit