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:
521a4e4
)
JAL-3477 Fixed appbase override so it's optional\!
author
Ben Soares
<bsoares@dundee.ac.uk>
Tue, 7 Jan 2020 12:59:13 +0000
(12:59 +0000)
committer
Ben Soares
<bsoares@dundee.ac.uk>
Tue, 7 Jan 2020 12:59:13 +0000
(12:59 +0000)
build.gradle
patch
|
blob
|
history
diff --git
a/build.gradle
b/build.gradle
index
1e26bee
..
a8315c2
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-56,10
+56,12
@@
ext {
localPropsFIS.close()
p.each {
key, val ->
localPropsFIS.close()
p.each {
key, val ->
- def over = getProperty(key) != null
+ def oldval = findProperty(key)
setProperty(key, val)
setProperty(key, val)
- if (over) {
- println("Overriding property '${key}' with local.properties value '${val}'")
+ if (oldval != null) {
+ println("Overriding property '${key}' ('${oldval}') with local.properties value '${val}'")
+ } else {
+ println("Setting unknown property '${key}' with local.properties value '${val}'")
}
}
} catch (Exception e) {
}
}
} catch (Exception e) {
@@
-214,7
+216,7
@@
ext {
}
// override getdown_app_base if requested
}
// override getdown_app_base if requested
- if (getProperty("getdown_appbase_override") != null) {
+ if (findProperty("getdown_appbase_override") != null) {
getdown_app_base = string(getProperty("getdown_appbase_override"))
println("Overriding getdown appbase with '${getdown_app_base}'")
}
getdown_app_base = string(getProperty("getdown_appbase_override"))
println("Overriding getdown appbase with '${getdown_app_base}'")
}