JAL-4059 rename files from jsmol j2s zip from jsmol to swingjs

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 751e6c3..6137539 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -2241,9 +2241,9 @@ task getdownImages() {
   dependsOn getdownImagesProcess
 }
 
-task getdownWebsite() {
+task getdownWebsiteBuild() {
   group = "distribution"
-  description = "Create the getdown minimal app folder, and website folder for this version of jalview. Website folder also used for offline app installer"
+  description = "Create the getdown minimal app folder, and website folder for this version of jalview. Website folder also used for offline app installer. No digest is created."
 
   dependsOn getdownImages
   if (buildDist) {
@@ -2355,7 +2355,7 @@ task getdownWebsite() {
           from s
           into "${getdownAppBaseDir}/${getdown_wrapper_script_dir}"
         }
-        getdownTextLines += "resource = ${getdown_wrapper_script_dir}/${script}"
+        getdownTextLines += "xresource = ${getdown_wrapper_script_dir}/${script}"
       }
     }
 
@@ -2497,7 +2497,9 @@ task getdownDigestDir(type: JavaExec) {
 task getdownDigest(type: JavaExec) {
   group = "distribution"
   description = "Digest the getdown website folder"
-  dependsOn getdownWebsite
+
+  dependsOn getdownWebsiteBuild
+
   doFirst {
     classpath = files(getdownLauncher)
   }
@@ -2530,12 +2532,19 @@ task getdown() {
   }
 }
 
+task getdownWebsite {
+  group = "distribution"
+  description = "A task to create the whole getdown channel website dir including digest file"
+
+  dependsOn getdownWebsiteBuild
+  dependsOn getdownDigest
+}
 
 task getdownArchiveBuild() {
   group = "distribution"
   description = "Put files in the archive dir to go on the website"
 
-  dependsOn getdownWebsite
+  dependsOn getdownWebsiteBuild
 
   def v = "v${JALVIEW_VERSION_UNDERSCORES}"
   def vDir = "${getdownArchiveDir}/${v}"
@@ -3401,8 +3410,6 @@ task jalviewjsTransferUnzipSwingJs {
     copy {
       from zipTree(file_zip)
       into "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}"
-      exclude "**.html"
-      exclude "**.htm"
     }
   }
 
@@ -3419,13 +3426,24 @@ task jalviewjsTransferUnzipLib {
       copy {
         from zipTree(file_zip)
         into "${jalviewDir}/${jalviewjsTransferSiteLibDir}"
-        exclude "**.html"
-        exclude "**.htm"
+
+        // rename files in jsmol/j2s/... to swingjs/j2s/...
+        if (file_zip.getName().startsWith("Jmol-j2s-site")) {
+          eachFile { fcd ->
+            // jsmol/... -> swingjs/...
+            def relPathSegments = fcd.relativePath.getSegments()
+            if (relPathSegments[0] == "jsmol") {
+              def newRelPathSegments = relPathSegments
+              newRelPathSegments[0] = "swingjs"
+              fcd.relativePath = new RelativePath(true, newRelPathSegments)
+            }
+          }
+        }
 
         // The following replace() is needed due to a mismatch in Jmol calls to
         // colorPtToFFRGB$javajs_util_T3d when only colorPtToFFRGB$javajs_util_T3 is defined
         // in the SwingJS.zip (github or the one distributed with JSmol)
-        if (file_zip.getName().equals("Jmol-SwingJS.zip")) {
+        if (file_zip.getName().startsWith("Jmol-SwingJS")) {
           filter { line ->
             def l = ""
             while(!line.equals(l)) {
@@ -3489,7 +3507,8 @@ task jalviewjsEclipseSetup {
 
 task jalviewjsSyncAllLibs (type: Sync) {
   dependsOn jalviewjsTransferUnzipAllLibs
-  def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteLibDir}")
+  def inputFiles = []
+  inputFiles += fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteLibDir}")
   inputFiles += fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}")
   def outputDir = "${jalviewDir}/${jalviewjsSiteDir}"
 
@@ -3696,7 +3715,7 @@ DEBUG: ${eclipseDebug}
 }
 
 
-task jalviewjsTranserSiteMergeDirs (type: Sync) {
+task jalviewjsTranserSiteMergeLibDirs (type: Sync) {
   dependsOn jalviewjsTransferUnzipAllLibs
   dependsOn jalviewjsTransferUnzipSwingJs
   dependsOn jalviewjsTranspile
@@ -3704,8 +3723,35 @@ task jalviewjsTranserSiteMergeDirs (type: Sync) {
   def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteLibDir}")
   // merge swingjs lib last
   inputFiles += fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}")
+
+  def outputDir = "${jalviewDir}/${jalviewjsTransferSiteMergeDir}"
+
+  from inputFiles
+  into outputDir
+  def outputFiles = []
+  rename { filename ->
+    outputFiles += "${outputDir}/${filename}"
+    null
+  }
+
+  exclude "**/*.html"
+  exclude "**/*.htm"
+
+  // should this be exclude really ? No, swingjs dir should be transferred last (and overwrite)
+  duplicatesStrategy "INCLUDE"
+
+  outputs.files outputFiles
+  inputs.files inputFiles
+}
+
+
+task jalviewjsTranserSiteMergeSwingDir (type: Sync) {
+  dependsOn jalviewjsTransferUnzipAllLibs
+  dependsOn jalviewjsTransferUnzipSwingJs
+  dependsOn jalviewjsTranspile
+
   // merge jalview files very last
-  inputFiles += fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteJsDir}")
+  def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteJsDir}")
 
   def outputDir = "${jalviewDir}/${jalviewjsTransferSiteMergeDir}"
 
@@ -3720,7 +3766,7 @@ task jalviewjsTranserSiteMergeDirs (type: Sync) {
     include "**"
   }
 
-  // should this be exclude really ? No, swingjs dir should be transferred last (and overwrite)
+  // should this be exclude really ? No, jalview dir should be transferred last (and overwrite)
   duplicatesStrategy "INCLUDE"
 
   outputs.files outputFiles
@@ -3728,6 +3774,12 @@ task jalviewjsTranserSiteMergeDirs (type: Sync) {
 }
 
 
+task jalviewjsTranserSiteMergeDirs {
+  dependsOn jalviewjsTranserSiteMergeLibDirs
+  dependsOn jalviewjsTranserSiteMergeSwingDir
+}
+
+
 def jalviewjsCallCore(String name, FileCollection list, String prefixFile, String suffixFile, String jsfile, String zjsfile, File logOutFile, Boolean logOutConsole) {
 
   def stdout = new ByteArrayOutputStream()