git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b2f0163
)
JAL-4059 Updated SwingJS, JmolJS libraries
author
Ben Soares
<b.soares@dundee.ac.uk>
Tue, 2 Apr 2024 17:16:15 +0000
(18:16 +0100)
committer
Ben Soares
<b.soares@dundee.ac.uk>
Tue, 2 Apr 2024 17:16:15 +0000
(18:16 +0100)
build.gradle
patch
|
blob
|
history
swingjs/SwingJS-site.zip
patch
|
blob
|
history
swingjs/timestamp
patch
|
blob
|
history
swingjs/ver/5.0.1/SwingJS-site.zip
patch
|
blob
|
history
swingjs/ver/5.0.1/timestamp
patch
|
blob
|
history
utils/jalviewjs/libjs/Jmol-SwingJS.zip
patch
|
blob
|
history
diff --git
a/build.gradle
b/build.gradle
index
ebde80e
..
94eed44
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-3455,6
+3455,7
@@
task jalviewjsTransferUnzipLib(type: Copy) {
from zipTree(file_zip)
// rename files in jsmol/j2s/... to swingjs/j2s/...
from zipTree(file_zip)
// rename files in jsmol/j2s/... to swingjs/j2s/...
+ /*
if (file_zip.getName().startsWith("Jmol-j2s-site")) {
eachFile { fcd ->
// jsmol/... -> swingjs/...
if (file_zip.getName().startsWith("Jmol-j2s-site")) {
eachFile { fcd ->
// jsmol/... -> swingjs/...
@@
-3466,6
+3467,7
@@
task jalviewjsTransferUnzipLib(type: Copy) {
}
}
}
}
}
}
+ */
// 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
// 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
@@
-3480,6
+3482,7
@@
task jalviewjsTransferUnzipLib(type: Copy) {
return line
}
}
return line
}
}
+
}
into "${jalviewDir}/${jalviewjsTransferSiteLibDir}"
}
}
into "${jalviewDir}/${jalviewjsTransferSiteLibDir}"
}
diff --git
a/swingjs/SwingJS-site.zip
b/swingjs/SwingJS-site.zip
index
871b9d2
..
fa13e2d
100644
(file)
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ
diff --git
a/swingjs/timestamp
b/swingjs/timestamp
index
af91237
..
5770328
100644
(file)
--- a/
swingjs/timestamp
+++ b/
swingjs/timestamp
@@
-1
+1
@@
-20240301123437
+20240316183332
diff --git
a/swingjs/ver/5.0.1/SwingJS-site.zip
b/swingjs/ver/5.0.1/SwingJS-site.zip
index
871b9d2
..
fa13e2d
100644
(file)
Binary files a/swingjs/ver/5.0.1/SwingJS-site.zip and b/swingjs/ver/5.0.1/SwingJS-site.zip differ
diff --git
a/swingjs/ver/5.0.1/timestamp
b/swingjs/ver/5.0.1/timestamp
index
af91237
..
5770328
100644
(file)
--- a/
swingjs/ver/5.0.1/timestamp
+++ b/
swingjs/ver/5.0.1/timestamp
@@
-1
+1
@@
-20240301123437
+20240316183332
diff --git
a/utils/jalviewjs/libjs/Jmol-SwingJS.zip
b/utils/jalviewjs/libjs/Jmol-SwingJS.zip
index
d36be75
..
c5788e4
100644
(file)
Binary files a/utils/jalviewjs/libjs/Jmol-SwingJS.zip and b/utils/jalviewjs/libjs/Jmol-SwingJS.zip differ