Skip to content

Commit 463d4f3

Browse files
BobHansonBobHanson
committed
various fixes
1 parent b464dce commit 463d4f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+8311
-2011
lines changed

‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎

2.88 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/differences.txt‎

Lines changed: 1480 additions & 0 deletions
Large diffs are not rendered by default.

‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20200602150211
1+
20200613163403

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9-j11/SwingJS-site.zip‎

2.65 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9-j11/differences.txt‎

Lines changed: 1480 additions & 0 deletions
Large diffs are not rendered by default.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9-j11/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20200602150211
1+
20200610161835

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip‎

2.88 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/differences.txt‎

Lines changed: 1480 additions & 0 deletions
Large diffs are not rendered by default.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20200601144428
1+
20200613163403

‎sources/net.sf.j2s.java.core/build-core-applet.xml‎

Lines changed: 77 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,77 @@
1-
<project name="JSmol" default="toJs" basedir=".">
2-
3-
<property name="site.path" value="site/swingjs" />
4-
5-
<target name="toJs" id="toJs">
6-
7-
<!-- create a NON svn local directory only containing JS files
8-
9-
<echo>Deleting the site directory.</echo>
10-
<delete quiet="true" dir="site" />
11-
-->
12-
13-
<echo>creating swingjs2.js</echo>
14-
<concat destfile="srcjs/swingjs2.js">
15-
<filelist dir="srcjs/js" files="jquery.js,j2sJQueryExt.js,j2sApplet.js,j2sClazz.js,SwingJSApplet.js" />
16-
</concat>
17-
18-
<echo>copying srcjs files into site</echo>
19-
<copy todir="site/swingjs">
20-
<fileset dir="srcjs"/>
21-
</copy>
22-
23-
<!-- make core files -->
24-
25-
<echo>creating and compressing core files - warnings are OK; "does not exist" is trouble</echo>
26-
27-
<loadresource property="coreclasses">
28-
<file file="_j2sclasslist.txt"/>
29-
</loadresource>
30-
31-
<echo>copying _j2sclasslist.txt into dist/</echo>
32-
<copy todir="dist" file="_j2sclasslist.txt" />
33-
34-
<antcall target="call-core">
35-
<param name="call-core.name" value="swingjs" />
36-
<param name="call-core.list" value="
37-
${coreclasses}
38-
" />
39-
</antcall>
40-
41-
<echo>creating dist/SwingJS-site.zip </echo>
42-
<zip destfile="dist/SwingJS-site.zip" basedir="site" >
43-
<exclude name="swingjs/j2s/test/**"/>
44-
<exclude name="*.html"/>
45-
</zip>
46-
47-
</target>
48-
49-
50-
<target name="call-core" id="call-core">
51-
<echo>......Creating core${call-core.name}.js</echo>
52-
<concat destfile="${site.path}/js/core/tmp.js" fixlastline="yes">
53-
<filelist dir="${site.path}/j2s" files="${call-core.list}" />
54-
</concat>
55-
56-
<replace dir="${site.path}/js/core" includes="tmp.js" token="Clazz." value="Clazz_"/>
57-
<replace dir="${site.path}/js/core" includes="tmp.js" token="Clazz__" value="Clazz._"/>
58-
<echo>......Generating ${site.path}/j2s/core/core${call-core.name}.js</echo>
59-
<concat destfile="${site.path}/j2s/core/core${call-core.name}.js"><filelist dir="${site.path}/js" files="
60-
core/coretop2.js
61-
core/tmp.js
62-
core/corebottom2.js
63-
" />
64-
</concat>
65-
<echo>......Generating ${site.path}/j2s/core/core${call-core.name}.z.js</echo>
66-
<java jar="jars/closure_compiler.jar" fork="true" dir="${site.path}/j2s/core" failonerror="false">
67-
<arg line="--js core${call-core.name}.js --js_output_file core${call-core.name}.z.js" />
68-
</java>
69-
<delete quiet="true" file="${site.path}/js/core/tmp.js" />
70-
</target>
71-
72-
73-
74-
</project>
1+
<project name="JSmol" default="toJs" basedir=".">
2+
3+
<property name="site.path" value="site/swingjs" />
4+
5+
<target name="toJs" id="toJs">
6+
7+
<!-- create a NON svn local directory only containing JS files
8+
9+
<echo>Deleting the site directory.</echo>
10+
<delete quiet="true" dir="site" />
11+
-->
12+
13+
<echo>creating swingjs2.js</echo>
14+
<concat destfile="srcjs/swingjs2.js">
15+
<filelist dir="srcjs/js" files="jquery.js,j2sJQueryExt.js,j2sApplet.js,j2sClazz.js,SwingJSApplet.js" />
16+
</concat>
17+
18+
<echo>copying srcjs files into site</echo>
19+
<copy todir="${site.path}">
20+
<fileset dir="srcjs"/>
21+
</copy>
22+
23+
<!-- make core files -->
24+
25+
<echo>creating and compressing core files - warnings are OK; "does not exist" is trouble</echo>
26+
27+
<loadresource property="coreclasses">
28+
<file file="_j2sclasslist.txt"/>
29+
</loadresource>
30+
31+
<echo>copying _j2sclasslist.txt into dist/</echo>
32+
<copy todir="dist" file="_j2sclasslist.txt" />
33+
34+
<echo>copying differences.txt into dist/</echo>
35+
<copy todir="dist" file="doc/differences.txt" />
36+
37+
<antcall target="call-core">
38+
<param name="call-core.name" value="swingjs" />
39+
<param name="call-core.list" value="
40+
${coreclasses}
41+
" />
42+
</antcall>
43+
44+
<echo>creating dist/SwingJS-site.zip </echo>
45+
<zip destfile="dist/SwingJS-site.zip" basedir="site" >
46+
<exclude name="swingjs/j2s/test/**"/>
47+
<exclude name="*.html"/>
48+
</zip>
49+
50+
</target>
51+
52+
53+
<target name="call-core" id="call-core">
54+
<echo>......Creating core${call-core.name}.js</echo>
55+
<concat destfile="${site.path}/js/core/tmp.js" fixlastline="yes">
56+
<filelist dir="${site.path}/j2s" files="${call-core.list}" />
57+
</concat>
58+
59+
<replace dir="${site.path}/js/core" includes="tmp.js" token="Clazz." value="Clazz_"/>
60+
<replace dir="${site.path}/js/core" includes="tmp.js" token="Clazz__" value="Clazz._"/>
61+
<echo>......Generating ${site.path}/j2s/core/core${call-core.name}.js</echo>
62+
<concat destfile="${site.path}/j2s/core/core${call-core.name}.js"><filelist dir="${site.path}/js" files="
63+
core/coretop2.js
64+
core/tmp.js
65+
core/corebottom2.js
66+
" />
67+
</concat>
68+
<echo>......Generating ${site.path}/j2s/core/core${call-core.name}.z.js</echo>
69+
<java jar="jars/closure_compiler.jar" fork="true" dir="${site.path}/j2s/core" failonerror="false">
70+
<arg line="--js core${call-core.name}.js --js_output_file core${call-core.name}.z.js" />
71+
</java>
72+
<delete quiet="true" file="${site.path}/js/core/tmp.js" />
73+
</target>
74+
75+
76+
77+
</project>

0 commit comments

Comments
 (0)