[med-svn] [picard-tools] 01/01: patch build system to ignore shadowjar

Sascha Steinbiss satta at debian.org
Sat Sep 10 14:09:13 UTC 2016


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

satta pushed a commit to branch master
in repository picard-tools.

commit 504bccbbd9e09d73edf30e53bd009dd048951f3b
Author: Sascha Steinbiss <satta at debian.org>
Date:   Sat Sep 10 13:53:51 2016 +0000

    patch build system to ignore shadowjar
---
 debian/patches/20-shadowjar.patch | 36 ++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 2 files changed, 37 insertions(+)

diff --git a/debian/patches/20-shadowjar.patch b/debian/patches/20-shadowjar.patch
new file mode 100644
index 0000000..a5f82b2
--- /dev/null
+++ b/debian/patches/20-shadowjar.patch
@@ -0,0 +1,36 @@
+--- a/build.gradle
++++ b/build.gradle
+@@ -56,7 +56,7 @@
+ 
+ defaultTasks 'all'
+ 
+-task all(dependsOn: ['jar', 'distZip', 'documentAll', 'shadowJar', 'currentJar'])
++task all(dependsOn: ['jar', 'distZip', 'documentAll'])
+ 
+ jar {
+     manifest {
+@@ -73,15 +73,15 @@
+     }
+ }
+ 
+-task currentJar(type: Copy){
+-    from shadowJar
+-    into new File(buildDir, "libs")
+-    rename { string -> "picard.jar"}
+-}
+-
+-shadowJar {
+-    finalizedBy currentJar
+-}
++//task currentJar(type: Copy){
++//    from shadowJar
++//    into new File(buildDir, "libs")
++//    rename { string -> "picard.jar"}
++//}
++
++//shadowJar {
++//    finalizedBy currentJar
++//}
+ 
+ tasks.withType(Test) {
+     outputs.upToDateWhen { false } // tests will always rerun
diff --git a/debian/patches/series b/debian/patches/series
index f94487d..1eb1076 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 10-build.xml.patch
+20-shadowjar.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/picard-tools.git



More information about the debian-med-commit mailing list