JAL-3210 some tidying

diff --git a/build.gradle b/build.gradle
index 3adbf24..c7d2311 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -167,7 +167,6 @@ ext {
   gitHash = ""
   gitBranch = ""
 
-  jalviewjsServer = ""
 }
 
 def JAVA_INTEGER_VERSION
@@ -1430,11 +1429,13 @@ task jalviewjsCopySiteResources (type: Copy) {
   inputs.files inputFiles
 }
 
-task cleanJalviewjs {
+task jalviewjsTotalClean {
+  group "JalviewJS"
+  description "Delete everything to do with JalviewJS build"
   //delete jalviewjsBuildDir
-  //delete jalviewDir+"/"+eclipse_bin_dir
-  //delete file(eclipseWorkspace.getAbsolutePath()+"/.metadata")
-  //delete jalviewDir+"/"+jalviewjs_j2s_settings
+  delete jalviewDir+"/"+eclipse_bin_dir
+  delete file(eclipseWorkspace.getAbsolutePath()+"/.metadata")
+  delete jalviewDir+"/"+jalviewjs_j2s_settings
 }
 
 task jalviewjsProjectImport(type: Exec) {
@@ -1535,9 +1536,9 @@ task jalviewjsBuildSite {
   dependsOn jalviewjsPrepareSite
 }
 
-task cleanJalviewjsSite {
-  delete jalviewjsTransferSiteDir
-  delete jalviewjsSiteDir
+task jalviewjsSiteClean {
+  //delete jalviewjsTransferSiteDir
+  //delete jalviewjsSiteDir
 }
 
 task jalviewjsSiteTar(type: Tar) {
@@ -1574,7 +1575,7 @@ task jalviewjsServer {
     while(port < start+1000 && !running) {
       try {
         def doc_root = new File(jalviewDirAbsolutePath +"/"+ jalviewjsSiteDir)
-        jalviewjsServer = factory.start(doc_root, port)
+        def jalviewjsServer = factory.start(doc_root, port)
         running = true
         url = jalviewjsServer.getResourceUrl(jalviewjs_server_resource)
         println("SERVER STARTED with document root ${doc_root}.")
@@ -1621,10 +1622,10 @@ task jalviewjsIDEBuildSite {
   dependsOn jalviewjsPrepareSite
 }
 
-task cleanJalviewjsIDESite {
+task jalviewjsIDESiteClean {
   group "JalviewJS in Eclipse"
   description "Deletes the Eclipse transpiled site"
-  dependsOn cleanJalviewjsSite
+  dependsOn jalviewjsSiteClean
 }
 
 task jalviewjsIDEServer {