From 750ed348b3407d2a133bc7d54bfbae612f48c53f Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Tue, 22 Oct 2019 11:35:15 +0100 Subject: [PATCH 1/1] JAL-3210 small fix for jalviewjsBuildDir --- .classpath.all | 74 -------------------------------------------------------- .classpath.js | 74 -------------------------------------------------------- build.gradle | 4 +-- 3 files changed, 2 insertions(+), 150 deletions(-) delete mode 100644 .classpath.all delete mode 100644 .classpath.js diff --git a/.classpath.all b/.classpath.all deleted file mode 100644 index 8a4a050..0000000 --- a/.classpath.all +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.classpath.js b/.classpath.js deleted file mode 100644 index 1a6df64..0000000 --- a/.classpath.js +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build.gradle b/build.gradle index d575f18..9b7b171 100644 --- a/build.gradle +++ b/build.gradle @@ -1266,11 +1266,11 @@ def jalviewjsBuildDir def jalviewjsSiteDir def jalviewjsTransferSiteDir task jalviewjsSitePath { + def relativeBuildDir = file(jalviewDirAbsolutePath).toPath().relativize(buildDir.toPath()) + jalviewjsBuildDir = "${relativeBuildDir}/jalviewjs" if (jalviewjs_site_dir.startsWith("/")) { jalviewjsSiteDir = jalviewjs_site_dir } else { - def relativeBuildDir = file(jalviewDirAbsolutePath).toPath().relativize(buildDir.toPath()) - jalviewjsBuildDir = "${relativeBuildDir}/jalviewjs" jalviewjsSiteDir = jalviewjsBuildDir + "/" + jalviewjs_site_dir } jalviewjsTransferSiteDir = jalviewjsBuildDir + "/tmp/site" -- 1.7.10.2