[pkg-java] r11107 - trunk/commons-jci/debian

Damien Raude-Morvan drazzib at alioth.debian.org
Mon Nov 23 23:30:53 UTC 2009


Author: drazzib
Date: 2009-11-23 23:30:53 +0000 (Mon, 23 Nov 2009)
New Revision: 11107

Added:
   trunk/commons-jci/debian/build.properties
   trunk/commons-jci/debian/libcommons-jci-eclipse-java.poms
   trunk/commons-jci/debian/libcommons-jci-groovy-java.poms
   trunk/commons-jci/debian/libcommons-jci-janino-java.poms
   trunk/commons-jci/debian/libcommons-jci-java.poms
   trunk/commons-jci/debian/libcommons-jci-rhino-java.poms
   trunk/commons-jci/debian/maven.rules
Modified:
   trunk/commons-jci/debian/build.xml
   trunk/commons-jci/debian/changelog
   trunk/commons-jci/debian/compat
   trunk/commons-jci/debian/control
   trunk/commons-jci/debian/libcommons-jci-java-doc.docs
   trunk/commons-jci/debian/rules
Log:
* Bump Standards-Version 3.8.3 (no changes needed)
* Bump debhelper version to 7
* Maven POMs:
  - Add a Build-Depends-Indep dependency on maven-repo-helper
  - Use mh_installpoms and mh_installjar to install the POM and the jar to the
    Maven repository
* Maven ant helper (build system):
  - Add a Build-Depends dependency on maven-ant-helper
  - Update debian/build.xml to use /usr/share/maven-ant-helper/maven-build.xml
  - Build classpath is now defined in debian/build.properties
* Use default-jdk:
  - Build-Depend on default-jdk instead of openjdk-6-jdk
  - Depends on default-jre-headless
  - Use /usr/lib/jvm/default-java as JAVA_HOME

Added: trunk/commons-jci/debian/build.properties
===================================================================
--- trunk/commons-jci/debian/build.properties	                        (rev 0)
+++ trunk/commons-jci/debian/build.properties	2009-11-23 23:30:53 UTC (rev 11107)
@@ -0,0 +1,14 @@
+maven.test.skip=true
+maven.jar.manifest.classpath.add=true
+build.javaVersion=1.5
+classpath.compile = \
+            /usr/share/java/commons-io.jar:\
+            /usr/share/java/commons-lang.jar:\
+            /usr/share/java/commons-logging.jar:\
+            /usr/share/java/asm2.jar:\
+            /usr/share/java/groovy.jar:\
+            /usr/share/java/js.jar:\
+            /usr/share/java/janino.jar:\
+            /usr/share/java/eclipse-ecj.jar:\
+            ${basedir}/fam/build/commons-jci-fam-${version}.jar:\
+            ${basedir}/core/build/commons-jci-core-${version}.jar

Modified: trunk/commons-jci/debian/build.xml
===================================================================
--- trunk/commons-jci/debian/build.xml	2009-11-23 23:28:16 UTC (rev 11106)
+++ trunk/commons-jci/debian/build.xml	2009-11-23 23:30:53 UTC (rev 11107)
@@ -1,185 +1,58 @@
 <?xml version="1.0"?>
-<project name="javaflow" basedir="..">
+<project name="commons-jci" default="package" basedir="..">
 
+  <property file="debian/build.properties"/>
+  <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
+  <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
 
+  <macrodef name="cleanmodule">
+    <attribute name="dir"/>
+    <sequential>
+      <ant target="clean" antfile="${maven.build}" dir="@{dir}">
+        <property name="debian.dir" location="debian" />
+        <property name="project.dir" value="@{dir}" />
+      </ant>
+    </sequential>
+  </macrodef>
 
