[bnd] 04/07: Build the Gradle plugin during the bootstrap phase

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Dec 17 08:58:10 UTC 2015


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

ebourg-guest pushed a commit to branch master
in repository bnd.

commit 045c17bb41a5ffc828cd929b85e606d7872dcdeb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 17 09:08:55 2015 +0100

    Build the Gradle plugin during the bootstrap phase
---
 debian/bootstrap.xml | 6 ++++++
 debian/changelog     | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/bootstrap.xml b/debian/bootstrap.xml
index fbdd7a7..2f66de0 100644
--- a/debian/bootstrap.xml
+++ b/debian/bootstrap.xml
@@ -28,11 +28,17 @@
         <copy
                 todir="bootstrap/build/aQute/bnd/ant/"
                 file="biz.aQute.bnd/src/aQute/bnd/ant/taskdef.properties" />
+
+        <!-- Build the Gradle plugin -->
+        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="/usr/share/java/groovy-all-2.x.jar"/>
+        <groovyc srcdir="biz.aQute.bnd.gradle/src" destdir="bootstrap/build" classpath="bootstrap/build:/usr/share/java/gradle-core.jar"></groovyc>
+
         <jar destfile="bootstrap/bnd.jar">
            <fileset dir="bootstrap/build/"/>
            <fileset dir="aQute.libg/src"       includes="**/packageinfo"/>
            <fileset dir="biz.aQute.bndlib/src" includes="**/packageinfo,**/*.bnd,**/*.info,**/*.txt,**/*.xml,**/*.properties"/>
            <fileset dir="biz.aQute.bnd/src"    includes="**/packageinfo,**/*.xml,**/*.xslt,**/*.xsl,**/*.bash"/>
+           <fileset dir="biz.aQute.bnd.gradle/resources" includes="**/*.properties"/>
         </jar>
     </target>
 
diff --git a/debian/changelog b/debian/changelog
index bbfc869..3a2340f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ bnd (2.4.0-1) UNRELEASED; urgency=medium
     - Build with Gradle instead of Ant
     - Refreshed debian/copyright
     - Require Java 6 or higher
+    - Build the Gradle plugin during the bootstrap phase
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 16 Dec 2015 12:54:06 +0100
 

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



More information about the pkg-java-commits mailing list