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

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 76c1c44..d32a6b2 100644 (file)
--- 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
@@ -1807,6 +1807,8 @@ def jalviewjsCallCore(FileCollection list, String prefixFile, String suffixFile,
 }
 
 
+def jalviewjsJalviewTemplateName = "JalviewJS"
+def jalviewjsJalviewCoreName = "_jalview"
 task jalviewjsNoTranspileBuildAllCores {
   dependsOn jalviewjsSitePath
   dependsOn jalviewjsTransferUnzipSwingJs
@@ -1833,7 +1835,7 @@ task jalviewjsNoTranspileBuildAllCores {
 
   // _jmol and _jalview cores. Add any other peculiar classlist.txt files here
   classlistFiles += [ 'file': file("${jalviewDir}/${jalviewjs_classlist_jmol}"), 'name': "_jvjmol" ]
-  classlistFiles += [ 'file': file("${jalviewDir}/${jalviewjs_classlist_jalview}"), 'name': "_jalview" ]
+  classlistFiles += [ 'file': file("${jalviewDir}/${jalviewjs_classlist_jalview}"), 'name': jalviewjsJalviewCoreName ]
 
   def classlists = []
 
@@ -1908,30 +1910,27 @@ task jalviewjsBuildAllCores {
 }
 
 
+def jalviewjsJalviewCoreHtmlFile
 task jalviewjsPublishCoreTemplate(type: Sync) {
   dependsOn jalviewjsSitePath
   dependsOn jalviewjsBuildAllCores
 
-// clean this up
   def inputFile = file("${jalviewDir}/${j2s_template_html}")
   def outputDir = "${jalviewDir}/${jalviewjsTransferSiteCoreDir}"
 
-// clean this up
-  def jalviewTemplateName = "JalviewJS"
-  def jalviewCoreName = "_jalview"
-
   from inputFile
   into outputDir
   def outputFiles = []
+  jalviewjsJalviewCoreHtmlFile = "${jalviewjsJalviewTemplateName}_${jalviewjsJalviewCoreName}.html"
   rename { filename ->
     outputFiles += "${outputDir}/${filename}"
     if (filename.equals(inputFile.getName())) {
-      return "${jalviewTemplateName}_${jalviewCoreName}.html"
+      return jalviewjsJalviewCoreHtmlFile 
     }
     return null
   }
-  filter(ReplaceTokens, beginToken: '_', endToken: '_', tokens: ['MAIN': mainClass, 'CODE': "null", 'NAME': jalviewTemplateName])
-  filter(ReplaceTokens, beginToken: '', endToken: '', tokens: ['NONE': jalviewCoreName])
+  filter(ReplaceTokens, beginToken: '_', endToken: '_', tokens: ['MAIN': '"'+mainClass+'"', 'CODE': "null", 'NAME': jalviewjsJalviewTemplateName])
+  filter(ReplaceTokens, beginToken: '', endToken: '', tokens: ['NONE': jalviewjsJalviewCoreName])
   preserve {
     include "**"
   }
@@ -2070,19 +2069,23 @@ task jalviewjsServer {
     def start = port
     def running = false
     def url
+    def urlcore
     while(port < start+1000 && !running) {
       try {
         def doc_root = new File("${jalviewDirAbsolutePath}/${jalviewjsSiteDir}")
         def jalviewjsServer = factory.start(doc_root, port)
         running = true
         url = jalviewjsServer.getResourceUrl(jalviewjs_server_resource)
+        urlcore = jalviewjsServer.getResourceUrl(jalviewjsJalviewCoreHtmlFile)
         println("SERVER STARTED with document root ${doc_root}.")
         println("Go to "+url+" . Run  gradle --stop  to stop (kills all gradle daemons).")
         println("For debug: "+url+"?j2sdebug")
+        println("For core: "+urlcore)
 
         file(htmlFile).text = """
-        <p><a href="${url}">Jalview JS Test. &lt;${url}&gt;</a></p>
-        <p><a href="${url}?j2sdebug">Jalview JS Test with debug. &lt;${url}?j2sdebug&lt;</a></p>
+        <p><a href="${url}">JalviewJS Test. &lt;${url}&gt;</a></p>
+        <p><a href="${url}?j2sdebug">JalviewJS Test with debug. &lt;${url}?j2sdebug&lt;</a></p>
+        <p><a href="${urlcore}">${jalviewjsJalviewTemplateName} Core Test. &lt;${urlcore}&gt;</a></p>
         """
 
       } catch (Exception e) {