[atinject-jsr330] 03/06: Build the TCK jar and install its Maven artifacts in /usr/share/maven-repo
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Thu Oct 17 16:07:44 UTC 2013
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository atinject-jsr330.
commit 35d43317b4e1a4cc699f4c7124f5c06c332218ca
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Oct 17 16:30:46 2013 +0200
Build the TCK jar and install its Maven artifacts in /usr/share/maven-repo
---
debian/build.xml | 35 ++++++++++++++++++++++++
debian/changelog | 1 +
debian/clean | 1 -
debian/control | 6 ++--
debian/copyright | 1 +
debian/libatinject-jsr330-api-java-doc.javadoc | 2 +-
debian/libatinject-jsr330-api-java.poms | 28 +++++++++++++++++++
debian/rules | 10 +++----
8 files changed, 74 insertions(+), 10 deletions(-)
diff --git a/debian/build.xml b/debian/build.xml
new file mode 100644
index 0000000..5e522cc
--- /dev/null
+++ b/debian/build.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<project name=" atinject-jsr330" default="dist" basedir="..">
+
+ <target name="jar">
+ <mkdir dir="build/classes/main"/>
+ <javac srcdir="src" destdir="build/classes/main" debug="true" source="1.5" target="1.5" includeantruntime="false"/>
+
+ <mkdir dir="build/classes/tck"/>
+ <javac srcdir="tck" destdir="build/classes/tck" debug="true" source="1.5" target="1.5" includeantruntime="false">
+ <classpath>
+ <pathelement location="build/classes/main"/>
+ <pathelement location="/usr/share/java/junit.jar"/>
+ </classpath>
+ </javac>
+
+ <jar jarfile="build/javax.inject.jar">
+ <fileset dir="build/classes/main"/>
+ </jar>
+ <jar jarfile="build/javax.inject-tck.jar">
+ <fileset dir="build/classes/tck"/>
+ </jar>
+
+ </target>
+
+ <target name="javadoc">
+ <javadoc destdir="build/javadoc" windowtitle="JSR 330: Dependency Injection for Java">
+ <fileset dir="src"/>
+ <fileset dir="tck"/>
+ <link href="/usr/share/doc/default-jdk-doc/api"/>
+ </javadoc>
+ </target>
+
+ <target name="dist" depends="jar,javadoc"/>
+
+</project>
diff --git a/debian/changelog b/debian/changelog
index d2191e4..fdbb266 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ atinject-jsr330 (1.0+ds1-1) UNRELEASED; urgency=low
* Team upload.
* Build the upstream tarball from the upstream SVN repository
+ * Build the TCK jar and install its Maven artifacts in /usr/share/maven-repo
* Use canonical URLs for the Vcs-* fields
* Build depend on debhelper >= 9
* debian/copyright: Updated the Format URI
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index fb8f15a..0000000
--- a/debian/clean
+++ /dev/null
@@ -1 +0,0 @@
-atinject-jsr330-api.jar
diff --git a/debian/control b/debian/control
index 9548074..2a13ec4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: Miguel Landaeta <miguel at miguel.cc>, Jakub Adam <jakub.adam at ktknet.cz>
Section: java
Priority: optional
-Build-Depends: debhelper (>= 9), default-jdk, javahelper, maven-debian-helper
+Build-Depends: debhelper (>= 9), default-jdk, ant, junit, javahelper, maven-repo-helper
Standards-Version: 3.9.4
Vcs-Git: git://anonscm.debian.org/pkg-java/atinject-jsr330.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/atinject-jsr330.git
@@ -12,7 +12,7 @@ Homepage: http://code.google.com/p/atinject/
Package: libatinject-jsr330-api-java
Architecture: all
Depends: ${misc:Depends}
-Suggests: libatinject-jsr330-api-java-doc (= ${binary:Version})
+Suggests: libatinject-jsr330-api-java-doc
Description: Java API for JSR-330 Dependency Injection
AtInject is the Java API build by the JSR-330 Expert Group:
<http://jcp.org/en/jsr/detail?id=330>.
@@ -24,7 +24,7 @@ Package: libatinject-jsr330-api-java-doc
Architecture: all
Section: doc
Depends: ${misc:Depends}
-Suggests: libatinject-jsr330-api-java (= ${binary:Version}), default-jdk-doc
+Suggests: libatinject-jsr330-api-java, default-jdk-doc
Description: Documentation for libatinject-jsr330-api-java
Documentation for AtInject that is the Java API build by the JSR-330 Expert
Group: <http://jcp.org/en/jsr/detail?id=330>.
diff --git a/debian/copyright b/debian/copyright
index c8b8f29..d918dec 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,6 +9,7 @@ License: Apache-2.0
Files: debian/*
Copyright: 2010-2011, Miguel Landaeta <miguel at miguel.cc>
+ 2013, Emmanuel Bourg <ebourg at apache.org>
License: Apache-2.0
License: Apache-2.0
diff --git a/debian/libatinject-jsr330-api-java-doc.javadoc b/debian/libatinject-jsr330-api-java-doc.javadoc
index 8e87818..54b5409 100644
--- a/debian/libatinject-jsr330-api-java-doc.javadoc
+++ b/debian/libatinject-jsr330-api-java-doc.javadoc
@@ -1 +1 @@
-internal /usr/share/doc/libatinject-jsr330-api-java/api
+build/javadoc /usr/share/doc/libatinject-jsr330-api-java/api
diff --git a/debian/libatinject-jsr330-api-java.poms b/debian/libatinject-jsr330-api-java.poms
index 1a7e280..6171d85 100644
--- a/debian/libatinject-jsr330-api-java.poms
+++ b/debian/libatinject-jsr330-api-java.poms
@@ -1 +1,29 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+pom.xml
debian/pom.xml
diff --git a/debian/rules b/debian/rules
index f1158e0..e54282e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,23 @@
#!/usr/bin/make -f
export JAVA_HOME=/usr/lib/jvm/default-java
-VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed -r 's/^.*:\ (.*)-.*$$/\1/')
+VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed -r 's/^.*:\ ([0-9\.]+)(-|\+).*/\1/')
%:
dh $@ --with javahelper
override_jh_build:
- jh_build atinject-jsr330-api.jar javax
+ ant -f debian/build.xml
override_dh_install:
- mh_installjar -plibatinject-jsr330-api-java -l \
- --usj-name=atinject-jsr330-api --usj-version=$(VERSION) \
- debian/pom.xml atinject-jsr330-api.jar
+ mh_installjar -plibatinject-jsr330-api-java -l --usj-name=atinject-jsr330-api -j$(VERSION) debian/pom.xml build/javax.inject.jar
+ mh_installjar -plibatinject-jsr330-api-java -l --usj-name=atinject-jsr330-tck -j$(VERSION) pom.xml build/javax.inject-tck.jar
mh_installpoms -plibatinject-jsr330-api-java
override_dh_clean:
dh_clean
mh_clean
+ rm -Rf build
get-orig-source:
cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/atinject-jsr330.git
More information about the pkg-java-commits
mailing list