[Libreoffice-commits] .: 5 commits - apache-commons/Module_apache_commons.mk apache-commons/Module_apache-commons.mk config_host.mk.in configure.in Makefile.top Module_tail_build.mk neon/Library_neon.mk ooo.lst.in solenv/gbuild tail_build/prj tomcat/build.xml tomcat/ExternalProject_tomcat.mk tomcat/Makefile tomcat/Module_tomcat.mk tomcat/Package_tomcat.mk tomcat/prj tomcat/tomcat.patch tomcat/UnpackedTarball_tomcat.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Sep 29 00:44:25 PDT 2012
Makefile.top | 2
Module_tail_build.mk | 260 +++++++++++++-------------------
apache-commons/Module_apache-commons.mk | 31 +++
apache-commons/Module_apache_commons.mk | 32 ---
config_host.mk.in | 1
configure.in | 3
neon/Library_neon.mk | 6
ooo.lst.in | 2
solenv/gbuild/Helper.mk | 4
tail_build/prj/build.lst | 2
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/tomcat.patch | 35 ----
19 files changed, 290 insertions(+), 221 deletions(-)
New commits:
commit 26c8848639537f9b4d7921c04f8747c992a643c2
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Sep 29 02:42:48 2012 -0500
hide external library neon's warnings
Change-Id: Ie394ee8fc7a7e4c34965242920225c5dc2297c0b
diff --git a/neon/Library_neon.mk b/neon/Library_neon.mk
index 239a434..92b13ac 100644
--- a/neon/Library_neon.mk
+++ b/neon/Library_neon.mk
@@ -19,6 +19,12 @@ $(eval $(call gb_Library_use_externals,neon,\
$(eval $(call gb_Library_set_visibility_default,neon))
+# neon has its share of warning... let's spare use
+# the pointless spamming
+$(eval $(call gb_Library_add_cflags,neon,\
+ -w \
+))
+
$(eval $(call gb_Library_set_warnings_not_errors,neon))
$(eval $(call gb_Library_add_generated_cobjects,neon,\
commit 8f2859a318198797fd11f3ea78ed336533eefa65
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Sep 29 02:42:25 2012 -0500
add tomcat to tail_build
Change-Id: Ida93051b4b631d24e738584a8a3ff2e24ea7bd7a
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index a9635e1..db82ee1 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -146,6 +146,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
swext \
test \
testtools \
+ $(call gb_Helper_optional,TOMCAT,tomcat) \
toolkit \
tools \
touch \
commit 4df639baacd871cb2793e75dd9721ad2ae715e20
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Sep 29 02:34:58 2012 -0500
add apache_commons to tail_build
Change-Id: I0365a5170011ad44b9a0ab8f1129a756884694d5
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index cf86f3c..a9635e1 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
accessibility \
$(call gb_Helper_optional,AFMS,afms) \
animations \
+ $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
apple_remote \
autodoc \
avmedia \
diff --git a/apache-commons/Module_apache-commons.mk b/apache-commons/Module_apache-commons.mk
new file mode 100644
index 0000000..a89f69e
--- /dev/null
+++ b/apache-commons/Module_apache-commons.mk
@@ -0,0 +1,31 @@
+# -*- 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,apache_commons))
+
+ifneq ($(SOLAR_JAVA),)
+ifneq ($(filter APACHE_COMMONS,$(BUILD_TYPE)),)
+$(eval $(call gb_Module_add_targets,apache_commons,\
+ ExternalProject_apache_commons_codec \
+ ExternalProject_apache_commons_httpclient \
+ ExternalProject_apache_commons_lang \
+ ExternalProject_apache_commons_logging \
+ Package_apache_commons_codec \
+ Package_apache_commons_httpclient \
+ Package_apache_commons_lang \
+ Package_apache_commons_logging \
+ UnpackedTarball_apache_commons_codec \
+ UnpackedTarball_apache_commons_httpclient \
+ UnpackedTarball_apache_commons_lang \
+ UnpackedTarball_apache_commons_logging \
+))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/Module_apache_commons.mk b/apache-commons/Module_apache_commons.mk
deleted file mode 100644
index 07cba6a..0000000
--- a/apache-commons/Module_apache_commons.mk
+++ /dev/null
@@ -1,32 +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,apache_commons))
-
-ifneq ($(SOLAR_JAVA),)
-$(info "f:$(filter APACHE_COMMONS,$(BUILD_TYPE))")
-ifneq ($(filter APACHE_COMMONS,$(BUILD_TYPE)),)
-$(eval $(call gb_Module_add_targets,apache_commons,\
- ExternalProject_apache_commons_codec \
- ExternalProject_apache_commons_httpclient \
- ExternalProject_apache_commons_lang \
- ExternalProject_apache_commons_logging \
- Package_apache_commons_codec \
- Package_apache_commons_httpclient \
- Package_apache_commons_lang \
- Package_apache_commons_logging \
- UnpackedTarball_apache_commons_codec \
- UnpackedTarball_apache_commons_httpclient \
- UnpackedTarball_apache_commons_lang \
- UnpackedTarball_apache_commons_logging \
-))
-endif
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 41b00d5..5e84fda 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL
+tb tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL
tb tail_build\prj nmake - all tb_prj NULL
commit 47894cdf75ffe29a3a070a884130565424af35f0
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Sep 29 02:21:20 2012 -0500
beautify Module_tailbuild a bit
Change-Id: If54d57c962c6cb97c539e46f2ea747668706770e
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 3155b7b..cf86f3c 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -25,74 +25,58 @@
$(eval $(call gb_Module_Module,tail_end))
$(eval $(call gb_Module_add_moduledirs,tail_end,\
- accessibility \
- $(if $(filter AFMS,$(BUILD_TYPE)),\
- afms \
- ) \
- animations \
- apple_remote \
+ accessibility \
+ $(call gb_Helper_optional,AFMS,afms) \
+ animations \
+ apple_remote \
autodoc \
- avmedia \
- basctl \
- basebmp \
+ avmedia \
+ basctl \
+ basebmp \
basegfx \
- basic \
- bean \
+ basic \
+ bean \
binaryurp \
- $(if $(filter BLUEZ,$(BUILD_TYPE)),\
- bluez_bluetooth \
- ) \
+ $(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \
bridges \
- canvas \
- chart2 \
+ canvas \
+ chart2 \
cli_ure \
- $(if $(filter CLUCENE,$(BUILD_TYPE)),\
- clucene \
- ) \
- $(if $(filter DESKTOP,$(BUILD_TYPE)),\
- codemaker \
- ) \
- comphelper \
- configmgr \
- connectivity \
+ $(call gb_Helper_optional,CLUCENE,clucene) \
+ $(call gb_Helper_optional,DESKTOP,codemaker) \
+ comphelper \
+ configmgr \
+ connectivity \
cosv \
- cppcanvas \
+ cppcanvas \
cppu \
cppuhelper \
cpputools \
- cui \
- dbaccess \
- desktop \
- $(if $(filter DICTIONARIES,$(BUILD_TYPE)),\
- dictionaries \
- ) \
- dtrans \
- drawinglayer \
- editeng \
- embeddedobj \
+ cui \
+ dbaccess \
+ desktop \
+ $(call gb_Helper_optional,DICTIONARIES,dictionaries) \
+ dtrans \
+ drawinglayer \
+ editeng \
+ embeddedobj \
embedserv \
- eventattacher \
- extensions \
+ eventattacher \
+ extensions \
extras \
- fileaccess \
- filter \
- forms \
- formula \
- fpicker \
- framework \
- $(if $(filter DESKTOP,$(BUILD_TYPE)), \
- helpcompiler \
- ) \
- $(if $(filter HSQLDB,$(BUILD_TYPE)),\
- hsqldb \
- ) \
- hwpfilter \
+ fileaccess \
+ filter \
+ forms \
+ formula \
+ fpicker \
+ framework \
+ $(call gb_Helper_optional,DESKTOP,helpcompiler) \
+ $(call gb_Helper_optional,HSQLDB,hsqldb) \
+ hwpfilter \
i18npool \
i18nutil \
- idl \
- $(if $(filter DESKTOP,$(BUILD_TYPE)),\
- idlc \
- ) \
+ idl \
+ $(call gb_Helper_optional,DESKTOP,idlc) \
io \
javaunohelper \
jurt \
@@ -106,118 +90,94 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
libwpd \
libwpg \
libwps \
- lingucomponent \
- linguistic \
- lotuswordpro \
- $(if $(filter DESKTOP,$(BUILD_TYPE)),\
- l10ntools \
- ) \
- MathMLDTD \
+ lingucomponent \
+ linguistic \
+ lotuswordpro \
+ $(call gb_Helper_optional,DESKTOP,l10ntools) \
+ MathMLDTD \
mdds \
- Mesa \
- $(if $(filter MORE_FONTS,$(BUILD_TYPE)),\
- more_fonts \
- ) \
- $(if $(filter NEON,$(BUILD_TYPE)),\
- neon \
- ) \
- $(if $(filter NLPSOLVER,$(BUILD_TYPE)),\
- nlpsolver \
- ) \
- np_sdk \
+ Mesa \
+ $(call gb_Helper_optional,MORE_FONTS,more_fonts) \
+ $(call gb_Helper_optional,NEON,neon) \
+ $(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
+ np_sdk \
o3tl \
offapi \
officecfg \
- oovbaapi \
- oox \
- package \
- padmin \
- psprint_config \
- $(if $(filter PYUNO,$(BUILD_TYPE)),\
- pyuno \
- ) \
- $(if $(filter QADEVOOO,$(BUILD_TYPE)),\
- qadevOOo \
- ) \
- $(if $(filter DESKTOP,$(BUILD_TYPE)),\
- rdbmaker \
- ) \
- readlicense_oo \
- regexp \
- registry \
- remotebridges \
- reportbuilder \
- reportdesign \
+ oovbaapi \
+ oox \
+ package \
+ padmin \
+ psprint_config \
+ $(call gb_Helper_optional,PYUNO,pyuno) \
+ $(call gb_Helper_optional,QADEVOOO,qadevOOo) \
+ $(call gb_Helper_optional,DESKTOP,rdbmaker) \
+ readlicense_oo \
+ regexp \
+ registry \
+ remotebridges \
+ reportbuilder \
+ reportdesign \
ridljar \
- rsc \
+ rsc \
salhelper \
- sane \
+ sane \
sax \
- sc \
- scaddins \
- sccomp \
- $(if $(filter DESKTOP,$(BUILD_TYPE)),\
- scp2 \
- ) \
- scripting \
- sd \
- sdext \
- sfx2 \
- shell \
- slideshow \
- smoketest \
- sot \
- starmath \
+ sc \
+ scaddins \
+ sccomp \
+ $(call gb_Helper_optional,DESKTOP,scp2) \
+ scripting \
+ sd \
+ sdext \
+ sfx2 \
+ shell \
+ slideshow \
+ smoketest \
+ sot \
+ starmath \
stoc \
store \
- svl \
- svtools \
- svx \
- sw \
- swext \
- test \
- testtools \
- toolkit \
+ svl \
+ svtools \
+ svx \
+ sw \
+ swext \
+ test \
+ testtools \
+ toolkit \
tools \
touch \
- $(if $(filter TRANSLATIONS,$(BUILD_TYPE)),\
- translations \
- ) \
- tubes \
- twain \
- ucb \
+ $(call gb_Helper_optional,TRANSLATIONS,translations) \
+ tubes \
+ twain \
+ ucb \
ucbhelper \
- $(if $(filter UCPP,$(BUILD_TYPE)),\
- ucpp \
- ) \
+ $(call gb_Helper_optional,UCPP,ucpp) \
udkapi \
udm \
- unixODBC \
- UnoControls \
- unodevtools \
+ unixODBC \
+ UnoControls \
+ unodevtools \
unoil \
unotest \
- unotools \
- unoxml \
+ unotools \
+ unoxml \
ure \
- uui \
- vbahelper \
- vcl \
+ uui \
+ vbahelper \
+ vcl \
vigra \
- wizards \
- writerfilter \
- writerperfect \
- $(if $(filter X11_EXTENSIONS,$(BUILD_TYPE)), \
- x11_extensions \
- ) \
- xmerge \
- $(if $(filter DESKTOP,$(BUILD_TYPE)), \
- xmlhelp \
- ) \
- xmloff \
+ wizards \
+ writerfilter \
+ writerperfect \
+ $(call gb_Helper_optional,EXTENSIONS,x11_extensions) \
+ xmerge \
+ $(call gb_Helper_optional,DESKTOP,xmlhelp) \
+ xmloff \
xmlreader \
- xmlscript \
- xmlsecurity \
+ xmlscript \
+ xmlsecurity \
xsltml \
))
@@ -228,7 +188,7 @@ $(eval $(call gb_Module_add_targets,tail_end,\
endif
# Especially when building everything with symbols, the linking of the largest
-# libraries takes enormous amounts of RAM. To prevent annoying OOM situations
+# libraries takes enormous amounts of RAM. To prevent annoying OOM situations
# etc., try to prevent linking these in parallel by adding artificial build
# order dependencies here.
define tailbuild_serialize1
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index a75a6e0..c210cd7 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -189,4 +189,8 @@ endef
# gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker need to use
# for libraries from the OUTDIR
+define gb_Helper_optional
+$(if $(filter $(1),$(BUILD_TYPE)),$(2))
+endef
+
# vim: set noet sw=4 ts=4:
commit 311babc08009ff4014f9b6b14d82ca41f5e6f942
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Sep 29 02:02:03 2012 -0500
gbuildify tomcat
Change-Id: Ibd7b71292450db8e3e98f9ede5a836182eb38770
diff --git a/Makefile.top b/Makefile.top
index 642ec00..d32a0ba 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 7a511ea..9814f16 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 7ba3b7a..ac9266c 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 0c4e9a1..6c5c763 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
+ at 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 0000000..48c063f
--- /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 0000000..ccb1c85
--- /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 0000000..ffe9090
--- /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 0000000..8cd4512
--- /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 0000000..6e6a716
--- /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 0000000..2d54d3d
--- /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 184f6dd..eca653b 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 41530ac..8b13789 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 e69de29..0000000
diff --git a/tomcat/tomcat.patch b/tomcat/tomcat.patch
deleted file mode 100644
index 1815660..0000000
--- 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>
More information about the Libreoffice-commits
mailing list