From: Ben Soares <b.soares@dundee.ac.uk>
Date: Fri, 4 Dec 2020 18:31:32 +0000 (+0000)
Subject: JAL-3754 fixed a problem with jar task creating a stray dir when building
X-Git-Tag: Develop-2_11_2_0-d20201215~15^2
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=89729f14cea967fc6992d8b1b3de2f3fa9bc6b3c

JAL-3754 fixed a problem with jar task creating a stray dir when building
---

diff --git a/build.gradle b/build.gradle
index d7382cb..07c9476 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1363,7 +1363,8 @@ jar {
     "Implementation-Version": JALVIEW_VERSION
   }
 
-  destinationDirectory = file("${jalviewDir}/${package_dir}")
+  def distDir = "${jalviewDir}/${package_dir}"
+  destinationDirectory = file(distDir)
   archiveFileName = rootProject.name+".jar"
 
   exclude "cache*/**"
@@ -1376,7 +1377,7 @@ jar {
   sourceSets.main.resources.srcDirs.each{ dir ->
     inputs.dir(dir)
   }
-  outputs.file("${destinationDirectory}/${archiveFileName}")
+  outputs.file("${distDir}/${archiveFileName}")
 }