JAL-3210 gradle jalviewjsServer now working. Up to date src and swingjs from Jalview...

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 184e71e..f6d211a 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -3,6 +3,7 @@ import org.gradle.internal.os.OperatingSystem
 import org.gradle.plugins.ide.eclipse.model.*
 import groovy.transform.ExternalizeMethods
 
+
 plugins {
   id 'java'
   id 'application'
@@ -346,10 +347,12 @@ task jalviewjsCopySiteResources (type: Copy) {
 }
 
 task cleanJalviewjs {
+  /*
   delete jalviewDir+"/"+jalviewjs_site_dir
   delete jalviewDir+"/"+eclipse_bin_dir
   delete file(tempEclipseWorkspace.getAbsolutePath()+"/.metadata")
   delete jalviewDir+"/"+jalviewjs_j2s_settings
+  */
 }
 
 task jalviewjsProjectImport(type: Exec) {
@@ -413,18 +416,19 @@ task jalviewjsServer {
   doLast {
     SimpleHttpFileServerFactory factory = new SimpleHttpFileServerFactory()
     def port = Integer.valueOf(jalviewjs_server_port)
-    def add = 0
+    def start = port
     def running = false
-    while(add < 1000) {
+    HttpFileServer server
+println "server wait = ${jalviewjs_server_wait}"
+    while(port < start+100 && !running) {
       try {
-        HttpFileServer server = factory.start(new File(jalviewDirAbsolutePath+"/"+jalviewjs_site_dir), port)
+        server = factory.start(new File(jalviewDirAbsolutePath+"/"+jalviewjs_site_dir), port)
         running = true
+       println("SERVER STARTED on "+server.getResourceUrl(jalviewjs_server_resource)+" for ${jalviewjs_server_wait} seconds. Ctrc+C to kill it.")
+       java.lang.Thread.sleep(Integer.valueOf(jalviewjs_server_wait)*1000);
       } catch (Exception e) {
         port++;
-        add++;
       }
     }
-    println("SERVER STARTED on http://localhost:"+port+"/ . Ctrc+C to kill it")
-    java.lang.Thread.sleep(Integer.valueOf(jalviewjs_server_wait)*1000);
   }
 }