Author: drazzib
Date: 2010-06-20 09:57:06 +0000 (Sun, 20 Jun 2010)
New Revision: 12587
Added:
trunk/spring-build/debian/poms/aws.ant.xml
trunk/spring-build/debian/poms/aws.ivy.xml
trunk/spring-build/debian/poms/osgi.xml
Removed:
trunk/spring-build/debian/libspring-build-java.poms
Modified:
trunk/spring-build/debian/build.xml
trunk/spring-build/debian/control
trunk/spring-build/debian/patches/ivy_artifact.diff
trunk/spring-build/debian/rules
Log:
Enable aws.ant aws.ivy and osgi modules
Modified: trunk/spring-build/debian/build.xml
===================================================================
--- trunk/spring-build/debian/build.xml 2010-06-19 11:13:38 UTC (rev 12586)
+++ trunk/spring-build/debian/build.xml 2010-06-20 09:57:06 UTC (rev 12587)
@@ -4,12 +4,24 @@
<target name="package">
<ant dir="${basedir}/org.springframework.build.ant"
target="jar" />
+ <ant dir="${basedir}/org.springframework.build.aws.ant"
target="jar" />
+ <ant dir="${basedir}/org.springframework.build.aws.ivy"
target="jar" />
+ <ant dir="${basedir}/org.springframework.build.osgi"
target="jar" />
</target>
<target name="clean">
- <ant dir="${basedir}/org.springframework.build.ant"
target="clean" />
- <ant dir="${basedir}/org.springframework.build.ant"
target="clean-integration" />
- <ant dir="${basedir}/org.springframework.build.ant"
target="clean-ivy" />
+ <ant dir="${basedir}/org.springframework.build.ant">
+ <target name="clean"/><target
name="clean-integration"/><target name="clean-ivy"/>
+ </ant>
+ <ant dir="${basedir}/org.springframework.build.aws.ant">
+ <target name="clean"/><target
name="clean-integration"/><target name="clean-ivy"/>
+ </ant>
+ <ant dir="${basedir}/org.springframework.build.aws.ant">
+ <target name="clean"/><target
name="clean-integration"/><target name="clean-ivy"/>
+ </ant>
+ <ant dir="${basedir}/org.springframework.build.osgi">
+ <target name="clean"/><target
name="clean-integration"/><target name="clean-ivy"/>
+ </ant>
</target>
</project>
Modified: trunk/spring-build/debian/control
===================================================================
--- trunk/spring-build/debian/control 2010-06-19 11:13:38 UTC (rev 12586)
+++ trunk/spring-build/debian/control 2010-06-20 09:57:06 UTC (rev 12587)
@@ -3,6 +3,7 @@
Priority: optional
Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant (>= 1.8.0),
maven-repo-helper, ivy, libecj-java, libcommons-net-java,
+ libcommons-httpclient-java, libjets3t-java, libequinox-osgi-java,
libspring-build-java
Maintainer: Damien Raude-Morvan <draz...@debian.org>
Standards-Version: 3.8.4
Deleted: trunk/spring-build/debian/libspring-build-java.poms
===================================================================
--- trunk/spring-build/debian/libspring-build-java.poms 2010-06-19 11:13:38 UTC
(rev 12586)
+++ trunk/spring-build/debian/libspring-build-java.poms 2010-06-20 09:57:06 UTC
(rev 12587)
@@ -1 +0,0 @@
-debian/poms/ant.xml
Modified: trunk/spring-build/debian/patches/ivy_artifact.diff
===================================================================
--- trunk/spring-build/debian/patches/ivy_artifact.diff 2010-06-19 11:13:38 UTC
(rev 12586)
+++ trunk/spring-build/debian/patches/ivy_artifact.diff 2010-06-20 09:57:06 UTC
(rev 12587)
@@ -5,14 +5,16 @@
Last-Update: 2010-06-19
--- a/org.springframework.build.ant/ivy.xml
+++ b/org.springframework.build.ant/ivy.xml
-@@ -19,8 +19,8 @@
+@@ -19,8 +19,10 @@
</publications>
<dependencies>
- <dependency org="org.apache.ant"
name="com.springsource.org.apache.tools.ant" rev="1.7.0"
conf="provided->compile"/>
- <dependency org="org.apache.commons"
name="com.springsource.org.apache.commons.net" rev="1.4.1"
conf="provided->compile"/>
++<!--
+ <dependency org="org.apache.ant" name="ant" rev="debian"
conf="provided->compile"/>
+ <dependency org="commons-net" name="commons-net" rev="2.x"
conf="provided->compile"/>
++-->
</dependencies>
</ivy-module>
@@ -99,3 +101,44 @@
-</project>
\ No newline at end of file
+</project>
+--- a/org.springframework.build.aws.ant/ivy.xml
++++ b/org.springframework.build.aws.ant/ivy.xml
+@@ -19,8 +19,10 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="org.apache.ant"
name="com.springsource.org.apache.tools.ant" rev="1.7.0"
conf="provided->compile"/>
+ <dependency org="org.jets3t" name="com.springsource.org.jets3t"
rev="0.6.1" conf="compile->compile;runtime->runtime"/>
++-->
+ </dependencies>
+
+ </ivy-module>
+--- a/org.springframework.build.aws.ivy/ivy.xml
++++ b/org.springframework.build.aws.ivy/ivy.xml
+@@ -19,9 +19,11 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="org.jets3t" name="com.springsource.org.jets3t"
rev="0.6.0" conf="compile->default;runtime->runtime"/>
+ <dependency org="org.apache.ant"
name="com.springsource.org.apache.ivy" rev="2.0.0.beta2"
conf="compile->compile"/>
+ <dependency org="org.apache.commons"
name="com.springsource.org.apache.commons.httpclient" rev="3.1.0"
conf="runtime->runtime"/>
++-->
+ </dependencies>
+
+ </ivy-module>
+--- a/org.springframework.build.osgi/ivy.xml
++++ b/org.springframework.build.osgi/ivy.xml
+@@ -19,9 +19,11 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="org.apache.ant"
name="com.springsource.org.apache.tools.ant" rev="1.7.0"
conf="provided->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.osgi"
rev="3.5.0.v20090311-1300" conf="compile->runtime"/>
+ <dependency org="org.junit" name="com.springsource.org.junit"
rev="4.4.0" conf="test->runtime"/>
++-->
+ </dependencies>
+
+ </ivy-module>
Added: trunk/spring-build/debian/poms/aws.ant.xml
===================================================================
--- trunk/spring-build/debian/poms/aws.ant.xml (rev 0)
+++ trunk/spring-build/debian/poms/aws.ant.xml 2010-06-20 09:57:06 UTC (rev
12587)
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework.build</groupId>
+ <artifactId>org.springframework.build.aws.ant</artifactId>
+ <version>debian</version>
+ <packaging>jar</packaging>
+ <description>Spring Build - Ant Module</description>
+</project>
Added: trunk/spring-build/debian/poms/aws.ivy.xml
===================================================================
--- trunk/spring-build/debian/poms/aws.ivy.xml (rev 0)
+++ trunk/spring-build/debian/poms/aws.ivy.xml 2010-06-20 09:57:06 UTC (rev
12587)
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework.build</groupId>
+ <artifactId>org.springframework.build.aws.ivy</artifactId>
+ <version>debian</version>
+ <packaging>jar</packaging>
+ <description>Spring Build - Ant Module</description>
+</project>
Added: trunk/spring-build/debian/poms/osgi.xml
===================================================================
--- trunk/spring-build/debian/poms/osgi.xml (rev 0)
+++ trunk/spring-build/debian/poms/osgi.xml 2010-06-20 09:57:06 UTC (rev
12587)
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework.build</groupId>
+ <artifactId>org.springframework.build.osgi</artifactId>
+ <version>debian</version>
+ <packaging>jar</packaging>
+ <description>Spring Build - Ant Module</description>
+</project>
Modified: trunk/spring-build/debian/rules
===================================================================
--- trunk/spring-build/debian/rules 2010-06-19 11:13:38 UTC (rev 12586)
+++ trunk/spring-build/debian/rules 2010-06-20 09:57:06 UTC (rev 12587)
@@ -4,18 +4,30 @@
include /usr/share/cdbs/1/rules/debhelper.mk
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ivy commons-net
+DEB_JARS := ivy commons-net commons-httpclient jets3t
org.eclipse.osgi
DEB_ANT_BUILDFILE := debian/build.xml
+MODULES = ant aws.ant aws.ivy osgi
+PRJ_ROOT = org.springframework.build
+ARTIFACT_ROOT = target/artifacts/org.springframework.build
+
makebuilddir::
- -(cd org.springframework.build.ant; ln -s ../project-build spring-build)
+ -for MYMOD in $(MODULES); do \
+ (cd org.springframework.build.$$MYMOD; ln -s ../project-build
spring-build); \
+ done
binary-post-install/libspring-build-java::
- mh_installpoms -plibspring-build-java
- mh_installjar -plibspring-build-java -l debian/poms/ant.xml
org.springframework.build.ant/target/artifacts/org.springframework.build.ant.jar
+ for MYMOD in $(MODULES); do \
+ POM=`echo debian/poms/$$MYMOD.xml`; \
+ JAR=`echo $(PRJ_ROOT).$$MYMOD/$(ARTIFACT_ROOT).$$MYMOD.jar`; \
+ mh_installpom -plibspring-build-java $$POM ; \
+ mh_installjar -plibspring-build-java -l $$POM $$JAR ; \
+ done
clean::
- -rm org.springframework.build.ant/spring-build
+ -for MYMOD in $(MODULES); do \
+ rm org.springframework.build.$$MYMOD/spring-build; \
+ done
-rm project-build/project-build
-rm -rf debian/tmp
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
