Kaydet (Commit) 30ad101b authored tarafından Michael Stahl's avatar Michael Stahl

tomcat: use servlet-api.jar from WORKDIR too

Change-Id: I985ee75aa6e313a5933c2b3f5c7c5b10a8b8b9f5
üst 461d830e
......@@ -2786,6 +2786,18 @@ endef
endif # SYSTEM_RHINO
ifeq ($(SYSTEM_TOMCAT),YES)
gb_ExternalProject__use_servlet_api :=
else # !SYSTEM_TOMCAT
define gb_ExternalProject__use_servlet_api
$(eval $(call gb_ExternalProject_use_external_project,$(1),tomcat))
endef
endif # SYSTEM_TOMCAT
ifeq ($(SYSTEM_APACHE_COMMONS),YES)
define gb_Jar__use_commons-codec
......
......@@ -9,12 +9,9 @@
$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging))
# TODO: this should go into RepositoryExternal.mk
ifneq ($(SYSTEM_TOMCAT),YES)
$(eval $(call gb_ExternalProject_use_packages,apache_commons_logging,\
tomcat_inc \
$(eval $(call gb_ExternalProject_use_externals,apache_commons_logging,\
servlet_api \
))
endif
$(eval $(call gb_ExternalProject_register_targets,apache_commons_logging,\
build \
......@@ -29,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_logging,build) :
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
$(if $(filter YES,$(SYSTEM_TOMCAT))\
,-Dservletapi.jar=$(SERVLETAPI_JAR) \
,-Dservletapi.jar=$(SOLARVER)/$(INPATH)/bin/servlet-api.jar \
,-Dservletapi.jar=$(call gb_UnpackedTarball_get_dir,tomcat)/servletapi/jsr154/dist/lib/servlet-api.jar \
)\
$(if $(filter yes,$(JAVACISGCJ))\
,-Dbuild.compiler=gcj \
......
......@@ -13,7 +13,6 @@ ifneq ($(ENABLE_JAVA),)
ifneq ($(filter TOMCAT,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_targets,tomcat,\
ExternalProject_tomcat \
Package_tomcat \
UnpackedTarball_tomcat \
))
endif
......
# -*- 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,servletapi/jsr154/dist/lib/servlet-api.jar))
# vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment