From: Ben Soares <bsoares@dundee.ac.uk>
Date: Tue, 13 Aug 2019 09:58:40 +0000 (+0100)
Subject: JAL-3210 updating. no test
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=9bee8b2799672f7dc5c5d920e4fbcdc740dd9ea8;p=jalview.git

JAL-3210 updating. no test
---

diff --git a/.project b/.project
index d4d0c20..0e79b2b 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Jalview with gradle build</name>
+	<name>jalview-js</name>
 	<comment></comment>
 	<projects/>
 	<natures>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 690407a..6df8729 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 #
-#Thu Aug 08 16:52:35 BST 2019
+#Mon Aug 12 14:34:05 BST 2019
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
diff --git a/build.gradle b/build.gradle
index 33f8005..68b03af 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1250,3 +1250,37 @@ task helppages  {
   inputs.dir("$classes/$helpDir")
   outputs.dir("$helpOutputDir")
 }
+
+
+task jalviewjs_unzipFiles {
+  def zipFiles = fileTree(dir: jalviewjs_libjs_dir).include("*.zip")
+  zipFiles += jalviewjs_swingjs_zip
+
+  doLast {
+    zipFiles.each { file_zip -> 
+      copy {
+        from zipTree(file_zip)
+        into jalviewjs_site_dir
+      }
+    }
+  }
+
+  inputs.files zipFiles
+  outputs.dir jalviewjs_site_dir
+}
+
+task jalviewjs_copyResources (type: Copy) {
+  from fileTree(dir: jalviewjs_resource_dir)
+  into jalviewjs_site_dir+"/"+jalviewjs_j2s_subdir
+}
+
+task jalviewjs_copySiteResources (type: Copy) {
+  from fileTree(dir: jalviewjs_site_resource_dir)
+  into jalviewjs_site_dir
+}
+
+task jalviewjsBuildSite {
+  dependsOn jalviewjs_unzipFiles
+  dependsOn jalviewjs_copyResources
+  dependsOn jalviewjs_copySiteResources
+}
diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index 52042b8..6f2893d 100644
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ
diff --git a/swingjs/SwingJS-site.zip-newer b/swingjs/SwingJS-site.zip-newer
new file mode 100644
index 0000000..52042b8
Binary files /dev/null and b/swingjs/SwingJS-site.zip-newer differ
diff --git a/swingjs/net.sf.j2s.core.jar b/swingjs/net.sf.j2s.core.jar
index 54e0f0c..ec67d8c 100644
Binary files a/swingjs/net.sf.j2s.core.jar and b/swingjs/net.sf.j2s.core.jar differ
diff --git a/swingjs/net.sf.j2s.core-3.2.4.jar b/swingjs/net.sf.j2s.core.jar-3.2.4
similarity index 100%
rename from swingjs/net.sf.j2s.core-3.2.4.jar
rename to swingjs/net.sf.j2s.core.jar-3.2.4