JAL-3210 Better integration with Eclipse as IDE. FIXED THE TEST JAR ATTRIBUTE, HOORAH

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 9b7b171..0c2448c 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -389,11 +389,7 @@ eclipse {
             // don't duplicate
           } else {
             def lib = new Library(fileReference(itPath))
-            /* this doesn't work... yet.  Adding test=true attribute using withXml below
-            def attrs = new Node(null, 'attributes')
-            attrs.appendNode('attribute', ["name":"test","value":"true"])
-            lib.appendNode(attrs)
-            /**/
+            lib.entryAttributes["test"] = "true"
             cp.entries += lib
             alreadyAddedLibPath.put(itPath, true)
           }
@@ -401,38 +397,6 @@ eclipse {
 
       } // whenMerged
 
-      // withXml changes ignored by buildship, these add the "test=true" attribute
-      withXml {
-        def node = it.asNode()
-
-        def srcTestAttributes
-        node.children().each{ cpe ->
-          def attributes = cpe.attributes()
-          if (attributes.get("kind") == "src" && attributes.get("path") == "test") {
-            srcTestAttributes = cpe.find { a -> a.name() == "attributes" }
-            return
-          }
-        }
-        def addTestAttribute = true
-        srcTestAttributes.each{a ->
-          if (a.name() == "attribute" && a.attributes().getAt("name") == "test") {
-            addTestAttribute = false
-          }
-        }
-        if (addTestAttribute) {
-          srcTestAttributes.append(new Node(null, "attribute", [name:"test", value:"true"]))
-        }
-
-        node.children().each{ cpe ->
-          def attributes = cpe.attributes()
-          if (attributes.get("kind") == "lib" && attributes.get("path").startsWith("utils/")) {
-            cpe.appendNode('attributes')
-            .appendNode('attribute', [name:"test", value:"true"])
-          }
-        }
-      } // withXML
-
-
     } // file
 
     containers 'org.eclipse.buildship.core.gradleclasspathcontainer'
@@ -1288,7 +1252,7 @@ task jalviewjsSetEclipseWorkspace {
     eclipseWsDir = propVal
   }
   if (( eclipseWsDir == null || !file(eclipseWsDir).exists() ) && file(propsFileName).exists()) {
-    def ins = new FileInputStream(propsFileName)
+    def ins = new FileInputStream("${jalviewDirAbsolutePath}/${propsFileName}")
     props.load(ins)
     ins.close()
     if (props.getProperty(propKey, null) != null) {
@@ -1571,6 +1535,11 @@ task jalviewjsBuildSite {
   dependsOn jalviewjsPrepareSite
 }
 
+task cleanJalviewjsSite {
+  delete jalviewjsTransferSiteDir
+  delete jalviewjsSiteDir
+}
+
 task jalviewjsSiteTar(type: Tar) {
   group "JalviewJS"
   description "Creates a tar.gz file for the website"
@@ -1594,20 +1563,29 @@ task jalviewjsServer {
   group "JalviewJS"
   description "Starts a webserver on localhost to test the website"
   dependsOn jalviewjsSitePath
+  def htmlFile = "${jalviewDirAbsolutePath}/jalviewjsTest.html"
   doLast {
 
     SimpleHttpFileServerFactory factory = new SimpleHttpFileServerFactory()
     def port = Integer.valueOf(jalviewjs_server_port)
     def start = port
     def running = false
+    def url
     while(port < start+1000 && !running) {
       try {
         def doc_root = new File(jalviewDirAbsolutePath +"/"+ jalviewjsSiteDir)
         jalviewjsServer = factory.start(doc_root, port)
         running = true
+        url = jalviewjsServer.getResourceUrl(jalviewjs_server_resource)
         println("SERVER STARTED with document root ${doc_root}.")
-        println("Go to "+jalviewjsServer.getResourceUrl(jalviewjs_server_resource)+" . Run  gradle --stop  to stop (kills all gradle daemons).")
-        println("For debug: "+jalviewjsServer.getResourceUrl(jalviewjs_server_resource)+"?j2sdebug")
+        println("Go to "+url+" . Run  gradle --stop  to stop (kills all gradle daemons).")
+        println("For debug: "+url+"?j2sdebug")
+
+        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>
+        """
+
       } catch (Exception e) {
         port++;
       }
@@ -1615,6 +1593,7 @@ task jalviewjsServer {
 
   }
 
+  outputs.file(htmlFile)
 }
 
 task jalviewjs {
@@ -1624,3 +1603,27 @@ task jalviewjs {
 }
 
 
+task jalviewjsIDECopyTransferSite(type: Copy) {
+  from jalviewjsTransferSiteDir
+  into jalviewjsSiteDir
+}
+
+task jalviewjsIDEBuildSite {
+  group "JalviewJS in Eclipse"
+  description "Copies the Eclipse transpiled site and unzips supporting zipfiles"
+  dependsOn jalviewjsIDECopyTransferSite
+  dependsOn jalviewjsPrepareSite
+}
+
+task cleanJalviewjsIDESite {
+  group "JalviewJS in Eclipse"
+  description "Deletes the Eclipse transpiled site"
+  dependsOn cleanJalviewjsSite
+}
+
+task jalviewjsIDEServer {
+  group "JalviewJS in Eclipse"
+  description "Starts a webserver on localhost to test the website"
+  dependsOn jalviewjsServer
+}
+