Index: .project =================================================================== diff -u -N -r8946f41687f4c822ac8d15ee8551f23f156735c4 -r9bee8b2799672f7dc5c5d920e4fbcdc740dd9ea8 --- .project (.../.project) (revision 8946f41687f4c822ac8d15ee8551f23f156735c4) +++ .project (.../.project) (revision 9bee8b2799672f7dc5c5d920e4fbcdc740dd9ea8) @@ -1,6 +1,6 @@ - Jalview with gradle build + jalview-js Index: .settings/org.eclipse.jdt.core.prefs =================================================================== diff -u -N -r89bee60470f83e553493a40460f1f135a02d0696 -r9bee8b2799672f7dc5c5d920e4fbcdc740dd9ea8 --- .settings/org.eclipse.jdt.core.prefs (.../org.eclipse.jdt.core.prefs) (revision 89bee60470f83e553493a40460f1f135a02d0696) +++ .settings/org.eclipse.jdt.core.prefs (.../org.eclipse.jdt.core.prefs) (revision 9bee8b2799672f7dc5c5d920e4fbcdc740dd9ea8) @@ -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 Index: build.gradle =================================================================== diff -u -N -rbc3fa079b00e51bcbff501f383404d375858ac40 -r9bee8b2799672f7dc5c5d920e4fbcdc740dd9ea8 --- build.gradle (.../build.gradle) (revision bc3fa079b00e51bcbff501f383404d375858ac40) +++ build.gradle (.../build.gradle) (revision 9bee8b2799672f7dc5c5d920e4fbcdc740dd9ea8) @@ -1250,3 +1250,37 @@ 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 +} Index: swingjs/SwingJS-site.zip =================================================================== diff -u -N -r95ab78c1f04b242f4b0a80781caec2d484805934 -r9bee8b2799672f7dc5c5d920e4fbcdc740dd9ea8 Binary files differ Index: swingjs/SwingJS-site.zip-newer =================================================================== diff -u -N Binary files differ Index: swingjs/net.sf.j2s.core-3.2.4.jar =================================================================== diff -u -N -r95ab78c1f04b242f4b0a80781caec2d484805934 -r9bee8b2799672f7dc5c5d920e4fbcdc740dd9ea8 Binary files differ Index: swingjs/net.sf.j2s.core.jar =================================================================== diff -u -N -r159718305a909dcc33f6cf5a2955a79d297caafd -r9bee8b2799672f7dc5c5d920e4fbcdc740dd9ea8 Binary files differ Index: swingjs/net.sf.j2s.core.jar-3.2.4 =================================================================== diff -u -N Binary files differ