File: fix_debian_build.patch

package info (click to toggle)
barclay 2.1.0-3.1
  • links: PTS, VCS
  • area: main
  • in suites: bullseye
  • size: 1,248 kB
  • sloc: java: 7,262; sh: 673; xml: 64; makefile: 27
file content (73 lines) | stat: -rw-r--r-- 2,370 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
--- a/build.gradle
+++ b/build.gradle
@@ -4,8 +4,7 @@
     id "java"
     id 'maven'
     id 'signing'
-    id 'jacoco'
-    id 'com.palantir.git-version' version '0.5.1' //version helper
+    // id 'jacoco'
 }
 
 sourceCompatibility = 1.8
@@ -14,7 +13,17 @@
 group = 'org.broadinstitute'
 
 final isRelease = Boolean.getBoolean("release")
-version = (isRelease ? gitVersion() : gitVersion() + "-SNAPSHOT").replaceAll(".dirty", "")
+def getDebianVersion() {
+    def dpkgStdOut = new ByteArrayOutputStream()
+    exec {
+        commandLine "dpkg-parsechangelog", "-S", "Version"
+        standardOutput = dpkgStdOut
+    }
+    return dpkgStdOut.toString().trim().replaceFirst(/(-gradle)?([+]dfsg[.0-9]*)?-[^-]+$/, "")
+}
+
+version = getDebianVersion()
+//version = (isRelease ? gitVersion() : gitVersion() + "-SNAPSHOT").replaceAll(".dirty", "")
 
 repositories {
     mavenCentral()
@@ -25,6 +34,7 @@
     mavenLocal()
 }
 
+/*
 jacocoTestReport {
     dependsOn test
     group = "Reporting"
@@ -36,12 +46,13 @@
         html.enabled = true
     }
 }
+*/
 
 compileJava {
-    options.compilerArgs = ['-proc:none', '-Xlint:all','-Werror','-Xdiags:verbose']
+    options.compilerArgs = ['-proc:none', '-Xlint:all','-Xdiags:verbose']
 }
 compileTestJava {
-    options.compilerArgs = ['-proc:none', '-Xlint:all','-Werror','-Xdiags:verbose']
+    options.compilerArgs = ['-proc:none', '-Xlint:all','-Xdiags:verbose']
 }
 dependencies {
     compile 'net.sf.jopt-simple:jopt-simple:5.0.3'
@@ -52,13 +63,13 @@
     // Get the jdk files we need to run javaDoc. We need to use these during compile, testCompile,
     // test execution, and gatkDoc generation, but we don't want them as part of the runtime
     // classpath and we don't want to redistribute them in the uber jar.
-    final javadocJDKFiles = files(((URLClassLoader) ToolProvider.getSystemToolClassLoader()).getURLs())
-    compileOnly(javadocJDKFiles)
-    testCompile(javadocJDKFiles)
+    //final javadocJDKFiles = files(((URLClassLoader) ToolProvider.getSystemToolClassLoader()).getURLs())
+    //compileOnly(javadocJDKFiles)
+    //testCompile(javadocJDKFiles)
     compile 'org.freemarker:freemarker:2.3.23'
     compile 'com.google.code.gson:gson:2.2.2'
 
-    testCompile 'org.testng:testng:6.9.6'
+    testCompile 'org.testng:testng:debian'
     testCompile 'org.mockito:mockito-core:2.10.0'
 }