-<target name="init">
-	<property name="build.dir" value="build"/>
-	<property name="dist.dir" value="dist"/>
-	
-	<property name="fam.src.dir" value="fam/src/main"/>
-	<property name="fam.build.dir" value="${build.dir}/fam"/>
-	<property name="fam.jar" value="${dist.dir}/${deb.package}-${deb.version}-fam.jar"/>
-	<property name="core.src.dir" value="core/src/main"/>
-	<property name="core.build.dir" value="${build.dir}/core"/>
-	<property name="core.jar" value="${dist.dir}/${deb.package}-${deb.version}-core.jar"/>
-	
-	<property name="groovy.src.dir" value="compilers/groovy/src/main"/>
-	<property name="groovy.build.dir" value="${build.dir}/groovy"/>
-	<property name="groovy.jar" value="${dist.dir}/${deb.package}-${deb.version}-groovy.jar"/>
-	
-	<property name="rhino.src.dir" value="compilers/rhino/src/main"/>
-	<property name="rhino.build.dir" value="${build.dir}/rhino"/>
-	<property name="rhino.jar" value="${dist.dir}/${deb.package}-${deb.version}-rhino.jar"/>
-	
-	<property name="janino.src.dir" value="compilers/janino/src/main"/>
-	<property name="janino.build.dir" value="${build.dir}/janino"/>
-	<property name="janino.jar" value="${dist.dir}/${deb.package}-${deb.version}-janino.jar"/>
-	
-	<property name="eclipse.src.dir" value="compilers/eclipse/src/main"/>
-	<property name="eclipse.build.dir" value="${build.dir}/eclipse"/>
-	<property name="eclipse.jar" value="${dist.dir}/${deb.package}-${deb.version}-eclipse.jar"/>
-	
-	<property name="jsr199.src.dir" value="compilers/jsr199/src/main"/>
-	<property name="jsr199.build.dir" value="${build.dir}/jsr199"/>
-	<property name="jsr199.jar" value="${dist.dir}/${deb.package}-${deb.version}-jsr199.jar"/>
-</target>
+  <macrodef name="packagemodule">
+    <attribute name="dir"/>
+    <sequential>
+      <ant target="package" antfile="${maven.build}" dir="@{dir}">
+        <property name="debian.dir" location="debian" />
+        <property name="project.dir" value="@{dir}" />
+      </ant>
+    </sequential>
+  </macrodef>
 
+  <target name="clean">
+    <delete dir="build"/>
+    <cleanmodule dir="fam"/>
+    <cleanmodule dir="core"/>
+    <cleanmodule dir="compilers/groovy"/>
+    <cleanmodule dir="compilers/rhino"/>
+    <cleanmodule dir="compilers/janino"/>
+    <cleanmodule dir="compilers/eclipse"/>
+  </target>
 
+  <target name="package">
+    <packagemodule dir="fam"/>
+    <packagemodule dir="core"/>
+    <packagemodule dir="compilers/groovy"/>
+    <packagemodule dir="compilers/rhino"/>
+    <packagemodule dir="compilers/janino"/>
+    <packagemodule dir="compilers/eclipse"/>
+  </target>
 
-<target name="compile.fam" depends="init">
-	<mkdir dir="${fam.build.dir}"/>
-	<javac srcdir="${fam.src.dir}"
-			destdir="${fam.build.dir}"
-			source="1.4" target="1.4"
-			debug="on">
-	</javac>
-</target>
+  <target name="javadoc">
+    <javadoc destdir="${javadoc.dir}">
+      <packageset dir="fam/src/main/java/"/>
+      <packageset dir="core/src/main/java/"/>
+      <packageset dir="compilers/groovy/src/main/java/"/>
+      <packageset dir="compilers/rhino/src/main/java/"/>
+      <packageset dir="compilers/janino/src/main/java/"/>
+      <packageset dir="compilers/eclipse/src/main/java/"/>
+    </javadoc>
+  </target>
 
