diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2013-10-27 23:12:14 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-02 05:43:38 -0500 |
| commit | 2c92030ff07aff9b10e49844343390925b81545c (patch) | |
| tree | 384cf5b8ed3bc1da3ea19f330ccba511baac0d58 /tomcat | |
| parent | 78e4b97a18a18f84c228de64fc48cee48138fbfe (diff) | |
Kill servlet-api and tomcat
Change-Id: I630da3fa37144b2e5fb5117017f43841ba89c42a
Reviewed-on: https://gerrit.libreoffice.org/6454
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'tomcat')
| -rw-r--r-- | tomcat/ExternalProject_tomcat.mk | 30 | ||||
| -rw-r--r-- | tomcat/Makefile | 7 | ||||
| -rw-r--r-- | tomcat/Module_tomcat.mk | 21 | ||||
| -rw-r--r-- | tomcat/README | 1 | ||||
| -rw-r--r-- | tomcat/UnpackedTarball_tomcat.mk | 17 | ||||
| -rw-r--r-- | tomcat/build.xml | 21 |
6 files changed, 0 insertions, 97 deletions
diff --git a/tomcat/ExternalProject_tomcat.mk b/tomcat/ExternalProject_tomcat.mk deleted file mode 100644 index e4f3ff1053bc..000000000000 --- a/tomcat/ExternalProject_tomcat.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -*- 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,tomcat)) - -$(eval $(call gb_ExternalProject_register_targets,tomcat,\ - build \ -)) - -$(call gb_ExternalProject_get_state_target,tomcat,build) : - $(call gb_ExternalProject_run,build,\ - $(ICECREAM_RUN) "$(ANT)" \ - -q \ - -f build.xml \ - -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(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") \ - ,servletapi) - -# vim: set noet sw=4 ts=4: diff --git a/tomcat/Makefile b/tomcat/Makefile deleted file mode 100644 index ccb1c85a04da..000000000000 --- a/tomcat/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -*- 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 deleted file mode 100644 index 621b8071d818..000000000000 --- a/tomcat/Module_tomcat.mk +++ /dev/null @@ -1,21 +0,0 @@ -# -*- 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 ($(ENABLE_JAVA),) -ifneq ($(filter TOMCAT,$(BUILD_TYPE)),) -$(eval $(call gb_Module_add_targets,tomcat,\ - ExternalProject_tomcat \ - UnpackedTarball_tomcat \ -)) -endif -endif - -# vim: set noet sw=4 ts=4: diff --git a/tomcat/README b/tomcat/README deleted file mode 100644 index 650ddf272038..000000000000 --- a/tomcat/README +++ /dev/null @@ -1 +0,0 @@ -From [http://tomcat.apache.org/]. Patched. diff --git a/tomcat/UnpackedTarball_tomcat.mk b/tomcat/UnpackedTarball_tomcat.mk deleted file mode 100644 index 88b806304470..000000000000 --- a/tomcat/UnpackedTarball_tomcat.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -*- 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),,tomcat)) - - -$(eval $(call gb_UnpackedTarball_add_file,tomcat,servletapi/build.xml,tomcat/build.xml)) - -# vim: set noet sw=4 ts=4: diff --git a/tomcat/build.xml b/tomcat/build.xml deleted file mode 100644 index 10982e642be7..000000000000 --- a/tomcat/build.xml +++ /dev/null @@ -1,21 +0,0 @@ -<project name="jsr154 in LibreOffice" default="debuild" basedir="."> - - <target name="debuild" - description="Build jsr154 for LibreOffice (Default)"> - <echo message="Building Servlet 2.4 API"/> - <ant antfile="jsr154/build.xml" - target="jar" - inheritAll="false" - /> - </target> - - <target name="clean" description="Clean"> - <echo message="Cleaning Servlet 2.4 API"/> - <ant antfile="jsr154/build.xml" - target="clean" - inheritAll="false" - /> - <delete dir="tmp"/> - </target> - -</project> |