[pkg-java] r14748 - in trunk/net-luminis-build-plugin/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-07 17:07:01 +0000 (Wed, 07 Sep 2011)
New Revision: 14748

Added:
   trunk/net-luminis-build-plugin/debian/patches/fixbuildxml.patch
Modified:
   trunk/net-luminis-build-plugin/debian/patches/series
   trunk/net-luminis-build-plugin/debian/rules
Log:
Fixing build.xml

Added: trunk/net-luminis-build-plugin/debian/patches/fixbuildxml.patch
===================================================================
--- trunk/net-luminis-build-plugin/debian/patches/fixbuildxml.patch	                        (rev 0)
+++ trunk/net-luminis-build-plugin/debian/patches/fixbuildxml.patch	2011-09-07 17:07:01 UTC (rev 14748)
@@ -0,0 +1,52 @@
+Taken from:
+http://www.spinics.net/lists/fedora-package-review/msg213801.html
+Index: net-luminis-build-plugin-0.2.0/build.xml
+===================================================================
+--- net-luminis-build-plugin-0.2.0.orig/build.xml	2011-09-07 19:03:59.000000000 +0200
++++ net-luminis-build-plugin-0.2.0/build.xml	2011-09-07 19:04:04.000000000 +0200
+@@ -1,17 +1,30 @@
+-<project name="build-plugin" basedir="..">
+-    <target name="init" />
+-    <target name="build">
+-        <jar jarfile="deploy/net.luminis.build.plugin-0.2.0.jar" update="true">
+-            <fileset dir="classes">
+-                <include name="net/luminis/build/plugin/bnd/**" />
+-            </fileset>
+-            <fileset dir="shared/OSGI-OPT">
+-                <include name="NOTICE" />
+-                <include name="LICENSE" />
+-            </fileset>
+-            <zipfileset src="ext/bnd-0.0.238.jar" includes="**/*.class" />
+-        </jar>
++<project name="build-plugin" basedir=".">
++    <!-- set global properties for this build -->
++    <property name="src" location="src"/>
++    <property name="build" location="build"/>
++    <property name="dist"  location="dist"/>
++    <target name="init">
++        <!-- Create the time stamp -->
++        <tstamp/>
++        <!-- Create the build directory structure used by compile -->
++        <mkdir dir="${build}"/>
++    </target>
++    <target name="compile" depends="init"
++        description="compile the source " >
++        <!-- Compile the java code from ${src} into ${build} -->
++        <javac srcdir="${src}" destdir="${build}"/>
++    </target>
++    <target name="dist" depends="compile"
++        description="generate the distribution" >
++        <!-- Create the distribution directory -->
++        <mkdir dir="${dist}/lib"/>
++        <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
++        <jar jarfile="${dist}/lib/net.luminis.build.plugin-0.2.0.jar" update="true" basedir="${build}" />
++    </target>
++    <target name="clean"
++        description="clean up" >
++        <!-- Delete the ${build} and ${dist} directory trees -->
++        <delete dir="${build}"/>
++        <delete dir="${dist}"/>
+     </target>
+-    <target name="deploy" />
+-    <target name="clean" />
+ </project>

Modified: trunk/net-luminis-build-plugin/debian/patches/series
===================================================================
--- trunk/net-luminis-build-plugin/debian/patches/series	2011-09-07 16:58:16 UTC (rev 14747)
+++ trunk/net-luminis-build-plugin/debian/patches/series	2011-09-07 17:07:01 UTC (rev 14748)
@@ -0,0 +1 @@
+fixbuildxml.patch

Modified: trunk/net-luminis-build-plugin/debian/rules
===================================================================
--- trunk/net-luminis-build-plugin/debian/rules	2011-09-07 16:58:16 UTC (rev 14747)
+++ trunk/net-luminis-build-plugin/debian/rules	2011-09-07 17:07:01 UTC (rev 14748)
@@ -3,11 +3,14 @@
 export DH_VERBOSE=1
 
 JAVA_HOME=/usr/lib/jvm/default-java
-CLASSPATH=/usr/share/java/bnd.jar
+export CLASSPATH=/usr/share/java/bnd.jar
 #DEB_ANT_BUILD_TARGET := dist
 
 %:
 	dh $@
 
+override_dh_auto_build:
+	ant dist
+
 get-orig-source:
 	./debian/get-orig-source