diff options
Diffstat (limited to 'biology/gatk/files/patch-build.gradle')
| -rw-r--r-- | biology/gatk/files/patch-build.gradle | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/biology/gatk/files/patch-build.gradle b/biology/gatk/files/patch-build.gradle index 1469e66028c0..81e4d00ff340 100644 --- a/biology/gatk/files/patch-build.gradle +++ b/biology/gatk/files/patch-build.gradle @@ -1,6 +1,6 @@ ---- build.gradle.orig 2019-11-26 15:07:28 UTC +--- build.gradle.orig 2020-02-28 18:01:21 UTC +++ build.gradle -@@ -114,7 +114,7 @@ def resolveLargeResourceStubFiles(largeResourcesFolder +@@ -118,7 +118,7 @@ def resolveLargeResourceStubFiles(largeResourcesFolder } // check for stub files, try to pull once if there are any, then check again @@ -9,21 +9,21 @@ final gitLFSPullLargeResources = "git lfs pull --include $largeResourcesFolder" execGitLFSCommand(gitLFSPullLargeResources) if (checkForLFSStubFiles(largeResourcesFolder)) { -@@ -148,7 +148,7 @@ def ensureBuildPrerequisites(largeResourcesFolder, bui +@@ -152,7 +152,7 @@ def ensureBuildPrerequisites(largeResourcesFolder, bui if (!JavaVersion.current().isJava8() && !JavaVersion.current().isJava11()) { println("Warning: using Java ${JavaVersion.current()} but only Java 8 and Java 11 have been tested.") } -- if (!looksLikeWereInAGitRepository()) { -+ if (false && !looksLikeWereInAGitRepository()) { +- if (!skipGitCheck && !looksLikeWereInAGitRepository() ) { ++ if (false && !skipGitCheck && !looksLikeWereInAGitRepository() ) { throw new GradleException("This doesn't appear to be a git folder. " + "The GATK Github repository must be cloned using \"git clone\" to run the build. " + "\n$buildPrerequisitesMessage") -@@ -396,7 +396,7 @@ def createGatkSymlinks(destinationDir, archivePath, su - } +@@ -166,7 +166,7 @@ final isRelease = Boolean.getBoolean("release") + final versionOverridden = System.getProperty("versionOverride") != null - final isRelease = Boolean.getBoolean("release") --version = (isRelease ? gitVersion() : gitVersion() + "-SNAPSHOT").replaceAll(".dirty", "") + ensureBuildPrerequisites(largeResourcesFolder, buildPrerequisitesMessage, versionOverridden) +-version = (versionOverridden ? System.getProperty("versionOverride") : gitVersion().replaceAll(".dirty", "")) + (isRelease ? "" : "-SNAPSHOT") +version = (isRelease ? "1.0" : "1.0" + "-SNAPSHOT").replaceAll(".dirty", "") - logger.info("build for version:" + version) - group = 'org.broadinstitute' + if (versionOverridden) { + println "Version number overridden as " + version |