-<target name="compile.core" depends="compile.fam">
-	<mkdir dir="${core.build.dir}"/>
-	<javac srcdir="${core.src.dir}"
-			destdir="${core.build.dir}"
-			classpath="${fam.build.dir}"
-			source="1.4" target="1.4"
-			debug="on">
-	</javac>
-</target>
-
-<target name="compile.rhino" depends="compile.core">
-	<mkdir dir="${rhino.build.dir}"/>
-	<javac srcdir="${rhino.src.dir}"
-			destdir="${rhino.build.dir}"
-			classpath="${fam.build.dir}:${core.build.dir}"
-			source="1.4" target="1.4"
-			debug="on">
-	</javac>
-</target>
-
-<target name="compile.groovy" depends="compile.core">
-	<mkdir dir="${groovy.build.dir}"/>
-	<javac srcdir="${groovy.src.dir}"
-			destdir="${groovy.build.dir}"
-			classpath="${fam.build.dir}:${core.build.dir}"
-			source="1.4" target="1.4"
-			debug="on">
-	</javac>
-</target>
-
-<target name="compile.janino" depends="compile.core">
-	<mkdir dir="${janino.build.dir}"/>
-	<javac srcdir="${janino.src.dir}"
-			destdir="${janino.build.dir}"
-			classpath="${fam.build.dir}:${core.build.dir}"
-			source="1.4" target="1.4"
-			debug="on">
-	</javac>
-</target>
-
-<target name="compile.eclipse" depends="compile.core">
-	<mkdir dir="${eclipse.build.dir}"/>
-	<javac srcdir="${eclipse.src.dir}"
-			destdir="${eclipse.build.dir}"
-			classpath="${fam.build.dir}:${core.build.dir}"
-			source="1.4" target="1.4"
-			debug="on">
-	</javac>
-</target>
-<!--
-<target name="compile.jsr199" depends="compile.core">
-	<mkdir dir="${jsr199.build.dir}"/>
-	<javac srcdir="${jsr199.src.dir}"
-			destdir="${jsr199.build.dir}"
-			classpath="${fam.build.dir}:${core.build.dir}"
-			source="1.6" target="1.6"
-			debug="on">
-	</javac>
-</target>
--->
-
-<target name="jar.fam" depends="compile.fam">
-	<jar jarfile="${fam.jar}"
-			basedir="${fam.build.dir}" />
-</target>
-
-<target name="jar.core" depends="compile.core">
-	<jar jarfile="${core.jar}"
-			basedir="${core.build.dir}" />
-</target>
-
-<target name="jar.rhino" depends="compile.rhino">
-	<jar jarfile="${rhino.jar}"
-			basedir="${rhino.build.dir}" />
-</target>
-
-<target name="jar.groovy" depends="compile.groovy">
-	<jar jarfile="${groovy.jar}"
-			basedir="${groovy.build.dir}" />
-</target>
-
-<target name="jar.janino" depends="compile.janino">
-	<jar jarfile="${janino.jar}"
-			basedir="${janino.build.dir}" />
-</target>
-
-<target name="jar.eclipse" depends="compile.eclipse">
-	<jar jarfile="${eclipse.jar}"
-			basedir="${eclipse.build.dir}" />
-</target>
-<!--
-<target name="jar.jsr199" depends="compile.jsr199">
-	<jar jarfile="${jsr199.jar}"
-			basedir="${jsr199.build.dir}" />
-</target>
--->
-
-<target name="jar.all" depends="jar.fam, jar.core, jar.rhino, jar.groovy, jar.janino, jar.eclipse">
-</target>
-
-<target name="javadoc">
-
-	<javadoc
-		packagenames="*"
-		destdir="${dist.dir}/api"
-		access="protected"
-		old="false"
-		verbose="false"
-		version="true"
-		use="true"
-		author="true"
-		>
-		<fileset dir=".">
-			<include name="${fam.src.dir}/**/*.java"/>
-			<include name="${core.src.dir}/**/*.java"/>
-			<include name="${rhino.src.dir}/**/*.java"/>
-			<include name="${groovy.src.dir}/**/*.java"/>
-			<include name="${janino.src.dir}/**/*.java"/>
-			<include name="${eclipse.src.dir}/**/*.java"/>
-		</fileset>
-	</javadoc>
-
-</target>
-
-
-
-<target name="clean" depends="init">
-	<delete dir="${build.dir}"/>
-	<delete dir="${dist.dir}"/>
-
-	<mkdir dir="${build.dir}"/>
-	<mkdir dir="${dist.dir}"/>
-</target>
-
-
-
 </project>

Modified: trunk/commons-jci/debian/changelog
===================================================================
--- trunk/commons-jci/debian/changelog	2009-11-23 23:28:16 UTC (rev 11106)
+++ trunk/commons-jci/debian/changelog	2009-11-23 23:30:53 UTC (rev 11107)
@@ -1,8 +1,22 @@
-commons-jci (1.0-3) UNRELEASED; urgency=low
+commons-jci (1.0-3) unstable; urgency=low
 
   * Update my email address
+  * Bump Standards-Version 3.8.3 (no changes needed)
+  * Bump debhelper version to 7
+  * Maven POMs:
+    - Add a Build-Depends-Indep dependency on maven-repo-helper
+    - Use mh_installpoms and mh_installjar to install the POM and the jar to the
+      Maven repository
+  * Maven ant helper (build system):
+    - Add a Build-Depends dependency on maven-ant-helper
+    - Update debian/build.xml to use /usr/share/maven-ant-helper/maven-build.xml
+    - Build classpath is now defined in debian/build.properties
+  * Use default-jdk:
+    - Build-Depend on default-jdk instead of openjdk-6-jdk
+    - Depends on default-jre-headless
+    - Use /usr/lib/jvm/default-java as JAVA_HOME
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 24 Oct 2009 21:06:00 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 24 Nov 2009 00:29:48 +0100
 
 commons-jci (1.0-2) unstable; urgency=low
 

