Skip to content

Commit 3732f61

Browse files
author
jossonsmith
committed
Update the built *.js and *.z.js
1 parent c1730d9 commit 3732f61

70 files changed

Lines changed: 5811 additions & 2990 deletions

Some content is hidden

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

sources/net.sf.j2s.lib/j2s.core.build

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,9 @@
252252
<filelist dir="${js.src.dir}">
253253
<file name="java/lang/Class.js"/>
254254
<file name="java/lang/ClassLoader.js"/>
255+
<!--
255256
<file name="java/lang/Console.js"/>
257+
-->
256258
</filelist>
257259
</concat>
258260
</target>
@@ -261,18 +263,15 @@
261263
target: j2s.pack.common
262264
- - - - - - - - - - - - - - - - - -->
263265
<target name="j2s.pack.common">
264-
<concat destfile="${jz.dist.dir}/java/j2slib.common.z.js">
266+
<concat destfile="${js.src.dir}/java/core.z.js">
265267
<filelist dir="${js.src.dir}">
266268
<file name="java/io/Serializable.js"/>
267269
<file name="java/lang/CharSequence.js"/>
268270
<file name="java/lang/Cloneable.js"/>
269271
<file name="java/lang/Comparable.js"/>
270272
<file name="java/lang/Runnable.js"/>
271273
<file name="java/util/Comparator.js"/>
272-
</filelist>
273-
</concat>
274-
<concat destfile="${jz.dist.dir}/java/j2slib.basic.z.js">
275-
<filelist dir="${js.src.dir}">
274+
276275
<file name="java/lang/Number.js"/>
277276
<file name="java/lang/Integer.js"/>
278277
<file name="java/lang/Long.js"/>
@@ -294,6 +293,12 @@
294293
<file name="java/util/List.js"/>
295294
<file name="java/util/RandomAccess.js"/>
296295
</filelist>
296+
<filelist dir="${ajax.src.dir}">
297+
<file name="net/sf/j2s/ajax/HttpRequest.js"/>
298+
<file name="net/sf/j2s/ajax/IXHRCallback.js"/>
299+
<file name="net/sf/j2s/ajax/XHRCallbackAdapter.js"/>
300+
<file name="net/sf/j2s/ajax/XHRCallbackSWTAdapter.js"/>
301+
</filelist>
297302
</concat>
298303
</target>
299304

@@ -305,6 +310,8 @@
305310
<fileset dir="${ajax.src.dir}">
306311
<exclude name="**/*.clazz"/>
307312
<exclude name="**/*.class"/>
313+
<exclude name="**/AjaxPlugin.js"/>
314+
<exclude name="**/AJAXVariableInitializer.js"/>
308315
<exclude name="**/*.swp"/>
309316
<exclude name="**/*.swo"/>
310317
</fileset>

sources/net.sf.j2s.lib/j2s.swt.build

