[tomcat8] 05/06: Moved the symlinks to /usr/share/tomcat8/lib in the tomcat8-common package Simplified debian/rules
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Mon Sep 16 07:21:49 UTC 2013
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat8.
commit cb7eb6c6338575beabcf79c35044fa429e9ae935
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Sep 16 00:10:01 2013 +0200
Moved the symlinks to /usr/share/tomcat8/lib in the tomcat8-common package
Simplified debian/rules
---
debian/changelog | 5 ++++
debian/libservlet3.1-java.poms | 8 +++----
debian/libtomcat8-java.poms | 40 +++++++++++++++++--------------
debian/rules | 52 +++-------------------------------------
debian/tomcat8-common.links | 28 +++++++++++++++++++---
5 files changed, 59 insertions(+), 74 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2e6c750..11e774c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,11 @@ tomcat8 (8.0.0~RC1-1) UNRELEASED; urgency=low
* Moved the tomcat-{servlet|jsp|el}-api artifacts from libservlet3.1-java
to libtomcat8-java
* Fixed the versions of the Maven dependencies for jsp-api
+ * The symlinks to /usr/share/tomcat8/lib are no longer split between the two
+ packages libtomcat8-java and tomcat8-common. tomcat8-common assembles all
+ the jars required by Tomcat (tomcat jars + dbcp + pool). libtomcat8-java
+ deploys only the jars in /usr/share/java and the Maven artifacts in
+ /usr/share/maven-repo.
-- Emmanuel Bourg <ebourg at apache.org> Thu, 12 Sep 2013 16:10:10 +0200
diff --git a/debian/libservlet3.1-java.poms b/debian/libservlet3.1-java.poms
index 6d6faae..2203837 100644
--- a/debian/libservlet3.1-java.poms
+++ b/debian/libservlet3.1-java.poms
@@ -1,4 +1,4 @@
-debian/javaxpoms/servlet-api.pom --no-rules
-debian/javaxpoms/jsp-api.pom --no-rules
-debian/javaxpoms/el-api.pom --no-rules
-debian/javaxpoms/websocket-api.pom --no-rules
+debian/javaxpoms/servlet-api.pom --java-lib -s --usj-name=servlet-api --artifact=output/build/lib/servlet-api.jar
+debian/javaxpoms/jsp-api.pom --java-lib -s --usj-name=jsp-api --artifact=output/build/lib/jsp-api.jar
+debian/javaxpoms/el-api.pom --java-lib -s --usj-name=el-api --artifact=output/build/lib/el-api.jar
+debian/javaxpoms/websocket-api.pom --java-lib -s --usj-name=websocket-api --artifact=output/build/lib/websocket-api.jar
diff --git a/debian/libtomcat8-java.poms b/debian/libtomcat8-java.poms
index 55e7004..453d183 100644
--- a/debian/libtomcat8-java.poms
+++ b/debian/libtomcat8-java.poms
@@ -1,18 +1,22 @@
-debian/poms/tomcat-annotations-api.pom
-debian/poms/tomcat-api.pom
-debian/poms/tomcat-catalina.pom
-debian/poms/tomcat-catalina-ha.pom
-debian/poms/tomcat-coyote.pom
-debian/poms/tomcat-el-api.pom
-debian/poms/tomcat-jasper.pom
-debian/poms/tomcat-jasper-el.pom
-debian/poms/tomcat-jdbc.pom
-debian/poms/tomcat-jni.pom
-debian/poms/tomcat-jsp-api.pom
-debian/poms/tomcat-juli.pom
-debian/poms/tomcat-servlet-api.pom
-debian/poms/tomcat-spdy.pom
-debian/poms/tomcat-tribes.pom
-debian/poms/tomcat-util.pom
-debian/poms/tomcat-websocket.pom
-debian/poms/tomcat-websocket-api.pom
+debian/poms/tomcat-annotations-api.pom --java-lib --usj-name=tomcat8-annotations-api --artifact=output/build/lib/annotations-api.jar
+debian/poms/tomcat-api.pom --java-lib --usj-name=tomcat8-api --artifact=output/build/lib/tomcat-api.jar
+debian/poms/tomcat-catalina.pom --java-lib --usj-name=tomcat8-catalina --artifact=output/build/lib/catalina.jar
+debian/poms/tomcat-catalina-ant.pom --java-lib --usj-name=tomcat8-catalina-ant --artifact=output/build/lib/catalina-ant.jar
+debian/poms/tomcat-catalina-ha.pom --java-lib --usj-name=tomcat8-catalina-ha --artifact=output/build/lib/catalina-ha.jar
+debian/poms/tomcat-coyote.pom --java-lib --usj-name=tomcat8-coyote --artifact=output/build/lib/tomcat-coyote.jar
+debian/poms/tomcat-el-api.pom --java-lib --usj-name=tomcat8-el-api --artifact=output/build/lib/el-api.jar
+debian/poms/tomcat-i18n-es.pom --java-lib --usj-name=tomcat8-i18n-es --artifact=output/build/lib/tomcat-i18n-es.jar
+debian/poms/tomcat-i18n-fr.pom --java-lib --usj-name=tomcat8-i18n-fr --artifact=output/build/lib/tomcat-i18n-fr.jar
+debian/poms/tomcat-i18n-ja.pom --java-lib --usj-name=tomcat8-i18n-ja --artifact=output/build/lib/tomcat-i18n-ja.jar
+debian/poms/tomcat-jasper.pom --java-lib --usj-name=tomcat8-jasper --artifact=output/build/lib/jasper.jar
+debian/poms/tomcat-jasper-el.pom --java-lib --usj-name=tomcat8-jasper-el --artifact=output/build/lib/jasper-el.jar
+debian/poms/tomcat-jdbc.pom --java-lib --usj-name=tomcat8-jdbc --artifact=output/jdbc-pool/tomcat-jdbc.jar
+debian/poms/tomcat-jni.pom --java-lib --usj-name=tomcat8-jni --artifact=output/build/lib/tomcat-jni.jar
+debian/poms/tomcat-jsp-api.pom --java-lib --usj-name=tomcat8-jsp-api --artifact=output/build/lib/jsp-api.jar
+debian/poms/tomcat-juli.pom --java-lib --usj-name=tomcat8-juli --artifact=output/build/bin/tomcat-juli.jar
+debian/poms/tomcat-servlet-api.pom --java-lib --usj-name=tomcat8-servlet-api --artifact=output/build/lib/servlet-api.jar
+debian/poms/tomcat-spdy.pom --java-lib --usj-name=tomcat8-spdy --artifact=output/build/lib/tomcat-spdy.jar
+debian/poms/tomcat-tribes.pom --java-lib --usj-name=tomcat8-tribes --artifact=output/build/lib/catalina-tribes.jar
+debian/poms/tomcat-util.pom --java-lib --usj-name=tomcat8-util --artifact=output/build/lib/tomcat-util.jar
+debian/poms/tomcat-websocket.pom --java-lib --usj-name=tomcat8-websocket --artifact=output/build/lib/tomcat-websocket.jar
+debian/poms/tomcat-websocket-api.pom --java-lib --usj-name=tomcat8-websocket-api --artifact=output/build/lib/websocket-api.jar
diff --git a/debian/rules b/debian/rules
index 67a58f2..8fadff9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
JAVA_HOME := /usr/lib/jvm/default-java
JAVA_CMD := $(JAVA_HOME)/bin/java
BLDLIB := output/build/lib
-BLDBIN := output/build/bin
DEB_JARS_BASE := /usr/share/java
DEB_JARS := ant ant-launcher ant-trax ant-nodeps ant-junit4 ant-junit junit4 hamcrest-1.3
DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
@@ -21,9 +20,6 @@ DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
T_VER := $(shell dpkg-parsechangelog | egrep '^Version:' \
| cut -f 2 -d ' ' | cut -f 2 -d ' ' | sed 's/-[^-]*$$//' | sed 's/~/-/')
-# The Tomcat jars without the tomcat- prefix generated in the BLDLIB directory
-T_MAVENIZED_JARS := jasper-el annotations-api jasper catalina-ha catalina websocket-api
-
T_VER_MAJOR := $(shell echo $(T_VER) | cut -d'.' -f1)
T_VER_MINOR := $(shell echo $(T_VER) | cut -d'.' -f2)
T_VER_BUILD := $(shell echo $(T_VER) | cut -d'.' -f3)
@@ -103,59 +99,17 @@ binary-indep: build install
cp res/maven/*.pom debian/poms
perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/$(T_VER)/' debian/poms/*.pom
- mh_installpoms -plibtomcat8-java
- for i in $(T_MAVENIZED_JARS); \
- do \
- mh_installjar -plibtomcat8-java -l \
- --usj-name=tomcat8-$$i \
- debian/poms/tomcat-$$i.pom \
- $(BLDLIB)/$$i.jar \
- usr/share/tomcat8/lib/$$i.jar; \
- done
-
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-tribes debian/poms/tomcat-tribes.pom $(BLDLIB)/catalina-tribes.jar usr/share/tomcat8/lib/catalina-tribes.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-api debian/poms/tomcat-api.pom $(BLDLIB)/tomcat-api.jar usr/share/tomcat8/lib/tomcat-api.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-coyote debian/poms/tomcat-coyote.pom $(BLDLIB)/tomcat-coyote.jar usr/share/tomcat8/lib/tomcat-coyote.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-juli debian/poms/tomcat-juli.pom $(BLDBIN)/tomcat-juli.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-util debian/poms/tomcat-util.pom $(BLDLIB)/tomcat-util.jar usr/share/tomcat8/lib/tomcat-util.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-jni debian/poms/tomcat-jni.pom $(BLDLIB)/tomcat-jni.jar usr/share/tomcat8/lib/tomcat-jni.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-spdy debian/poms/tomcat-spdy.pom $(BLDLIB)/tomcat-spdy.jar usr/share/tomcat8/lib/tomcat-spdy.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-websocket debian/poms/tomcat-websocket.pom $(BLDLIB)/tomcat-websocket.jar usr/share/tomcat8/lib/tomcat-websocket.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-servlet-api debian/poms/tomcat-servlet-api.pom $(BLDLIB)/servlet-api.jar usr/share/tomcat8/lib/servlet-api.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-jsp-api debian/poms/tomcat-jsp-api.pom $(BLDLIB)/jsp-api.jar usr/share/tomcat8/lib/jsp-api.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-el-api debian/poms/tomcat-el-api.pom $(BLDLIB)/el-api.jar usr/share/tomcat8/lib/el-api.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-jdbc debian/poms/tomcat-jdbc.pom output/jdbc-pool/tomcat-jdbc.jar usr/share/tomcat8/lib/tomcat-jdbc.jar
-
- # Install the i18n jars
- for i in i18n-fr i18n-es i18n-ja; \
- do \
- mv $(BLDLIB)/tomcat-$$i.jar $(BLDLIB)/tomcat8-$$i-$(T_VER).jar && \
- dh_install -plibtomcat8-java $(BLDLIB)/tomcat8-$$i-$(T_VER).jar usr/share/java && \
- dh_link -plibtomcat8-java usr/share/java/tomcat8-$$i-$(T_VER).jar usr/share/java/tomcat8-$$i.jar && \
- dh_link -ptomcat8-common usr/share/java/tomcat8-$$i-$(T_VER).jar usr/share/tomcat8/lib/tomcat-$$i.jar; \
- done
+ mh_install -plibservlet3.1-java
+ mh_install -plibtomcat8-java
- # Install catalina-storeconfig.jar
+ # Install catalina-storeconfig.jar (no pom available)
mv $(BLDLIB)/catalina-storeconfig.jar $(BLDLIB)/tomcat8-catalina-storeconfig-$(T_VER).jar
dh_install -plibtomcat8-java $(BLDLIB)/tomcat8-catalina-storeconfig-$(T_VER).jar usr/share/java
dh_link -plibtomcat8-java usr/share/java/tomcat8-catalina-storeconfig-$(T_VER).jar usr/share/java/tomcat8-catalina-storeconfig.jar
- dh_link -plibtomcat8-java usr/share/java/tomcat8-catalina-storeconfig-$(T_VER).jar usr/share/tomcat8/lib/catalina-storeconfig.jar
-
- # Install catalina-ant.jar
- mv $(BLDLIB)/catalina-ant.jar $(BLDLIB)/tomcat8-catalina-ant-$(T_VER).jar
- dh_install -plibtomcat8-java $(BLDLIB)/tomcat8-catalina-ant-$(T_VER).jar usr/share/java
- dh_link -plibtomcat8-java usr/share/java/tomcat8-catalina-ant-$(T_VER).jar usr/share/java/tomcat8-catalina-ant.jar
- dh_link -ptomcat8-common usr/share/java/tomcat8-catalina-ant-$(T_VER).jar usr/share/tomcat8/lib/catalina-ant.jar
dh_install --exclude=.bat --exclude=Thumbs.db
dh_link
- mh_installpoms -plibservlet3.1-java
- mh_installjar -plibservlet3.1-java -l -s --usj-name=servlet-api debian/javaxpoms/servlet-api.pom $(BLDLIB)/servlet-api.jar
- mh_installjar -plibservlet3.1-java -l -s --usj-name=jsp-api debian/javaxpoms/jsp-api.pom $(BLDLIB)/jsp-api.jar
- mh_installjar -plibservlet3.1-java -l -s --usj-name=el-api debian/javaxpoms/el-api.pom $(BLDLIB)/el-api.jar
- mh_installjar -plibservlet3.1-java -l -s --usj-name=websocket-api debian/javaxpoms/websocket-api.pom $(BLDLIB)/websocket-api.jar
-
rm -r debian/poms
rm -rf \
debian/tomcat8/usr/share/tomcat8/webapps/default_root/.svn \
diff --git a/debian/tomcat8-common.links b/debian/tomcat8-common.links
index 80e069e..8375b4c 100644
--- a/debian/tomcat8-common.links
+++ b/debian/tomcat8-common.links
@@ -1,3 +1,25 @@
-/usr/share/java/tomcat8-juli.jar /usr/share/tomcat8/bin/tomcat-juli.jar
-/usr/share/java/commons-dbcp.jar /usr/share/tomcat8/lib/commons-dbcp.jar
-/usr/share/java/commons-pool.jar /usr/share/tomcat8/lib/commons-pool.jar
+/usr/share/java/tomcat8-juli.jar /usr/share/tomcat8/bin/tomcat-juli.jar
+/usr/share/java/commons-dbcp.jar /usr/share/tomcat8/lib/commons-dbcp.jar
+/usr/share/java/commons-pool.jar /usr/share/tomcat8/lib/commons-pool.jar
+/usr/share/java/tomcat8-annotations-api.jar /usr/share/tomcat8/lib/annotations-api.jar
+/usr/share/java/tomcat8-api.jar /usr/share/tomcat8/lib/tomcat-api.jar
+/usr/share/java/tomcat8-catalina.jar /usr/share/tomcat8/lib/catalina.jar
+/usr/share/java/tomcat8-catalina-ant.jar /usr/share/tomcat8/lib/catalina-ant.jar
+/usr/share/java/tomcat8-catalina-ha.jar /usr/share/tomcat8/lib/catalina-ha.jar
+/usr/share/java/tomcat8-catalina-storeconfig.jar /usr/share/tomcat8/lib/catalina-storeconfig.jar
+/usr/share/java/tomcat8-coyote.jar /usr/share/tomcat8/lib/tomcat-coyote.jar
+/usr/share/java/tomcat8-el-api.jar /usr/share/tomcat8/lib/el-api.jar
+/usr/share/java/tomcat8-i18n-es.jar /usr/share/tomcat8/lib/tomcat-i18n-es.jar
+/usr/share/java/tomcat8-i18n-fr.jar /usr/share/tomcat8/lib/tomcat-i18n-fr.jar
+/usr/share/java/tomcat8-i18n-ja.jar /usr/share/tomcat8/lib/tomcat-i18n-ja.jar
+/usr/share/java/tomcat8-jasper.jar /usr/share/tomcat8/lib/jasper.jar
+/usr/share/java/tomcat8-jasper-el.jar /usr/share/tomcat8/lib/jasper-el.jar
+/usr/share/java/tomcat8-jdbc.jar /usr/share/tomcat8/lib/tomcat-jdbc.jar
+/usr/share/java/tomcat8-jni.jar /usr/share/tomcat8/lib/tomcat-jni.jar
+/usr/share/java/tomcat8-jsp-api.jar /usr/share/tomcat8/lib/jsp-api.jar
+/usr/share/java/tomcat8-servlet-api.jar /usr/share/tomcat8/lib/servlet-api.jar
+/usr/share/java/tomcat8-spdy.jar /usr/share/tomcat8/lib/tomcat-spdy.jar
+/usr/share/java/tomcat8-tribes.jar /usr/share/tomcat8/lib/catalina-tribes.jar
+/usr/share/java/tomcat8-util.jar /usr/share/tomcat8/lib/tomcat-util.jar
+/usr/share/java/tomcat8-websocket.jar /usr/share/tomcat8/lib/tomcat-websocket.jar
+/usr/share/java/tomcat8-websocket-api.jar /usr/share/tomcat8/lib/websocket-api.jar
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git
More information about the pkg-java-commits
mailing list