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 (from parent 1:
6f1c651
)
Java2Script 3.2.2_04 fixes Clazz._exceptionOf P$ issue
author
hansonr
<hansonr@STO24954W.ad.stolaf.edu>
Thu, 16 Aug 2018 02:11:55 +0000
(21:11 -0500)
committer
hansonr
<hansonr@STO24954W.ad.stolaf.edu>
Thu, 16 Aug 2018 02:11:55 +0000
(21:11 -0500)
12 files changed:
.classpath
patch
|
blob
|
history
build-libjs.xml
patch
|
blob
|
history
build-site.xml
patch
|
blob
|
history
libjs/MiGLayout-site.zip
patch
|
blob
|
history
libjs/VARNA-site.zip
patch
|
blob
|
history
libjs/jsonsimple-site.zip
patch
|
blob
|
history
swingjs/SwingJS-site.zip
patch
|
blob
|
history
swingjs/net.sf.j2s.core.jar
patch
|
blob
|
history
swingjs/timestamp
patch
|
blob
|
history
swingjs/ver/3.2.2/SwingJS-site.zip
patch
|
blob
|
history
swingjs/ver/3.2.2/net.sf.j2s.core.jar
patch
|
blob
|
history
swingjs/ver/3.2.2/timestamp
patch
|
blob
|
history
diff --git
a/.classpath
b/.classpath
index
aba05fb
..
5fe0354
100644
(file)
--- a/
.classpath
+++ b/
.classpath
@@
-1,7
+1,7
@@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="test"/>
+ <!-- classpathentry kind="src" path="test"/ -->
<classpathentry kind="src" path="src2"/>
<classpathentry kind="src" path="utils"/>
<classpathentry kind="lib" path="lib/activation.jar"/>
<classpathentry kind="src" path="src2"/>
<classpathentry kind="src" path="utils"/>
<classpathentry kind="lib" path="lib/activation.jar"/>
diff --git
a/build-libjs.xml
b/build-libjs.xml
index
ef8847a
..
d8edc9f
100644
(file)
--- a/
build-libjs.xml
+++ b/
build-libjs.xml
@@
-7,13
+7,13
@@
xmlns:unless="ant:unless">
<!-- inputs directories -->
xmlns:unless="ant:unless">
<!-- inputs directories -->
- <property name="resourceDir" value="resources" />
- <property name="libjsDir" value="libjs"/>
- <property name="swingjsDir" value="swingjs"/>
+ <property name="resource.dir" value="resources" />
+ <property name="libjs.dir" value="libjs"/>
+ <property name="swingjs.dir" value="swingjs"/>
<!-- output directories -->
<!-- output directories -->
- <property name="site" value="site"/>
- <property name="j2sDir" value="${site}/swingjs/j2s"/>
- <property name="libjsDir" value="libjs"/>
+ <property name="site.dir" value="site"/>
+ <property name="j2s.dir" value="${site.dir}/swingjs/j2s"/>
+ <property name="libjs.dir" value="libjs"/>
<target name="zipall" depends="zipvarna,zipmig,zipjson">
<target name="zipall" depends="zipvarna,zipmig,zipjson">
@@
-22,35
+22,35
@@
<target name="zipvarna">
<!-- VARNA -->
<target name="zipvarna">
<!-- VARNA -->
- <property name="varna.zip" value="${libjsDir}/VARNA-site.zip" />
+ <property name="varna.zip" value="${libjs.dir}/VARNA-site.zip" />
<echo> Zipping up ${varna.zip} </echo>
<echo> Zipping up ${varna.zip} </echo>
- <zip destfile="${varna.zip}" basedir="${site}" includes="fr_*.html,swingjs/j2s/fr/**" />
+ <zip destfile="${varna.zip}" basedir="${site.dir}" includes="fr_*.html,swingjs/j2s/fr/**" />
</target>
<target name="zipmig">
<!-- net.miginfo.com MiGLayout -->
</target>
<target name="zipmig">
<!-- net.miginfo.com MiGLayout -->
- <property name="mig.zip" value="${libjsDir}/MiGLayout-site.zip" />
+ <property name="mig.zip" value="${libjs.dir}/MiGLayout-site.zip" />
<echo> Zipping up ${mig.zip} </echo>
<echo> Zipping up ${mig.zip} </echo>
- <zip destfile="${mig.zip}" basedir="${site}" includes="swingjs/j2s/net/miginfocom/**" />
+ <zip destfile="${mig.zip}" basedir="${site.dir}" includes="swingjs/j2s/net/miginfocom/**" />
</target>
</target>
- <!-- log4j minimal implementation is in jalview/javascript
+ <target name="zipjson">
+ <!-- org.json.simple -->
+ <property name="json.zip" value="${libjs.dir}/jsonsimple-site.zip" />
+ <echo> Zipping up ${json.zip} </echo>
+ <zip destfile="${json.zip}" basedir="${site.dir}" includes="swingjs/j2s/org/json/**" />
+ </target>
+
+ <!-- log4j minimal implementation is already in jalview/javascript
and is mapped from org.apache.log4j by the following .j2s line:
j2s.class.replacements=org.apache.log4j.->jalview.javascript.log4j.
<target name="ziplog4j">
<!- org.apache.log4j ->
and is mapped from org.apache.log4j by the following .j2s line:
j2s.class.replacements=org.apache.log4j.->jalview.javascript.log4j.
<target name="ziplog4j">
<!- org.apache.log4j ->
- <property name="log4j.zip" value="${libjsDir}/log4j-site.zip" />
+ <property name="log4j.zip" value="${libjs.dir}/log4j-site.zip" />
<echo> Zipping up ${log4j.zip} </echo>
<echo> Zipping up ${log4j.zip} </echo>
- <zip destfile="${log4j.zip}" basedir="${site}" includes="swingjs/j2s/org/apache/log4j/**" />
+ <zip destfile="${log4j.zip}" basedir="${site.dir}" includes="swingjs/j2s/org/apache/log4j/**" />
</target>
-->
</target>
-->
- <target name="zipjson">
- <!-- org.json.simple -->
- <property name="json.zip" value="${libjsDir}/jsonsimple-site.zip" />
- <echo> Zipping up ${json.zip} </echo>
- <zip destfile="${json.zip}" basedir="${site}" includes="swingjs/j2s/org/json/**" />
- </target>
-
</project>
</project>
diff --git
a/build-site.xml
b/build-site.xml
index
edd9e5e
..
b2d88e2
100644
(file)
--- a/
build-site.xml
+++ b/
build-site.xml
@@
-5,13
+5,13
@@
- requires tools/ant-contrib.jar
- creates the site/ directory if it does not exist
- requires tools/ant-contrib.jar
- creates the site/ directory if it does not exist
- - unzip libjs *.zip into site/swingjs/j2s
- - unzips SwingJS-site.zip into site/
- - copies non-java resources into site/swingjs/j2s
+ - unzip libjs/*.zip into site/swingjs/j2s
+ - unzips swingjs/SwingJS-site.zip into site/
+ - copies non-java resources from resources/ into site/swingjs/j2s
-->
-->
-<project name="jalviewX" default="tosite" basedir="."
+<project name="swingjs-project" default="tosite" basedir="."
xmlns:if="ant:if"
xmlns:unless="ant:unless">
xmlns:if="ant:if"
xmlns:unless="ant:unless">
diff --git
a/libjs/MiGLayout-site.zip
b/libjs/MiGLayout-site.zip
index
08819f2
..
51aba46
100644
(file)
Binary files a/libjs/MiGLayout-site.zip and b/libjs/MiGLayout-site.zip differ
diff --git
a/libjs/VARNA-site.zip
b/libjs/VARNA-site.zip
index
a3ead5a
..
3dff86e
100644
(file)
Binary files a/libjs/VARNA-site.zip and b/libjs/VARNA-site.zip differ
diff --git
a/libjs/jsonsimple-site.zip
b/libjs/jsonsimple-site.zip
index
b97e5e3
..
927ac87
100644
(file)
Binary files a/libjs/jsonsimple-site.zip and b/libjs/jsonsimple-site.zip differ
diff --git
a/swingjs/SwingJS-site.zip
b/swingjs/SwingJS-site.zip
index
368075a
..
0472109
100644
(file)
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ
diff --git
a/swingjs/net.sf.j2s.core.jar
b/swingjs/net.sf.j2s.core.jar
index
65c2aa7
..
d10f0bf
100644
(file)
Binary files a/swingjs/net.sf.j2s.core.jar and b/swingjs/net.sf.j2s.core.jar differ
diff --git
a/swingjs/timestamp
b/swingjs/timestamp
index
91f58f0
..
a6e5252
100644
(file)
--- a/
swingjs/timestamp
+++ b/
swingjs/timestamp
@@
-1
+1
@@
-20180812000030
+20180815190959
diff --git
a/swingjs/ver/3.2.2/SwingJS-site.zip
b/swingjs/ver/3.2.2/SwingJS-site.zip
index
368075a
..
0472109
100644
(file)
Binary files a/swingjs/ver/3.2.2/SwingJS-site.zip and b/swingjs/ver/3.2.2/SwingJS-site.zip differ
diff --git
a/swingjs/ver/3.2.2/net.sf.j2s.core.jar
b/swingjs/ver/3.2.2/net.sf.j2s.core.jar
index
65c2aa7
..
d10f0bf
100644
(file)
Binary files a/swingjs/ver/3.2.2/net.sf.j2s.core.jar and b/swingjs/ver/3.2.2/net.sf.j2s.core.jar differ
diff --git
a/swingjs/ver/3.2.2/timestamp
b/swingjs/ver/3.2.2/timestamp
index
91f58f0
..
a6e5252
100644
(file)
--- a/
swingjs/ver/3.2.2/timestamp
+++ b/
swingjs/ver/3.2.2/timestamp
@@
-1
+1
@@
-20180812000030
+20180815190959