Modified: trunk/commons-jci/debian/compat
===================================================================
--- trunk/commons-jci/debian/compat	2009-11-23 23:28:16 UTC (rev 11106)
+++ trunk/commons-jci/debian/compat	2009-11-23 23:30:53 UTC (rev 11107)
@@ -1 +1 @@
-5
+7

Modified: trunk/commons-jci/debian/control
===================================================================
--- trunk/commons-jci/debian/control	2009-11-23 23:28:16 UTC (rev 11106)
+++ trunk/commons-jci/debian/control	2009-11-23 23:30:53 UTC (rev 11107)
@@ -1,14 +1,15 @@
 Source: commons-jci
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Section: java
 Priority: optional
-Build-Depends: openjdk-6-jdk, ant, debhelper (>= 5), cdbs, quilt
-Build-Depends-Indep: libcommons-io-java, libcommons-lang-java, libcommons-logging-java, libasm2-java, groovy, rhino, janino, libecj-java
+Build-Depends: default-jdk, ant, debhelper (>= 7), cdbs, quilt, maven-ant-helper
+Build-Depends-Indep: libcommons-io-java, libcommons-lang-java, libcommons-logging-java,
+ libasm2-java, groovy, rhino, janino, libecj-java, maven-repo-helper
 Homepage: http://commons.apache.org/jci/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-jci
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-jci
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-jci/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-jci/
 
 Package: libcommons-jci-java
 Architecture: all
@@ -82,7 +83,7 @@
 
 #Package: libcommons-jci-jsr199-java
 #Architecture: all
-#Depends: ${misc:Depends}, openjdk-6-jre-headless | java6-runtime-headless, libcommons-jci-java (= ${source:Version})
+#Depends: ${misc:Depends}, default-jre-headless | java6-runtime-headless, libcommons-jci-java (= ${source:Version})
 #Description: common Java interface for various compilers - Java6 JSR199
 # Commons JCI is a common Java compiler interface for various compilers.
 # .

Added: trunk/commons-jci/debian/libcommons-jci-eclipse-java.poms
===================================================================
--- trunk/commons-jci/debian/libcommons-jci-eclipse-java.poms	                        (rev 0)
+++ trunk/commons-jci/debian/libcommons-jci-eclipse-java.poms	2009-11-23 23:30:53 UTC (rev 11107)
@@ -0,0 +1 @@
+compilers/eclipse/pom.xml

Added: trunk/commons-jci/debian/libcommons-jci-groovy-java.poms
===================================================================
--- trunk/commons-jci/debian/libcommons-jci-groovy-java.poms	                        (rev 0)
+++ trunk/commons-jci/debian/libcommons-jci-groovy-java.poms	2009-11-23 23:30:53 UTC (rev 11107)
@@ -0,0 +1 @@
+compilers/groovy/pom.xml

Added: trunk/commons-jci/debian/libcommons-jci-janino-java.poms
===================================================================
--- trunk/commons-jci/debian/libcommons-jci-janino-java.poms	                        (rev 0)
+++ trunk/commons-jci/debian/libcommons-jci-janino-java.poms	2009-11-23 23:30:53 UTC (rev 11107)
@@ -0,0 +1 @@
+compilers/janino/pom.xml

Modified: trunk/commons-jci/debian/libcommons-jci-java-doc.docs
===================================================================
--- trunk/commons-jci/debian/libcommons-jci-java-doc.docs	2009-11-23 23:28:16 UTC (rev 11106)
+++ trunk/commons-jci/debian/libcommons-jci-java-doc.docs	2009-11-23 23:30:53 UTC (rev 11107)
@@ -1 +1 @@
-dist/api
+build/docs/api

Added: trunk/commons-jci/debian/libcommons-jci-java.poms
===================================================================
--- trunk/commons-jci/debian/libcommons-jci-java.poms	                        (rev 0)
+++ trunk/commons-jci/debian/libcommons-jci-java.poms	2009-11-23 23:30:53 UTC (rev 11107)
@@ -0,0 +1,3 @@
+pom.xml --no-parent
+core/pom.xml
+fam/pom.xml

Added: trunk/commons-jci/debian/libcommons-jci-rhino-java.poms
===================================================================
--- trunk/commons-jci/debian/libcommons-jci-rhino-java.poms	                        (rev 0)
+++ trunk/commons-jci/debian/libcommons-jci-rhino-java.poms	2009-11-23 23:30:53 UTC (rev 11107)
@@ -0,0 +1 @@
+compilers/rhino/pom.xml

