X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=00e3e40f2bd67d5f89b34fd7b818003d820a0bd2;hb=ee9d0c3d15494dc2dd73fedf44994b689847aa9b;hp=68d0c043bfaeb9bc90e7257b56ac6a8b35a27191;hpb=cc6ff151e49ae2d9af3fe4c15719f1787bb27ee7;p=jalview.git diff --git a/build.gradle b/build.gradle index 68d0c04..00e3e40 100644 --- a/build.gradle +++ b/build.gradle @@ -94,7 +94,7 @@ ext { } //// // Set JALVIEW_VERSION if it is not already set - if (findProperty(JALVIEW_VERSION)==null || "".equals(JALVIEW_VERSION)) { + if (findProperty("JALVIEW_VERSION")==null || "".equals(JALVIEW_VERSION)) { JALVIEW_VERSION = releaseProps.get("jalview.version") } @@ -1141,13 +1141,12 @@ task linkCheck(type: JavaExec) { args = [ "${classesDir}/${help_dir}", "-nointernet" ] def outFOS = new FileOutputStream(helpLinksCheckerOutFile, false) // false == don't append - def errFOS = outFOS standardOutput = new org.apache.tools.ant.util.TeeOutputStream( outFOS, - standardOutput) + System.out) errorOutput = new org.apache.tools.ant.util.TeeOutputStream( outFOS, - errorOutput) + System.err) inputs.dir("${classesDir}/${help_dir}") outputs.file(helpLinksCheckerOutFile) @@ -1704,6 +1703,7 @@ task installers(type: com.install4j.gradle.Install4jTask) { task sourceDist(type: Tar) { + dependsOn createBuildProperties def VERSION_UNDERSCORES = JALVIEW_VERSION.replaceAll("\\.", "_") def outputFileName = "${project.name}_${VERSION_UNDERSCORES}.tar.gz" @@ -1795,6 +1795,15 @@ task sourceDist(type: Tar) { // exclude(EXCLUDE_FILES) // exclude(PROCESS_FILES) // } + + from(file(buildProperties).getParent()) { + include(file(buildProperties).getName()) + rename(file(buildProperties).getName(), "build_properties") + filter({ line -> + line.replaceAll("^INSTALLATION=.*\$","INSTALLATION=Source Release"+" git-commit\\\\:"+gitHash+" ["+gitBranch+"]") + }) + } + }