[pkg-java] r2757 - in branches/tomcat5.5/feature/debian: . debian
Marcus Better
marcusb-guest at alioth.debian.org
Wed Nov 15 20:15:37 CET 2006
Author: marcusb-guest
Date: 2006-11-15 20:15:37 +0100 (Wed, 15 Nov 2006)
New Revision: 2757
Added:
branches/tomcat5.5/feature/debian/debian/libtomcat5.5-java.dirs
branches/tomcat5.5/feature/debian/debian/tomcat5.5-admin.dirs
branches/tomcat5.5/feature/debian/debian/tomcat5.5.docs
branches/tomcat5.5/feature/debian/debian/tomcat5.5.examples
Removed:
branches/tomcat5.5/feature/debian/debian/patches/
branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.links
Modified:
branches/tomcat5.5/feature/debian/build.xml
branches/tomcat5.5/feature/debian/debian/
branches/tomcat5.5/feature/debian/debian/control
branches/tomcat5.5/feature/debian/debian/libtomcat5.5-java.install
branches/tomcat5.5/feature/debian/debian/rules
branches/tomcat5.5/feature/debian/debian/tomcat5.5-admin.install
branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.install
branches/tomcat5.5/feature/debian/debian/tomcat5.5.dirs
branches/tomcat5.5/feature/debian/debian/tomcat5.5.install
branches/tomcat5.5/feature/debian/debian/tomcat5.5.links
Log:
Build the "dist" target in build/build.xml, then copy whole directories into install tree and delete the unnecessary files. This prevents forgetting to install new files that are added in future versions. Should fix bug #395167. Also don't use CDBS, hopefully increasing clarity.
Modified: branches/tomcat5.5/feature/debian/build.xml
===================================================================
--- branches/tomcat5.5/feature/debian/build.xml 2006-11-15 11:05:19 UTC (rev 2756)
+++ branches/tomcat5.5/feature/debian/build.xml 2006-11-15 19:15:37 UTC (rev 2757)
@@ -46,7 +46,7 @@
description="Builds all components">
<ant dir="${tomcat.home}" target="download" />
- <ant dir="${tomcat.home}" target="deploy" />
+ <ant dir="${tomcat.home}" target="dist" />
</target>
Property changes on: branches/tomcat5.5/feature/debian/debian
___________________________________________________________________
Name: mergeWithUpstream
- 1
Modified: branches/tomcat5.5/feature/debian/debian/control
===================================================================
--- branches/tomcat5.5/feature/debian/debian/control 2006-11-15 11:05:19 UTC (rev 2756)
+++ branches/tomcat5.5/feature/debian/debian/control 2006-11-15 19:15:37 UTC (rev 2757)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>, Marcus Better <marcus at better.se>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 5.0.0)
+Build-Depends: debhelper (>= 5.0.0)
Build-Depends-Indep: java-gcj-compat-dev, ant, libcommons-beanutils-java, libcommons-daemon-java, libcommons-digester-java, libcommons-el-java, libcommons-fileupload-java (>= 1.0-1), libcommons-httpclient-java, libcommons-launcher-java, libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), libgnujaf-java, libgnumail-java, libjessie-java, liblog4j1.2-java, libmx4j-java, libstruts1.2-java, libxerces2-java, libxalan2-java, junit, unzip
Standards-Version: 3.7.2
Added: branches/tomcat5.5/feature/debian/debian/libtomcat5.5-java.dirs
===================================================================
--- branches/tomcat5.5/feature/debian/debian/libtomcat5.5-java.dirs 2006-11-15 11:05:19 UTC (rev 2756)
+++ branches/tomcat5.5/feature/debian/debian/libtomcat5.5-java.dirs 2006-11-15 19:15:37 UTC (rev 2757)
@@ -0,0 +1 @@
+/usr/share/tomcat5.5
Modified: branches/tomcat5.5/feature/debian/debian/libtomcat5.5-java.install
===================================================================
--- branches/tomcat5.5/feature/debian/debian/libtomcat5.5-java.install 2006-11-15 11:05:19 UTC (rev 2756)
+++ branches/tomcat5.5/feature/debian/debian/libtomcat5.5-java.install 2006-11-15 19:15:37 UTC (rev 2757)
@@ -1,13 +1,4 @@
-build/build/bin/bootstrap.jar /usr/share/tomcat5.5/bin/
-build/build/bin/tomcat-juli.jar /usr/share/tomcat5.5/bin/
-build/build/bin/*.xml /usr/share/tomcat5.5/bin/
-build/build/common/classes /usr/share/tomcat5.5/common/
-build/build/common/endorsed /usr/share/tomcat5.5/common/
-build/build/common/i18n/*.jar /usr/share/tomcat5.5/common/i18n/
-build/build/common/lib/jasper-*.jar /usr/share/tomcat5.5/common/lib/
-build/build/common/lib/naming-*.jar /usr/share/tomcat5.5/common/lib/
-build/build/server/classes /usr/share/tomcat5.5/server/
-build/build/server/lib/catalina*.jar /usr/share/tomcat5.5/server/lib/
-build/build/server/lib/servlets-*.jar /usr/share/tomcat5.5/server/lib/
-build/build/server/lib/servlets-*.renametojar /usr/share/tomcat5.5/server/lib/
-build/build/server/lib/tomcat-*.jar /usr/share/tomcat5.5/server/lib/
+build/dist/bin /usr/share/tomcat5.5
+build/dist/common /usr/share/tomcat5.5
+build/dist/server/classes /usr/share/tomcat5.5/server
+build/dist/server/lib /usr/share/tomcat5.5/server
Modified: branches/tomcat5.5/feature/debian/debian/rules
===================================================================
--- branches/tomcat5.5/feature/debian/debian/rules 2006-11-15 11:05:19 UTC (rev 2756)
+++ branches/tomcat5.5/feature/debian/debian/rules 2006-11-15 19:15:37 UTC (rev 2757)
@@ -1,28 +1,75 @@
#!/usr/bin/make -f
-# debian/rules file for tomcat5.5 (uses cdbs)
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+JAVA_HOME := /usr/lib/jvm/java-gcj
+DEB_JARS_BASE := /usr/share/java
+JAVACMD := $(JAVA_HOME)/bin/java
-JAVA_HOME := /usr/lib/jvm/java-gcj
-ANT_HOME := /usr/share/ant
-ANT_ARGS := -Dbase.path=$(CURDIR)/build/tmp
+DEB_JARS := ant ant-launcher ant-trax xercesImpl xalan2
-DEB_JARS := ant-launcher ant-trax xercesImpl xalan2
+DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
+ if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
+ if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
+ if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \
+ if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \
+ done; \
+ if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
-DEB_ANT_BUILD_TARGET := build
-DEB_ANT_CLEAN_TARGET := xxx
+ANT_ARGS := -propertyfile debian/ant.properties \
+ -Dbase.path=$(CURDIR)/build/tmp
+ANT_INVOKE := $(JAVACMD) -classpath $(DEB_CLASSPATH) \
+ org.apache.tools.ant.Main $(ANT_ARGS)
-TOMCAT_SRCDIR := build
+PKGNAME := tomcat5.5
+TOMCAT_INSTALL_DIR := $(CURDIR)/debian/$(PKGNAME)
+TOMCAT_SHARE_DIR := $(TOMCAT_INSTALL_DIR)/usr/share/$(PKGNAME)
+TOMCAT_VARLIB_DIR := $(TOMCAT_INSTALL_DIR)/var/lib/$(PKGNAME)
+LIBTOMCAT_INSTALL_DIR := $(CURDIR)/debian/lib$(PKGNAME)-java
+LIBTOMCAT_SHARE_DIR := $(LIBTOMCAT_INSTALL_DIR)/usr/share/$(PKGNAME)
-# Examples and documentation for the tomcat5.5 package
-DEB_INSTALL_DOCS_tomcat5.5 := $(DEB_SRCDIR)/$(TOMCAT_SRCDIR)/RUNNING.txt
-DEB_INSTALL_EXAMPLES_tomcat5.5 := $(DEB_SRCDIR)/$(TOMCAT_SRCDIR)/build/conf/server.xml \
- $(DEB_SRCDIR)/$(TOMCAT_SRCDIR)/build/conf/web.xml
+build: build-stamp
+build-stamp:
+ dh_testdir
+ $(ANT_INVOKE) build
+ touch build-stamp
-clean::
- -rm -r build/build
- -rm -r build/compat
- -rm -r build/deployer
- -rm -r build/tmp
- -rm -f LICENSE
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ -rm -r build/{build,compat,deployer,dist,tmp} LICENSE
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_installexamples
+ # Prune files that should not be installed at all.
+ rm build/dist/bin/{*.bat,commons-*.jar}
+ dh_install
+ # Prune extra installed files from the various packages.
+ rm -f $(TOMCAT_SHARE_DIR)/bin/*.{jar,xml} \
+ $(TOMCAT_VARLIB_DIR)/conf/{server,web,tomcat-users}.xml \
+ $(TOMCAT_VARLIB_DIR)/conf/Catalina/localhost/* \
+ $(LIBTOMCAT_SHARE_DIR)/bin/*.sh \
+ $(LIBTOMCAT_SHARE_DIR)/common/lib/{commons-*,{jsp,servlet}-api.jar} \
+ $(LIBTOMCAT_SHARE_DIR)/server/lib/commons-*
+ dh_link
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-arch: build install
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Added: branches/tomcat5.5/feature/debian/debian/tomcat5.5-admin.dirs
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5-admin.dirs 2006-11-15 11:05:19 UTC (rev 2756)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5-admin.dirs 2006-11-15 19:15:37 UTC (rev 2757)
@@ -0,0 +1,3 @@
+etc/tomcat5.5/policy.d
+var/lib/tomcat5.5/conf/Catalina/localhost
+/usr/share/tomcat5.5/server
Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5-admin.install
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5-admin.install 2006-11-15 11:05:19 UTC (rev 2756)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5-admin.install 2006-11-15 19:15:37 UTC (rev 2757)
@@ -2,6 +2,4 @@
debian/webapps/manager.xml /var/lib/tomcat5.5/conf/Catalina/localhost/
debian/webapps/host-manager.xml /var/lib/tomcat5.5/conf/Catalina/localhost/
debian/policy/10admin.policy /etc/tomcat5.5/policy.d/
-build/build/server/webapps/admin /usr/share/tomcat5.5/server/webapps/
-build/build/server/webapps/manager /usr/share/tomcat5.5/server/webapps/
-build/build/server/webapps/host-manager /usr/share/tomcat5.5/server/webapps/
+build/dist/server/webapps /usr/share/tomcat5.5/server
Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.install
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.install 2006-11-15 11:05:19 UTC (rev 2756)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.install 2006-11-15 19:15:37 UTC (rev 2757)
@@ -1,11 +1,5 @@
-build/build/webapps/balancer /var/lib/tomcat5.5/webapps/
-build/build/webapps/ROOT /var/lib/tomcat5.5/webapps/
-build/build/webapps/jsp-examples /var/lib/tomcat5.5/webapps/
-build/build/webapps/servlets-examples /var/lib/tomcat5.5/webapps/
-build/build/webapps/tomcat-docs /var/lib/tomcat5.5/webapps/
-build/build/webapps/webdav /var/lib/tomcat5.5/webapps/
-debian/webapps/balancer.xml /var/lib/tomcat5.5/conf/Catalina/localhost/
-debian/webapps/tomcat-docs.xml /var/lib/tomcat5.5/conf/Catalina/localhost/
+build/dist/webapps /var/lib/tomcat5.5
+debian/webapps/balancer.xml /var/lib/tomcat5.5/conf/Catalina/localhost/
+debian/webapps/tomcat-docs.xml /var/lib/tomcat5.5/conf/Catalina/localhost/
-servletapi/jsr152/examples/WEB-INF/lib/jstl.jar /usr/share/tomcat5.5/server/webapps/jsp-examples/WEB-INF/lib
-servletapi/jsr152/examples/WEB-INF/lib/standard.jar /usr/share/tomcat5.5/server/webapps/jsp-examples/WEB-INF/lib
+build/dist/webapps/jsp-examples/WEB-INF/lib /usr/share/tomcat5.5/server/webapps/jsp-examples/WEB-INF
Deleted: branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.links
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.links 2006-11-15 11:05:19 UTC (rev 2756)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5-webapps.links 2006-11-15 19:15:37 UTC (rev 2757)
@@ -1,2 +0,0 @@
-/usr/share/doc/libservlet2.4-java/api-servlet /var/lib/tomcat5.5/webapps/tomcat-docs/servletapi
-/usr/share/doc/libservlet2.4-java/api-jsp /var/lib/tomcat5.5/webapps/tomcat-docs/jspapi
Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5.dirs
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.dirs 2006-11-15 11:05:19 UTC (rev 2756)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5.dirs 2006-11-15 19:15:37 UTC (rev 2757)
@@ -1,7 +1,7 @@
etc/default
etc/tomcat5.5/policy.d
-usr/share/tomcat5.5/bin
-var/cache/tomcat5.5/
+usr/share/tomcat5.5
+var/cache/tomcat5.5
var/lib/tomcat5.5/conf/Catalina/localhost
var/lib/tomcat5.5/shared/classes
var/lib/tomcat5.5/shared/lib
Added: branches/tomcat5.5/feature/debian/debian/tomcat5.5.docs
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.docs 2006-11-15 11:05:19 UTC (rev 2756)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5.docs 2006-11-15 19:15:37 UTC (rev 2757)
@@ -0,0 +1 @@
+build/RUNNING.txt
Added: branches/tomcat5.5/feature/debian/debian/tomcat5.5.examples
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.examples 2006-11-15 11:05:19 UTC (rev 2756)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5.examples 2006-11-15 19:15:37 UTC (rev 2757)
@@ -0,0 +1,2 @@
+build/dist/conf/server.xml
+build/dist/conf/web.xml
Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5.install
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.install 2006-11-15 11:05:19 UTC (rev 2756)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5.install 2006-11-15 19:15:37 UTC (rev 2757)
@@ -1,7 +1,8 @@
-build/build/bin/*.sh /usr/share/tomcat5.5/bin/
-build/build/conf/tomcat-users.xml /usr/share/tomcat5.5/.debian/
-build/build/webapps/ROOT/WEB-INF/web.xml /usr/share/tomcat5.5/.debian/
-build/build/conf/web.xml /etc/tomcat5.5/
+build/dist/bin /usr/share/tomcat5.5
+build/dist/conf /var/lib/tomcat5.5
+build/dist/conf/tomcat-users.xml /usr/share/tomcat5.5/.debian/
+build/dist/webapps/ROOT/WEB-INF/web.xml /usr/share/tomcat5.5/.debian/
+build/dist/conf/web.xml /etc/tomcat5.5/
debian/policy/0*.policy /etc/tomcat5.5/policy.d/
debian/policy/9*.policy /etc/tomcat5.5/policy.d/
debian/server.xml /etc/tomcat5.5/
Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5.links
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.links 2006-11-15 11:05:19 UTC (rev 2756)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5.links 2006-11-15 19:15:37 UTC (rev 2757)
@@ -1,11 +1,11 @@
/var/lib/tomcat5.5/conf /usr/share/tomcat5.5/conf
-/usr/share/doc/tomcat5.5 /usr/share/tomcat5.5/doc
+/usr/share/doc/tomcat5.5 /usr/share/tomcat5.5/doc
/var/lib/tomcat5.5/logs /usr/share/tomcat5.5/logs
/var/lib/tomcat5.5/webapps /usr/share/tomcat5.5/webapps
/var/lib/tomcat5.5/work /usr/share/tomcat5.5/work
-/var/lib/tomcat5.5/shared /usr/share/tomcat5.5/shared
+/var/lib/tomcat5.5/shared /usr/share/tomcat5.5/shared
/var/lib/tomcat5.5/temp /usr/share/tomcat5.5/temp
/var/log/tomcat5.5 /var/lib/tomcat5.5/logs
-/etc/tomcat5.5/server.xml /var/lib/tomcat5.5/conf/server.xml
+/etc/tomcat5.5/server.xml /var/lib/tomcat5.5/conf/server.xml
/etc/tomcat5.5/web.xml /var/lib/tomcat5.5/conf/web.xml
/var/cache/tomcat5.5 /var/lib/tomcat5.5/work
More information about the pkg-java-commits
mailing list