Added: trunk/commons-jci/debian/maven.rules
===================================================================
--- trunk/commons-jci/debian/maven.rules	                        (rev 0)
+++ trunk/commons-jci/debian/maven.rules	2009-11-23 23:30:53 UTC (rev 11107)
@@ -0,0 +1,4 @@
+commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/
+junit junit jar s/3\..*/3.x/
+org.apache.maven.plugins maven-surefire-plugin maven-plugin s/.*/2.4.3/
+s/groovy/org.codehaus.groovy/ s/groovy-all/groovy/ * s/.*/debian/

Modified: trunk/commons-jci/debian/rules
===================================================================
--- trunk/commons-jci/debian/rules	2009-11-23 23:28:16 UTC (rev 11106)
+++ trunk/commons-jci/debian/rules	2009-11-23 23:30:53 UTC (rev 11107)
@@ -4,39 +4,35 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME            := /usr/lib/jvm/java-6-openjdk/
-ANT_HOME             := /usr/share/ant
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
 
-DEB_JARS             := commons-io commons-lang commons-logging \
-                        asm2 groovy js janino \
-                        eclipse-ecj
-
-DEB_ANT_BUILD_TARGET := jar.all javadoc
-DEB_ANT_CLEAN_TARGET := clean
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_JARS             := ant-nodeps
+DEB_ANT_BUILD_TARGET := package javadoc
 DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_ANT_ARGS         := -Ddeb.package=$(DEB_SOURCE_PACKAGE) -Ddeb.version=$(DEB_UPSTREAM_VERSION)
+DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
 
 binary-post-install/libcommons-jci-java::
-	dh_install -plibcommons-jci-java dist/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-fam.jar usr/share/java
-	dh_install -plibcommons-jci-java dist/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-core.jar usr/share/java
-	dh_link -plibcommons-jci-java usr/share/java/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-fam.jar usr/share/java/$(DEB_SOURCE_PACKAGE)-fam.jar
-	dh_link -plibcommons-jci-java usr/share/java/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-core.jar usr/share/java/$(DEB_SOURCE_PACKAGE)-core.jar
+	mh_installpoms -plibcommons-jci-java
+	mh_installjar -plibcommons-jci-java -l core/pom.xml core/build/commons-jci-core-$(VERSION).jar
+	mh_installjar -plibcommons-jci-java -l fam/pom.xml fam/build/commons-jci-fam-$(VERSION).jar
 
 binary-post-install/libcommons-jci-rhino-java::
-	dh_install -plibcommons-jci-rhino-java dist/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-rhino.jar usr/share/java
-	dh_link -plibcommons-jci-rhino-java usr/share/java/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-rhino.jar usr/share/java/$(DEB_SOURCE_PACKAGE)-rhino.jar
+	mh_installpoms -plibcommons-jci-rhino-java
+	mh_installjar -plibcommons-jci-rhino-java -l compilers/rhino/pom.xml compilers/rhino/build/commons-jci-rhino-$(VERSION).jar
 
 binary-post-install/libcommons-jci-groovy-java::
-	dh_install -plibcommons-jci-groovy-java dist/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-groovy.jar usr/share/java
-	dh_link -plibcommons-jci-groovy-java usr/share/java/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-groovy.jar usr/share/java/$(DEB_SOURCE_PACKAGE)-groovy.jar
+	mh_installpoms -plibcommons-jci-groovy-java
+	mh_installjar -plibcommons-jci-groovy-java -l compilers/groovy/pom.xml compilers/groovy/build/commons-jci-groovy-$(VERSION).jar
 
 binary-post-install/libcommons-jci-janino-java::
-	dh_install -plibcommons-jci-janino-java dist/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-janino.jar usr/share/java
-	dh_link -plibcommons-jci-janino-java usr/share/java/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-janino.jar usr/share/java/$(DEB_SOURCE_PACKAGE)-janino.jar
+	mh_installpoms -plibcommons-jci-janino-java
+	mh_installjar -plibcommons-jci-janino-java -l compilers/janino/pom.xml compilers/janino/build/commons-jci-janino-$(VERSION).jar
 
 binary-post-install/libcommons-jci-eclipse-java::
-	dh_install -plibcommons-jci-eclipse-java dist/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-eclipse.jar usr/share/java
-	dh_link -plibcommons-jci-eclipse-java usr/share/java/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-eclipse.jar usr/share/java/$(DEB_SOURCE_PACKAGE)-eclipse.jar
+	mh_installpoms -plibcommons-jci-eclipse-java
+	mh_installjar -plibcommons-jci-eclipse-java -l compilers/eclipse/pom.xml compilers/eclipse/build/commons-jci-eclipse-$(VERSION).jar
 
 get-orig-source:
 	uscan --force-download --rename




More information about the pkg-java-commits mailing list