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:
a451d67
)
JAL-3210 Now add/override gradle.properties with local.properties
author
Ben Soares
<bsoares@dundee.ac.uk>
Tue, 29 Oct 2019 23:28:16 +0000
(23:28 +0000)
committer
Ben Soares
<bsoares@dundee.ac.uk>
Tue, 29 Oct 2019 23:28:16 +0000
(23:28 +0000)
.gitignore
patch
|
blob
|
history
build.gradle
patch
|
blob
|
history
diff --git
a/.gitignore
b/.gitignore
index
c30231b
..
f313551
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-19,6
+19,7
@@
TESTNG
/site
/.gradle
/build
/site
/.gradle
/build
+/local.properties
/utils/HelpLinksChecker.touch
/getdown/website
/getdown/full_app
/utils/HelpLinksChecker.touch
/getdown/website
/getdown/full_app
diff --git
a/build.gradle
b/build.gradle
index
c9b1332
..
535efc8
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-53,6
+53,22
@@
def compile_source_compatibility
def compile_target_compatibility
ext {
def compile_target_compatibility
ext {
+ // local build environment properties
+ def localProps = "${jalviewDir}/local.properties"
+ if (file(localProps).exists()) {
+ def p = new Properties()
+ def localPropsFIS = new FileInputStream(localProps)
+ p.load(localPropsFIS)
+ localPropsFIS.close()
+ p.each {
+ key, val ->
+ def over = project.properties.get(key) != null
+ project.properties.put(key, val)
+ if (over) {
+ println("Overriding property '${key}' with local.properties value")
+ }
+ }
+ }
getdownWebsiteDir = "${jalviewDir}/${getdown_website_dir}/${JAVA_VERSION}"
getdownDir = ""
reportRsyncCmd = false
getdownWebsiteDir = "${jalviewDir}/${getdown_website_dir}/${JAVA_VERSION}"
getdownDir = ""
reportRsyncCmd = false