Lines changed: 187 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<!-- =================================
2222
target: j2s.swt.basic
2323
================================= -->
24-
<target name="j2s.swt.basic" depends="j2s.swt.resource" description="Building j2s-swt-*.z.js">
24+
<target name="j2s.swt.basic" description="Building j2s-swt-*.z.js">
2525
<concat destfile="${jz.dist.dir}/j2s-swt-basic.z.js">
2626
<header filtering="no" trimleading="yes">/*=j2s=
2727
#Java2Script Configuration
@@ -70,10 +70,104 @@
7070
</target>
7171

7272

73+
<!-- =================================
74+
target: pack.swt.basic
75+
================================= -->
76+
<target name="pack.swt.basic" description="Building j2s-swt-*.z.js">
77+
<concat destfile="${js.src.dir}/org/eclipse/swt/basic.z.js">
78+
<filelist dir="${js.src.dir}">
79+
<!--
80+
<file name="org/eclipse/swt/SWT.js"/>
81+
<file name="org/eclipse/swt/SWTError.js"/>
82+
<file name="org/eclipse/swt/SWTException.js"/>
83+
84+
<file name="org/eclipse/swt/internal/SWTEventListener.js"/>
85+
<file name="org/eclipse/swt/internal/SWTEventObject.js"/>
86+
-->
87+
<file name="org/eclipse/swt/internal/SerializableCompatibility.js"/>
88+
<file name="org/eclipse/swt/internal/CloneableCompatibility.js"/>
89+
<file name="org/eclipse/swt/internal/RunnableCompatibility.js"/>
90+
91+
<file name="org/eclipse/swt/internal/dnd/HTMLEventWrapper.js"/>
92+
<file name="org/eclipse/swt/internal/dnd/DragListener.js"/>
93+
<file name="org/eclipse/swt/internal/dnd/DragAdapter.js"/>
94+
<file name="org/eclipse/swt/internal/dnd/DragEvent.js"/>
95+
96+
<file name="org/eclipse/swt/internal/struct/WINDOWPOS.js"/>
97+
<file name="org/eclipse/swt/internal/struct/MESSAGE.js"/>
98+
99+
<file name="org/eclipse/swt/accessibility/Accessible.js"/>
100+
101+
<file name="org/eclipse/swt/graphics/Point.js"/>
102+
<file name="org/eclipse/swt/graphics/Rectangle.js"/>
103+
<file name="org/eclipse/swt/graphics/RGB.js"/>
104+
105+
<!--
106+
<file name="org/eclipse/swt/graphics/GC.js"/>
107+
-->
108+
109+
<file name="org/eclipse/swt/graphics/Resource.js"/>
110+
<file name="org/eclipse/swt/graphics/Color.js"/>
111+
<file name="org/eclipse/swt/graphics/Cursor.js"/>
112+
113+
<file name="org/eclipse/swt/graphics/Drawable.js"/>
114+
<file name="org/eclipse/swt/graphics/Device.js"/>
115+
<file name="org/eclipse/swt/graphics/DeviceData.js"/>
116+
117+
<file name="org/eclipse/swt/widgets/Monitor.js"/>
118+
119+
<!--
120+
<file name="org/eclipse/swt/graphics/ImageData.js"/>
121+
<file name="org/eclipse/swt/graphics/ImageLoader.js"/>
122+
<file name="org/eclipse/swt/graphics/Image.js"/>
123+
124+
<file name="org/eclipse/swt/graphics/Font.js"/>
125+
<file name="org/eclipse/swt/graphics/FontData.js"/>
126+
<file name="org/eclipse/swt/graphics/FontMetrics.js"/>
127+
-->
128+
129+
</filelist>
130+
</concat>
131+
</target>
132+
133+
134+
<!-- =================================
135+
target: pack.swt.basic
136+
================================= -->
137+
<target name="pack.swt.more" description="Building j2s-swt-*.z.js">
138+
<concat destfile="${js.src.dir}/org/eclipse/swt/more.z.js">
139+
<filelist dir="${js.src.dir}">
140+
<file name="org/eclipse/swt/internal/ResizeHandler.js"/>
141+
<file name="org/eclipse/swt/internal/ResizeSystem.js"/>
142+
143+
<file name="org/eclipse/swt/internal/dnd/DragAndDrop.js"/>
144+
<file name="org/eclipse/swt/internal/dnd/DNDUtils.js"/>
145+
<file name="org/eclipse/swt/internal/dnd/ShellFrameDND.js"/>
146+
<!--
147+
-->
148+
<file name="org/eclipse/swt/internal/browser/OS.js"/>
149+
150+
<file name="org/eclipse/swt/graphics/Image.js"/>
151+
152+
<file name="org/eclipse/swt/widgets/Item.js"/>
153+
<file name="org/eclipse/swt/widgets/Layout.js"/>
154+
<!--
155+
<file name="org/eclipse/swt/graphics/ImageData.js"/>
156+
<file name="org/eclipse/swt/graphics/ImageLoader.js"/>
157+
158+
<file name="org/eclipse/swt/graphics/Font.js"/>
159+
<file name="org/eclipse/swt/graphics/FontData.js"/>
160+
<file name="org/eclipse/swt/graphics/FontMetrics.js"/>
161+
-->
162+
163+
</filelist>
164+
</concat>
165+
</target>
166+
73167
<!-- =================================
74168
target: j2s.swt.basic
75169
================================= -->
76-
<target name="j2s.swt.event" depends="j2s.swt.resource" description="Building j2s-swt-*.z.js">
170+
<target name="j2s.swt.event" description="Building j2s-swt-*.z.js">
77171
<concat destfile="${jz.dist.dir}/j2s-swt-event.z.js">
78172
<header filtering="no" trimleading="yes">/*=j2s=
79173
#Java2Script Configuration
@@ -137,10 +231,96 @@
137231
</concat>
138232
</target>
139233

234+
<!-- =================================
235+
target: pack.swt.event
236+
================================= -->
237+
<target name="pack.swt.event" description="Building j2s-swt-*.z.js">
238+
<concat destfile="${js.src.dir}/org/eclipse/swt/events.z.js">
239+
<header filtering="no" trimleading="yes">/*-#
240+
# ["$wt.events.TypedEvent"] -> t$e
241+
# ["$wt.internal.SWTEventListener"] -> e$l
242+
#-*/
243+
</header>
244+
<filelist dir="${js.src.dir}">
245+
<file name="org/eclipse/swt/internal/SWTEventListener.js"/>
246+
<file name="org/eclipse/swt/internal/SWTEventObject.js"/>
247+
248+
<file name="org/eclipse/swt/widgets/Event.js"/>
249+
<file name="org/eclipse/swt/events/TypedEvent.js"/>
250+
251+
<file name="org/eclipse/swt/events/ArmEvent.js"/>
252+
<file name="org/eclipse/swt/events/ControlEvent.js"/>
253+
<file name="org/eclipse/swt/events/DisposeEvent.js"/>
254+
<file name="org/eclipse/swt/events/FocusEvent.js"/>
255+
<file name="org/eclipse/swt/events/HelpEvent.js"/>
256+
<file name="org/eclipse/swt/events/KeyEvent.js"/>
257+
<file name="org/eclipse/swt/events/MenuEvent.js"/>
258+
<file name="org/eclipse/swt/events/ModifyEvent.js"/>
259+
<file name="org/eclipse/swt/events/MouseAdapter.js"/>
260+
<file name="org/eclipse/swt/events/MouseEvent.js"/>
261+
<file name="org/eclipse/swt/events/PaintEvent.js"/>
262+
<file name="org/eclipse/swt/events/SelectionEvent.js"/>
263+
<file name="org/eclipse/swt/events/ShellEvent.js"/>
264+
<file name="org/eclipse/swt/events/TraverseEvent.js"/>
265+
<file name="org/eclipse/swt/events/TreeEvent.js"/>
266+
<file name="org/eclipse/swt/events/VerifyEvent.js"/>
267+
268+
<file name="org/eclipse/swt/widgets/Listener.js"/>
269+
<file name="org/eclipse/swt/widgets/TypedListener.js"/>
270+
271+
<file name="org/eclipse/swt/events/ArmListener.js"/>
272+
<file name="org/eclipse/swt/events/ControlListener.js"/>
273+
<file name="org/eclipse/swt/events/ControlAdapter.js"/>
274+
<file name="org/eclipse/swt/events/DisposeListener.js"/>
275+
<file name="org/eclipse/swt/events/FocusListener.js"/>
276+
<file name="org/eclipse/swt/events/FocusAdapter.js"/>
277+
<file name="org/eclipse/swt/events/HelpListener.js"/>
278+
<file name="org/eclipse/swt/events/KeyListener.js"/>
279+
<file name="org/eclipse/swt/events/KeyAdapter.js"/>
280+
<file name="org/eclipse/swt/events/MenuListener.js"/>
281+
<file name="org/eclipse/swt/events/MenuAdapter.js"/>
282+
<file name="org/eclipse/swt/events/ModifyListener.js"/>
283+
<file name="org/eclipse/swt/events/MouseListener.js"/>
284+
<file name="org/eclipse/swt/events/MouseMoveListener.js"/>
285+
<file name="org/eclipse/swt/events/MouseTrackListener.js"/>
286+
<file name="org/eclipse/swt/events/MouseTrackAdapter.js"/>
287+
<file name="org/eclipse/swt/events/PaintListener.js"/>
288+
<file name="org/eclipse/swt/events/SelectionListener.js"/>
289+
<file name="org/eclipse/swt/events/SelectionAdapter.js"/>
290+
<file name="org/eclipse/swt/events/ShellListener.js"/>
291+
<file name="org/eclipse/swt/events/ShellAdapter.js"/>
292+
<file name="org/eclipse/swt/events/TraverseListener.js"/>
293+
<file name="org/eclipse/swt/events/TreeListener.js"/>
294+
<file name="org/eclipse/swt/events/TreeAdapter.js"/>
295+
<file name="org/eclipse/swt/events/VerifyListener.js"/>
296+
297+
<file name="org/eclipse/swt/widgets/EventTable.js"/>
298+
</filelist>
299+
</concat>
300+
<java classname="net.sf.j2s.lib.build.SmartJSCompressor">
301+
<arg value="workspace/net.sf.j2s.lib/${js.src.dir}/org/eclipse/swt/events.z.js"/>
302+
<arg value="workspace/net.sf.j2s.lib/${js.src.dir}/org/eclipse/swt/events.js"/>
303+
304+
<classpath>
305+
<pathelement path="bin"/>
306+
</classpath>
307+
</java>
308+
<concat destfile="${js.src.dir}/org/eclipse/swt/events.z.js">
309+
<header filtering="no" trimleading="yes">
310+
var t$e = ["$wt.events.TypedEvent"];
311+
var e$l = ["$wt.internal.SWTEventListener"];
312+
</header>
313+
<filelist dir="${js.src.dir}">
314+
<file name="org/eclipse/swt/events.js"/>
315+
</filelist>
316+
</concat>
317+
<delete file="${js.src.dir}/org/eclipse/swt/events.js"></delete>
318+
</target>
319+
140320
<!-- =================================
141321
target: j2s.swt.widget
142322
================================= -->
143-
<target name="j2s.swt.layout" depends="j2s.swt.resource" description="Building j2s-swt-*.z.js">
323+
<target name="j2s.swt.layout" description="Building j2s-swt-*.z.js">
144324
<concat destfile="${jz.dist.dir}/j2s-swt-layout.z.js">
145325
<header filtering="no" trimleading="yes">/*=j2s=
146326
#Java2Script Configuration
@@ -168,7 +348,7 @@
168348
<!-- =================================
169349
target: j2s.swt.widget
170350
================================= -->
171-
<target name="j2s.swt.widget" depends="j2s.swt.resource" description="Building j2s-swt-*.z.js">
351+
<target name="j2s.swt.widget" description="Building j2s-swt-*.z.js">
172352
<concat destfile="${jz.dist.dir}/j2s-swt-widget.z.js">
173353
<header filtering="no" trimleading="yes">/*=j2s=
174354
#Java2Script Configuration
@@ -227,7 +407,7 @@
227407
<!-- =================================
228408
target: j2s.swt.widget
229409
================================= -->
230-
<target name="j2s.swt.more" depends="j2s.swt.resource" description="Building j2s-swt-*.z.js">
410+
<target name="j2s.swt.more" description="Building j2s-swt-*.z.js">
231411
<concat destfile="${jz.dist.dir}/j2s-swt-more.z.js">
232412
<header filtering="no" trimleading="yes">/*=j2s=
233413
#Java2Script Configuration
@@ -276,7 +456,7 @@
276456
<!-- =================================
277457
target: j2s.swt.custom
278458
================================= -->
279-
<target name="j2s.swt.custom" depends="j2s.swt.resource" description="Building j2s-swt-*.z.js">
459+
<target name="j2s.swt.custom" description="Building j2s-swt-*.z.js">
280460
<concat destfile="${jz.dist.dir}/j2s-swt-custom.z.js">
281461
<header filtering="no" trimleading="yes">/*=j2s=
282462
#Java2Script Configuration
@@ -312,7 +492,7 @@
312492
<!-- =================================
313493
target: j2s.swt.widget
314494
================================= -->
315-
<target name="j2s.swt.other" depends="j2s.swt.resource" description="Building j2s-swt-*.z.js">
495+
<target name="j2s.swt.other" description="Building j2s-swt-*.z.js">
316496
<concat destfile="${jz.dist.dir}/j2s-swt-other.z.js">
317497
<header filtering="no" trimleading="yes">/*=j2s=
318498
#Java2Script Configuration
@@ -330,13 +510,5 @@
330510
</concat>
331511
</target>
332512

333-
<!-- =================================
334-
target: j2s.swt.resource
335-
================================= -->
336-
<target name="j2s.swt.resource" depends="" description="Copy css/image resources">
337-
<copy todir="${jz.dist.dir}">
338-
<fileset dir="${js.swt.dir}/j2sswt"/>
339-
</copy>
340-
</target>
341513
</project>
342514

sources/net.sf.j2s.lib/j2slib/j2slib.z.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)