gbuildify tomcat

Change-Id: Ibd7b71292450db8e3e98f9ede5a836182eb38770

14 files changed, 137 insertions, 39 deletions

diff --git a/Makefile.top b/Makefile.top
index 642ec0036c50..d32a0baa204b 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -157,6 +157,7 @@ swext\
 tail_build\
 test\
 testtools\
+tomcat\
 toolkit\
 tools\
 touch\
@@ -249,7 +250,6 @@ soltools\
 stax\
 stlport\
 sysui\
-tomcat\
 xpdf\
 zlib\
 
diff --git a/config_host.mk.in b/config_host.mk.in
index 7a511eaaeb3b..9814f16d775c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -592,6 +592,7 @@ export TELEPATHY_LIBS=@TELEPATHY_LIBS@
 export THES_SYSTEM_DIR=@THES_SYSTEM_DIR@
 @x_Cygwin@ export TMP=@TMP_DIRECTORY@
 export TMPDIR=@TEMP_DIRECTORY@
+export TOMCAT_TARBALL=@TOMCAT_TARBALL@
 export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@
 export SYSTEM_UCPP=@SYSTEM_UCPP@
 export UNIXWRAPPERNAME=@UNIXWRAPPERNAME@
diff --git a/configure.in b/configure.in
index 7ba3b7a9060a..ac9266cb8d3f 100644
--- a/configure.in
+++ b/configure.in
@@ -9702,6 +9702,7 @@ if test "$ENABLE_MEDIAWIKI" = "YES"; then
         AC_MSG_RESULT([internal])
         SYSTEM_SERVLETAPI=NO
         BUILD_TYPE="$BUILD_TYPE TOMCAT"
+        TOMCAT_TARBALL="2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz"
     fi
 fi
 AC_SUBST(SYSTEM_SERVLETAPI)
@@ -9972,6 +9973,7 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
         APACHE_COMMONS_HTTPCLIENT_TARBALL=2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
         APACHE_COMMONS_LANG_TARBALL=2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
         APACHE_COMMONS_LOGGING_TARBALL=3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+        TOMCAT_TARBALL="2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz"
         BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
     fi
 fi
@@ -9984,6 +9986,7 @@ AC_SUBST(COMMONS_CODEC_JAR)
 AC_SUBST(COMMONS_LANG_JAR)
 AC_SUBST(COMMONS_HTTPCLIENT_JAR)
 AC_SUBST(COMMONS_LOGGING_JAR)
+AC_SUBST(TOMCAT_TARBALL)
 
 # scripting provider for BeanShell extension?
 AC_MSG_CHECKING([whether to build extension for support of scripts in BeanShell])
diff --git a/ooo.lst.in b/ooo.lst.in
index 0c4e9a1f7673..6c5c763793c1 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -10,7 +10,7 @@ c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html
 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
-2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
+@TOMCAT_TARBALL@
 @APACHE_COMMONS_HTTPCLIENT_TARBALL@
 @APACHE_COMMONS_LANG_TARBALL@
 @FONT_LINLIBERTINEG_TARBALL@
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 @@
+<project name="jsr152 and jsr154 in Debian" default="debuild" basedir=".">
+
+  <target name="debuild"
+   description="Build jsr154 and jsr152 for Debian (Default)">
+    <echo message="Building Servlet 2.4 API"/>
+    <ant antfile="jsr154/build.xml"
+         target="dist"
+         inheritAll="false"
+    />
+    <echo message="Building JSP 2.0 API"/>
+    <ant antfile="jsr152/build.xml"
+         target="dist"
+         inheritAll="false"
+    />
+  </target>
+
+  <target name="clean" description="Clean">
+    <echo message="Cleaning JSP 2.0 API"/>
+    <ant antfile="jsr152/build.xml"
+         target="clean"
+         inheritAll="false"
+    />
+    <echo message="Cleaning Servlet 2.4 API"/>
+    <ant antfile="jsr154/build.xml"
+         target="clean"
+         inheritAll="false"
+    />
+    <delete dir="tmp"/>
+  </target>
+
+</project>
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
--- a/tomcat/prj/dmake
+++ /dev/null
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
-+<project name="jsr152 and jsr154 in Debian" default="debuild" basedir=".">
-+
-+  <target name="debuild"
-+   description="Build jsr154 and jsr152 for Debian (Default)">
-+    <echo message="Building Servlet 2.4 API"/>
-+    <ant antfile="jsr154/build.xml"
-+         target="dist"
-+         inheritAll="false"
-+    />
-+    <echo message="Building JSP 2.0 API"/>
-+    <ant antfile="jsr152/build.xml"
-+         target="dist"
-+         inheritAll="false"
-+    />
-+  </target>
-+
-+  <target name="clean" description="Clean">
-+    <echo message="Cleaning JSP 2.0 API"/>
-+    <ant antfile="jsr152/build.xml"
-+         target="clean"
-+         inheritAll="false"
-+    />
-+    <echo message="Cleaning Servlet 2.4 API"/>
-+    <ant antfile="jsr154/build.xml"
-+         target="clean"
-+         inheritAll="false"
-+    />
-+    <delete dir="tmp"/>
-+  </target>
-+
-+</project>