[bnd] 05/06: Build with Gradle instead of Ant

[Emmanuel Bourg]

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

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

commit 5fd581d03c3872b5ce12271f0ec6e4ec377c5a4b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 16 16:14:15 2015 +0100

    Build with Gradle instead of Ant
---
 debian/changelog |  1 +
 debian/control   |  4 +---
 debian/docs      |  2 +-
 debian/rules     | 35 +++++++++++++++++++++++++++++------
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1093800..72a44e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ bnd (2.3.0-1) UNRELEASED; urgency=medium
     - Refreshed the patches
     - Fixed a build failure with Gradle 2.x
     - Updated the Maven poms
+    - Build with Gradle instead of Ant
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 16 Dec 2015 12:54:06 +0100
 
diff --git a/debian/control b/debian/control
index e63aa73..e3b8919 100644
--- a/debian/control
+++ b/debian/control
@@ -9,13 +9,12 @@ Uploaders:
  Emmanuel Bourg <ebourg at apache.org>
 Build-Depends:
  ant,
- ant-contrib,
- ant-optional,
  debhelper (>= 9),
  default-jdk,
  eclipse-jdt,
  eclipse-rcp,
  findbugs,
+ gradle-debian-helper,
  javahelper,
  junit,
  junit4,
@@ -23,7 +22,6 @@ Build-Depends:
  libosgi-compendium-java (>= 5.0.0),
  libosgi-core-java (>= 6.0.0),
  libswt-gtk-3-java,
- maven-ant-helper,
  maven-repo-helper
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/bnd.git
diff --git a/debian/docs b/debian/docs
index e845566..b43bf86 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-README
+README.md
diff --git a/debian/rules b/debian/rules
index 36a4a54..dcb2439 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 MAVEN_REPO           := http://repo1.maven.org/maven2/biz/aQute/
-MAVEN_VERSION        := 2.2.0
+MAVEN_VERSION        := 2.3.0
 
 PACKAGE              := bnd
 VERSION              := $(MAVEN_VERSION)
@@ -9,7 +9,7 @@ VERSION              := $(MAVEN_VERSION)
 export JAVA_HOME = /usr/lib/jvm/default-java
 
 %:
-	dh $@ --buildsystem=ant
+	dh $@ --buildsystem=gradle
 
 override_dh_auto_build:
 	ant -f debian/bootstrap.xml
@@ -45,14 +45,16 @@ override_dh_auto_build:
 		cnf/repo/org.eclipse.core.jobs \
 		cnf/repo/org.eclipse.text \
 		cnf/repo/org.osgi.impl.bundle.bindex \
+		cnf/gradle/dependencies \
 		cnf/plugins/biz.aQute.bnd
-	ln -s -r bootstrap/bnd.jar cnf/plugins/biz.aQute.bnd/biz.aQute.bnd-2.2.0.jar
+	ln -s -r bootstrap/bnd.jar cnf/gradle/dependencies/biz.aQute.bnd.jar
 	ln -s /usr/share/java/junit.jar  cnf/repo/com.springsource.junit/com.springsource.junit-3.8.2.jar
 	ln -s /usr/share/java/junit4.jar cnf/repo/com.springsource.org.junit/com.springsource.org.junit-4.10.0.jar
+	ln -s /usr/share/java/junit4.jar cnf/repo/com.springsource.org.junit/com.springsource.org.junit-4.11.0.jar
 	ln -s /usr/share/java/junit.jar cnf/repo/junit.osgi/junit.osgi-3.8.2.jar
 	ln -s /usr/share/java/osgi.core.jar cnf/repo/org.eclipse.osgi/org.eclipse.osgi-3.5.0.jar
-	ln -s /usr/share/java/osgi.core.jar cnf/repo/osgi.core/osgi.core-4.2.1.jar
-	ln -s /usr/share/java/osgi.compendium.jar cnf/repo/osgi.cmpn/osgi.cmpn-4.3.0.jar
+	ln -s /usr/share/java/osgi.core.jar cnf/repo/osgi.core/osgi.core-4.3.1.jar
+	ln -s /usr/share/java/osgi.compendium.jar cnf/repo/osgi.cmpn/osgi.cmpn-4.3.1.jar
 #	ln -s /usr/share/java/ee.foundation.jar cnf/repo/ee.minimum/ee.minimum-1.2.1.jar
 	ln -s /usr/share/java/ant.jar cnf/repo/org.apache.tools.ant/org.apache.tools.ant-1.7.1.jar
 	ln -s /usr/lib/eclipse/plugins/org.eclipse.core.runtime_*.jar cnf/repo/org.eclipse.core.runtime/org.eclipse.core.runtime-3.3.100.jar
@@ -79,7 +81,19 @@ override_dh_auto_build:
 	ln -s /usr/lib/eclipse/plugins/org.eclipse.text_*.jar cnf/repo/org.eclipse.text/org.eclipse.text-3.5.100.jar
 	ln -s /usr/share/java/bindex.jar cnf/repo/org.osgi.impl.bundle.bindex/org.osgi.impl.bundle.bindex-2.2.0.jar
 
-	dh_auto_build -- build
+	dh_auto_build -- -x :biz.aQute.repository:compileJava \
+	                 -x :biz.aQute.repository:bundle \
+	                 -x :biz.aQute.repository.aether:compileJava \
+	                 -x :biz.aQute.repository.aether:bundle \
+	                 -x :biz.aQute.resolve:compileJava \
+	                 -x :biz.aQute.resolve:bundle \
+	                 -x :demo:compileJava \
+	                 -x :demo:bundle \
+	                 -x :biz.aQute.bndlib.tests:compileJava \
+	                 -x :biz.aQute.bndoc:compileJava \
+	                 -x :biz.aQute.jpm:compileJava \
+	                 -x :biz.aQute.jpm:bundle \
+	                 -x :osgi.r5:bundle
 
 	pod2man -c 'BND for Debian GNU/Linux' \
 	  -r $(PACKAGE)-$(VERSION) \
@@ -101,6 +115,8 @@ override_dh_auto_install:
 	mv debian/$(PACKAGE)/usr/bin/bnd.sh debian/$(PACKAGE)/usr/bin/bnd
 
 override_dh_auto_clean:
+	dh_auto_clean
+
 	-rm -f debian/stamp-bootstrap
 	-rm -rf aQute.libg/bin/
 	-rm -rf aQute.libg/generated/
@@ -112,6 +128,13 @@ override_dh_auto_clean:
 	-rm -rf biz.aQute.junit/generated/
 	-rm -rf biz.aQute.launcher/bin/
 	-rm -rf biz.aQute.launcher/generated/
+	-rm -rf biz.aQute.bnd.doc/bin/
+	-rm -rf biz.aQute.bnd.doc/generated/
+	-rm -rf biz.aQute.bndlib.tests/bin/
+	-rm -rf biz.aQute.bndoc/bin/
+	-rm -rf biz.aQute.jpm/bin/
+	-rm -rf biz.aQute.repository/bin/
+	-rm -rf biz.aQute.resolve/bin/
 	-find . -type l -name '*.jar' -delete
 	jh_clean
 	mh_clean

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