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:
f2794e6
)
JAL-3225 Also look for local.properties in file named ../${projectDir}_local.properti...
author
Ben Soares
<bsoares@dundee.ac.uk>
Thu, 26 Mar 2020 20:22:52 +0000
(20:22 +0000)
committer
Ben Soares
<bsoares@dundee.ac.uk>
Thu, 26 Mar 2020 20:22:52 +0000
(20:22 +0000)
build.gradle
patch
|
blob
|
history
diff --git
a/build.gradle
b/build.gradle
index
2b9cf4e
..
5d2aba7
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-46,11
+46,21
@@
ext {
jalviewDirRelativePath = jalviewDir
// local build environment properties
jalviewDirRelativePath = jalviewDir
// local build environment properties
- def localProps = "${jalviewDirAbsolutePath}/local.properties"
+ // can be "projectDir/local.properties"
+ def localProps = "${projectDir}/local.properties"
+ def propsFile = null;
if (file(localProps).exists()) {
if (file(localProps).exists()) {
+ propsFile = localProps
+ }
+ // or "../projectDir_local.properties"
+ def dirLocalProps = projectDir.getParent() + "/" + projectDir.getName() + "_local.properties"
+ if (file(dirLocalProps).exists()) {
+ propsFile = dirLocalProps
+ }
+ if (propsFile != null) {
try {
def p = new Properties()
try {
def p = new Properties()
- def localPropsFIS = new FileInputStream(localProps)
+ def localPropsFIS = new FileInputStream(propsFile)
p.load(localPropsFIS)
localPropsFIS.close()
p.each {
p.load(localPropsFIS)
localPropsFIS.close()
p.each {
@@
-58,9
+68,9
@@
ext {
def oldval = findProperty(key)
setProperty(key, val)
if (oldval != null) {
def oldval = findProperty(key)
setProperty(key, val)
if (oldval != null) {
- println("Overriding property '${key}' ('${oldval}') with local.properties value '${val}'")
+ println("Overriding property '${key}' ('${oldval}') with ${file(propsFile).getName()} value '${val}'")
} else {
} else {
- println("Setting unknown property '${key}' with local.properties value '${val}'")
+ println("Setting unknown property '${key}' with ${file(propsFile).getName()}s value '${val}'")
}
}
} catch (Exception e) {
}
}
} catch (Exception e) {