Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
30ad101b
Kaydet (Commit)
30ad101b
authored
Eki 25, 2013
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
tomcat: use servlet-api.jar from WORKDIR too
Change-Id: I985ee75aa6e313a5933c2b3f5c7c5b10a8b8b9f5
üst
461d830e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
23 deletions
+15
-23
RepositoryExternal.mk
RepositoryExternal.mk
+12
-0
ExternalProject_apache_commons_logging.mk
.../apache-commons/ExternalProject_apache_commons_logging.mk
+3
-6
Module_tomcat.mk
tomcat/Module_tomcat.mk
+0
-1
Package_tomcat.mk
tomcat/Package_tomcat.mk
+0
-16
No files found.
RepositoryExternal.mk
Dosyayı görüntüle @
30ad101b
...
...
@@ -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
...
...
external/apache-commons/ExternalProject_apache_commons_logging.mk
Dosyayı görüntüle @
30ad101b
...
...
@@ -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 \
...
...
tomcat/Module_tomcat.mk
Dosyayı görüntüle @
30ad101b
...
...
@@ -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
...
...
tomcat/Package_tomcat.mk
deleted
100644 → 0
Dosyayı görüntüle @
461d830e
# -*- 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:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment