git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1201d0a
)
JAL-3287 correct local file URI for appbase and getdownDigest in Windows
author
Ben Soares
<bsoares@dundee.ac.uk>
Tue, 4 Jun 2019 15:30:10 +0000
(16:30 +0100)
committer
Ben Soares
<bsoares@dundee.ac.uk>
Tue, 4 Jun 2019 15:30:10 +0000
(16:30 +0100)
build.gradle
patch
|
blob
|
history
diff --git
a/build.gradle
b/build.gradle
index
e099ef4
..
a7c7f18
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-49,7
+49,7
@@
def compile_target_compatibility
ext {
// where the getdown channel will be built.
// TODO: consider allowing this expression to be overrriden by -P arg
ext {
// where the getdown channel will be built.
// TODO: consider allowing this expression to be overrriden by -P arg
- getdownWebsiteDir = jalviewDir + '/' + getdown_website_dir + '/' + JAVA_VERSION + '/'
+ getdownWebsiteDir = jalviewDir + '/' + getdown_website_dir + '/' + JAVA_VERSION
getdownAppDir = getdownWebsiteDir + '/' + getdown_app_dir
getdownJ11libDir = getdownWebsiteDir + '/' + getdown_j11lib_dir
getdownResourceDir = getdownWebsiteDir + '/' + getdown_resource_dir
getdownAppDir = getdownWebsiteDir + '/' + getdown_app_dir
getdownJ11libDir = getdownWebsiteDir + '/' + getdown_j11lib_dir
getdownResourceDir = getdownWebsiteDir + '/' + getdown_resource_dir
@@
-649,7
+649,7
@@
task getdownWebsite() {
props.put("getdown_txt_multi_java_location", getdown_alt_multi_java_location)
if (getdown_local == "true") {
props.put("getdown_txt_multi_java_location", getdown_alt_multi_java_location)
if (getdown_local == "true") {
- getdown_app_base = "file://"+file(getdownWebsiteDir).getAbsolutePath()
+ getdown_app_base = file(getdownWebsiteDir).toURI().toString()
}
props.put("getdown_txt_appbase", getdown_app_base)
props.each{ prop, val ->
}
props.put("getdown_txt_appbase", getdown_app_base)
props.each{ prop, val ->