From: Ben Soares <b.soares@dundee.ac.uk>
Date: Mon, 11 Nov 2019 00:58:33 +0000 (+0000)
Subject: JAL-3210 Moved local.properties override into ext, now picked up in Eclipse IDE
X-Git-Tag: Release_2_11_4_0~45^2~18^2~65
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2f0f4a60825f566eb793cba837144e2de767a9a6;p=jalview.git

JAL-3210 Moved local.properties override into ext, now picked up in Eclipse IDE
---

diff --git a/build.gradle b/build.gradle
index 9798062..d32a6b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,27 +19,6 @@ plugins {
   id 'com.install4j.gradle' version '7.0.9'
 }
 
-// local build environment properties
-def localProps = "${jalviewDir}/local.properties"
-if (file(localProps).exists()) {
-  try {
-    def p = new Properties()
-    def localPropsFIS = new FileInputStream(localProps)
-    p.load(localPropsFIS)
-    localPropsFIS.close()
-    p.each {
-      key, val -> 
-        def over = getProperty(key) != null
-        setProperty(key, val)
-        if (over) {
-          println("Overriding property '${key}' with local.properties value '${val}'")
-        }
-    }
-  } catch (Exception e) {
-    System.out.println("Exception reading local.properties")
-  }
-}
-
 repositories {
   jcenter()
   mavenCentral()
@@ -74,6 +53,27 @@ def compile_source_compatibility
 def compile_target_compatibility
 
 ext {
+  // local build environment properties
+  def localProps = "${jalviewDirAbsolutePath}/local.properties"
+  if (file(localProps).exists()) {
+    try {
+      def p = new Properties()
+      def localPropsFIS = new FileInputStream(localProps)
+      p.load(localPropsFIS)
+      localPropsFIS.close()
+      p.each {
+        key, val -> 
+          def over = getProperty(key) != null
+          setProperty(key, val)
+          if (over) {
+            println("Overriding property '${key}' with local.properties value '${val}'")
+          }
+      }
+    } catch (Exception e) {
+      System.out.println("Exception reading local.properties")
+    }
+  }
+
   getdownWebsiteDir = "${jalviewDir}/${getdown_website_dir}/${JAVA_VERSION}"
   getdownDir = ""
   reportRsyncCmd = false