[glassfish] 33/40: * Invoke ant twice if the first execution fails. Remove the <sleep/> workaround. * Install POM file for glassfish-mail. (Closes: #581885)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag debian/1%3A2.1.1-b31-1
in repository glassfish.

commit 25a80f2be82e042a7b2666a07a283b4336f86861
Author: Torsten Werner <twerner at debian.org>
Date:   Tue May 18 19:48:30 2010 +0000

    * Invoke ant twice if the first execution fails. Remove the <sleep/>
      workaround.
    * Install POM file for glassfish-mail. (Closes: #581885)
---
 debian/build.xml              | 14 ++++++++++++--
 debian/changelog              |  6 ++++--
 debian/control                |  2 +-
 debian/glassfish-mail.install |  1 -
 debian/rules                  | 17 ++++++++++++++---
 5 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
index 75fa430..f0f62f2 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project default="jar" name="Glassfish" basedir=".">
+<project default="pom" name="Glassfish" basedir=".">
   <property file="../bootstrap/project.properties"/>
   <target name="clean" description="Clean up">
     <ant dir="../activation" target="clean"/>
@@ -59,7 +59,6 @@
     <ant dir="../connector-api" target="all"/>
     <ant dir="../management-api" target="all"/>
     <ant dir="../jmac-api" target="all"/>
-    <sleep seconds="60"/>
     <ant dir="../appserv-api" target="all"/>
     <ant dir="../jacc-api" target="all"/>
     <ant dir="../common-util" target="all"/>
@@ -89,4 +88,15 @@
     <!-- <ant dir="../appserv-native" target="all"/> -->
   </target>
 
+  <target name="mail-pom" description="update mail POM">
+    <property file="../mail/build.properties"/>
+    <copy file="../mail/mail.pom" tofile="poms/mail.xml">
+      <filterset>
+	<filter token="VERSION" value="${release.version}"/>
+      </filterset>
+    </copy>
+  </target>
+
+  <target name="pom" depends="jar, mail-pom" description="update all POMs"/>
+
 </project>
diff --git a/debian/changelog b/debian/changelog
index d0a083f..07a210e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,11 @@ glassfish (1:2.1.1-b31-1) unstable; urgency=low
   * New upstream release
   * Update debian/watch for release 2.1.1.
   * Convert patches to dep3 format.
-  * Increase sleep time to 60 seconds.
+  * Invoke ant twice if the first execution fails. Remove the <sleep/>
+    workaround.
+  * Install POM file for glassfish-mail. (Closes: #581885)
 
- -- Torsten Werner <twerner at debian.org>  Tue, 18 May 2010 20:41:53 +0200
+ -- Torsten Werner <twerner at debian.org>  Tue, 18 May 2010 21:31:25 +0200
 
 glassfish (1:2ur2-b04-6) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 2c5140b..95f0301 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs, debhelper (>= 7)
+Build-Depends: cdbs, debhelper (>= 7), maven-repo-helper
 Build-Depends-Indep: ant, default-jdk, libaxis-java
 Standards-Version: 3.8.4
 Homepage: https://glassfish.dev.java.net/
diff --git a/debian/glassfish-mail.install b/debian/glassfish-mail.install
deleted file mode 100644
index 24c08cb..0000000
--- a/debian/glassfish-mail.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/java/glassfish-mail*
diff --git a/debian/rules b/debian/rules
index 2a29e83..68f2705 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@ include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 JAVA_HOME               := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET	:= jar
 DEB_ANT_BUILDFILE	:= debian/build.xml
 DEB_DESTDIR		:= $(CURDIR)/debian/tmp
 DEB_JARS                := jaxrpc
@@ -13,8 +12,15 @@ ALL_JARS := $(wildcard publish/glassfish/lib/*.jar)
 ALL_JARS += $(wildcard */build/release/*.jar)
 DEST_DIR = $(DEB_DESTDIR)/usr/share/java
 
-#clean::
-#	rm -rf publish/glassfish
+clean::
+	$(RM) -r debian/poms
+
+# The first invokation of ant fails sometimes:
+debian/stamp-ant-build:
+	$(DEB_ANT_INVOKE) $(DEB_ANT_BUILD_TARGET) || \
+	  $(DEB_ANT_INVOKE) $(DEB_ANT_BUILD_TARGET)
+	touch debian/stamp-ant-build
+
 
 common-install-prehook-indep::
 	for jar in $(ALL_JARS); do                         \
@@ -24,5 +30,10 @@ common-install-prehook-indep::
 	  ln -sf $$FULLNAME $(DEST_DIR)/$$BASENAME.jar;     \
 	done
 
+install/glassfish-mail::
+	mh_installpom -pglassfish-mail debian/poms/mail.xml
+	mh_installjar -pglassfish-mail debian/poms/mail.xml -l \
+	  publish/glassfish/lib/mail.jar
+
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/glassfish.git