[med-svn] [Git][med-team/beagle][master] During build copy *.java files in SRC/ to avoid problem with jh_build

[Dylan Aïssi]

Dylan Aïssi pushed to branch master at Debian Med / beagle


Commits:
2382d551 by Dylan Aïssi at 2018-04-22T00:38:11+02:00
During build copy *.java files in SRC/ to avoid problem with jh_build

- - - - -


3 changed files:

- debian/changelog
- + debian/clean
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+beagle (4.1~180127+dfsg-2) UNRELEASED; urgency=medium
+
+  * During build copy *.java files in SRC/ to avoid problem with jh_build.
+
+ -- Dylan Aïssi <bob.dybian at gmail.com>  Sun, 22 Apr 2018 00:23:59 +0200
+
 beagle (4.1~180127+dfsg-1) unstable; urgency=medium
 
   [ Steffen Moeller ]


=====================================
debian/clean
=====================================
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+SRC/


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -7,11 +7,10 @@ export CLASSPATH=/usr/share/java/htsjdk.jar
 	dh $@ --with javahelper
 
 override_jh_build:
-	# This ugly thing below because jh_build search .java files in .pc folder so FTBFS...
-	rm -rf $(CURDIR)/.pc/
-	jh_build --javacopts="-source 1.8" --javadoc-opts="-source 1.8" --main="main.Main" beagle.jar $(CURDIR)
-	jh_build --javacopts="-source 1.8" --javadoc-opts="-source 1.8" --main="vcf.Bref" bref.jar $(CURDIR)
+	mkdir SRC/
+	cp -t SRC/ -r beagleutil blbutil dag haplotype ibd main sample vcf
+	jh_build --javacopts="-source 1.8" --javadoc-opts="-source 1.8" --main="main.Main" beagle.jar SRC/
+	jh_build --javacopts="-source 1.8" --javadoc-opts="-source 1.8" --main="vcf.Bref" bref.jar SRC/
 
 override_dh_installchangelogs:
 	dh_installchangelogs debian/upstream.docs/release_notes
-



View it on GitLab: https://salsa.debian.org/med-team/beagle/commit/2382d5513fa47193075ba112fa39fe54f7ce99f8

---
View it on GitLab: https://salsa.debian.org/med-team/beagle/commit/2382d5513fa47193075ba112fa39fe54f7ce99f8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180421/925b0df8/attachment-0001.html>