From: Jim Procter Date: Fri, 26 Feb 2021 14:02:27 +0000 (+0000) Subject: Merge branch 'bug/JAL-3806_mappingCoversSequence' into releases/Release_2_11_1_Branch X-Git-Tag: Release_2_11_1_4~6 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=cb628aab46f9027e71b71203b322f96710e09990;hp=8bcec0698d13dede379ac8079d544d2da50e106c Merge branch 'bug/JAL-3806_mappingCoversSequence' into releases/Release_2_11_1_Branch --- diff --git a/RELEASE b/RELEASE index b5ce6d5..70a7383 100644 --- a/RELEASE +++ b/RELEASE @@ -1,2 +1,2 @@ jalview.release=releases/Release_2_11_1_Branch -jalview.version=2.11.1.3 +jalview.version=2.11.1.4 diff --git a/build.gradle b/build.gradle index b2e9af1..cbd65f2 100644 --- a/build.gradle +++ b/build.gradle @@ -1704,6 +1704,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 +1796,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+"]") + }) + } + } diff --git a/doc/building.html b/doc/building.html index 28206a6..4f4e1ae 100644 --- a/doc/building.html +++ b/doc/building.html @@ -4,82 +4,86 @@ - Building Jalview from Source - - + -