Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 19f470b

Browse files
infinity0infinity0
committed
Properly fail the whole build if there was an error
1 parent 99c633b commit 19f470b

File tree

2 files changed

+40
-39
lines changed

2 files changed

+40
-39
lines changed

‎sources/net.sf.j2s.lib/build/build.xml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
- - - - - - - - - - - - - - - - - -->
4040
<target name="j2s.pack.core">
4141
<!-- This SmartJSCompressor will pack Class.js and ClassExt.js together -->
42-
<java classname="net.sf.j2s.lib.build.SmartJSCompressor">
42+
<java failonerror="true" classname="net.sf.j2s.lib.build.SmartJSCompressor">
4343
<arg value="${j2s.core.src}/java/lang/Class.js"/>
4444
<arg value="${j2s.core.bin}/java/lang/Class.js"/>
4545

@@ -52,7 +52,7 @@
5252
</classpath>
5353
</java>
5454

55-
<java classname="net.sf.j2s.lib.build.SmartJSCompressor">
55+
<java failonerror="true" classname="net.sf.j2s.lib.build.SmartJSCompressor">
5656
<arg value="${j2s.core.src}/java/lang/ClassLoader.js"/>
5757
<arg value="${j2s.core.bin}/java/lang/ClassLoader.js"/>
5858

@@ -65,7 +65,7 @@
6565
</classpath>
6666
</java>
6767

68-
<java classname="net.sf.j2s.lib.build.SmartJSCompressor">
68+
<java failonerror="true" classname="net.sf.j2s.lib.build.SmartJSCompressor">
6969
<arg value="${j2s.core.src}/java/lang/ClassLoaderProgressMonitor.js"/>
7070
<arg value="${j2s.core.bin}/java/lang/ClassLoaderProgressMonitor.js"/>
7171

@@ -78,7 +78,7 @@
7878
</classpath>
7979
</java>
8080

81-
<java classname="net.sf.j2s.lib.build.SmartJSCompressor">
81+
<java failonerror="true" classname="net.sf.j2s.lib.build.SmartJSCompressor">
8282
<arg value="${j2s.core.src}/java/lang/Console.js"/>
8383
<arg value="${j2s.core.bin}/java/lang/Console.js"/>
8484

@@ -90,7 +90,7 @@
9090
<pathelement path="${j2s.lib.project}/bin"/>
9191
</classpath>
9292
</java>
93-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
93+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
9494
<arg value="none"/>
9595
<arg value="${j2s.lib.dist}/j2slib.z.js"/>
9696

@@ -105,7 +105,7 @@
105105
<pathelement path="${j2s.lib.project}/bin"/>
106106
</classpath>
107107
</java>
108-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
108+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
109109
<arg value="none"/>
110110
<arg value="${j2s.lib.dist}/j2slib.src.z.js"/>
111111

@@ -122,7 +122,7 @@
122122
</classpath>
123123
</java>
124124

125-
<java classname="net.sf.j2s.lib.build.SmartJSCompressor">
125+
<java failonerror="true" classname="net.sf.j2s.lib.build.SmartJSCompressor">
126126
<arg value="${j2s.core.src}/java/package.js"/>
127127
<arg value="${j2s.core.bin}/java/package.js"/>
128128

@@ -135,7 +135,7 @@
135135

136136
<mkdir dir="${j2s.core.bin}/org/eclipse/swt/"/>
137137

138-
<java classname="net.sf.j2s.lib.build.SmartJSCompressor">
138+
<java failonerror="true" classname="net.sf.j2s.lib.build.SmartJSCompressor">
139139
<arg value="${j2s.swt.bin}/org/eclipse/swt/package.js"/>
140140
<arg value="${j2s.core.bin}/org/eclipse/swt/package.js"/>
141141

@@ -145,7 +145,7 @@
145145
<pathelement path="${j2s.lib.project}/bin"/>
146146
</classpath>
147147
</java>
148-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
148+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
149149
<arg value="none"/>
150150
<arg value="${j2s.lib.dist}/j2slib.swt.z.js"/>
151151

@@ -166,7 +166,7 @@
166166
<!--<delete file="${j2s.core.bin}/org/eclipse/swt/package.js" quiet="true"/>-->
167167

168168
<!-- j2slibcore.z.js does not contains Console -->
169-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
169+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
170170
<arg value="none"/>
171171
<arg value="${j2s.lib.dist}/j2slibcore.z.js"/>
172172

@@ -185,7 +185,7 @@
185185
target: j2s.pack.common
186186
- - - - - - - - - - - - - - - - - -->
187187
<target name="j2s.pack.common" depends="j2s.pack.prepare">
188-
<java classname="net.sf.j2s.lib.build.J2SConcat">
188+
<java failonerror="true" classname="net.sf.j2s.lib.build.J2SConcat">
189189
<arg value="true"/>
190190
<arg value="${j2s.core.bin}/java/core.z.js"/>
191191

@@ -375,7 +375,7 @@
375375
</classpath>
376376
</java>
377377

378-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
378+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
379379
<arg value="true"/>
380380
<arg value="${j2s.core.bin}/org/apache/harmony/luni/util/Msg.z.js"/>
381381
<arg value="${j2s.core.bin}"/>
@@ -387,7 +387,7 @@
387387
</java>
388388

389389

390-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
390+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
391391
<arg value="true"/>
392392
<arg value="${j2s.core.bin}/java/lang/StringBuilder.z.js"/>
393393
<arg value="${j2s.core.bin}"/>
@@ -510,7 +510,7 @@
510510

511511
<delete file="${j2s.ajax.bin}/net/sf/j2s/ajax/HttpRequest.js" quiet="true"/>
512512

513-
<java classname="net.sf.j2s.lib.build.RegExCompress">
513+
<java failonerror="true" classname="net.sf.j2s.lib.build.RegExCompress">
514514
<arg value="false"/>
515515

516516
<arg value="${j2s.ajax.project}/j2sajax/HttpRequest.js"/>
@@ -543,7 +543,7 @@
543543
target: pack.swt.css
544544
- - - - - - - - - - - - - - - - - -->
545545
<target name="pack.swt.css">
546-
<java classname="net.sf.j2s.lib.build.PackCSSIntoJS">
546+
<java failonerror="true" classname="net.sf.j2s.lib.build.PackCSSIntoJS">
547547
<arg value="${j2s.swt.bin}/"/>
548548

549549
<classpath>
@@ -567,7 +567,7 @@
567567
target: pack.swt.basic
568568
================================= -->
569569
<target name="pack.swt.basic" description="Building j2s-swt-*.z.js">
570-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
570+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
571571
<arg value="true"/>
572572
<arg value="${j2s.swt.bin}/org/eclipse/swt/basic.z.js"/>
573573

@@ -715,7 +715,7 @@
715715
target: pack.swt.more
716716
================================= -->
717717
<target name="pack.swt.more" description="Building j2s-swt-*.z.js">
718-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
718+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
719719
<arg value="true"/>
720720
<arg value="${j2s.swt.bin}/org/eclipse/swt/widgets/more.z.js"/>
721721

@@ -746,7 +746,7 @@
746746
</java>
747747

748748

749-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
749+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
750750
<arg value="true"/>
751751
<arg value="${j2s.swt.bin}/org/eclipse/swt/SWT.z.js"/>
752752
<arg value="${j2s.swt.bin}"/>
@@ -759,7 +759,7 @@
759759
</classpath>
760760
</java>
761761

762-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
762+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
763763
<arg value="true"/>
764764
<arg value="${j2s.swt.bin}/org/eclipse/swt/layout/RowLayout.z.js"/>
765765
<arg value="${j2s.swt.bin}"/>
@@ -772,7 +772,7 @@
772772
</java>
773773

774774

775-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
775+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
776776
<arg value="true"/>
777777
<arg value="${j2s.swt.bin}/org/eclipse/swt/layout/FormLayout.z.js"/>
778778
<arg value="${j2s.swt.bin}"/>
@@ -785,7 +785,7 @@
785785
</classpath>
786786
</java>
787787

788-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
788+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
789789
<arg value="true"/>
790790
<arg value="${j2s.swt.bin}/org/eclipse/swt/widgets/Tree.z.js"/>
791791
<arg value="${j2s.swt.bin}"/>
@@ -799,7 +799,7 @@
799799
</java>
800800

801801

802-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
802+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
803803
<arg value="true"/>
804804
<arg value="${j2s.swt.bin}/org/eclipse/swt/widgets/ToolBar.z.js"/>
805805
<arg value="${j2s.swt.bin}"/>
@@ -812,7 +812,7 @@
812812
</java>
813813

814814

815-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
815+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
816816
<arg value="true"/>
817817
<arg value="${j2s.swt.bin}/org/eclipse/swt/widgets/Table.z.js"/>
818818
<arg value="${j2s.swt.bin}"/>
@@ -826,7 +826,7 @@
826826
</classpath>
827827
</java>
828828

829-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
829+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
830830
<arg value="true"/>
831831
<arg value="${j2s.swt.bin}/org/eclipse/swt/custom/SashForm.z.js"/>
832832
<arg value="${j2s.swt.bin}"/>
@@ -842,7 +842,7 @@
842842
</java>
843843

844844

845-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
845+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
846846
<arg value="true"/>
847847
<arg value="${j2s.swt.bin}/org/eclipse/swt/custom/CTabFolder.z.js"/>
848848
<arg value="${j2s.swt.bin}"/>
@@ -861,7 +861,7 @@
861861
</java>
862862

863863

864-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
864+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
865865
<arg value="true"/>
866866
<arg value="${j2s.swt.bin}/org/eclipse/swt/custom/CLabel.z.js"/>
867867
<arg value="${j2s.swt.bin}"/>
@@ -874,7 +874,7 @@
874874
</java>
875875

876876

877-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
877+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
878878
<arg value="true"/>
879879
<arg value="${j2s.swt.bin}/org/eclipse/swt/custom/CBanner.z.js"/>
880880
<arg value="${j2s.swt.bin}"/>
@@ -887,7 +887,7 @@
887887
</java>
888888

889889

890-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
890+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
891891
<arg value="true"/>
892892
<arg value="${j2s.swt.bin}/org/eclipse/swt/custom/ViewForm.z.js"/>
893893
<arg value="${j2s.swt.bin}"/>
@@ -900,7 +900,7 @@
900900
</java>
901901

902902

903-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
903+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
904904
<arg value="true"/>
905905
<arg value="${j2s.swt.bin}/org/eclipse/swt/widgets/Slider.z.js"/>
906906
<arg value="${j2s.swt.bin}"/>
@@ -913,7 +913,7 @@
913913
</java>
914914

915915

916-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
916+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
917917
<arg value="true"/>
918918
<arg value="${j2s.swt.bin}/org/eclipse/swt/widgets/Scale.z.js"/>
919919
<arg value="${j2s.swt.bin}"/>
@@ -925,7 +925,7 @@
925925
</classpath>
926926
</java>
927927

928-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
928+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
929929
<arg value="true"/>
930930
<arg value="${j2s.swt.bin}/org/eclipse/swt/widgets/CoolBar.z.js"/>
931931
<arg value="${j2s.swt.bin}"/>
@@ -938,7 +938,7 @@
938938
</java>
939939

940940

941-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
941+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
942942
<arg value="true"/>
943943
<arg value="${j2s.swt.bin}/org/eclipse/swt/graphics/Font.z.js"/>
944944
<arg value="${j2s.swt.bin}"/>
@@ -959,7 +959,7 @@
959959
target: pack.swt.shell
960960
================================= -->
961961
<target name="pack.swt.shell" description="Building j2s-swt-*.z.js">
962-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
962+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
963963
<arg value="true"/>
964964
<arg value="${j2s.swt.bin}/org/eclipse/swt/widgets/Shell.z.js"/>
965965

@@ -991,7 +991,7 @@
991991
target: pack.swt.dnd
992992
================================= -->
993993
<target name="pack.swt.dnd" description="Building j2s-swt-*.z.js">
994-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
994+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
995995
<arg value="true"/>
996996
<arg value="${j2s.swt.bin}/org/eclipse/swt/dnd.z.js"/>
997997

@@ -1027,7 +1027,7 @@
10271027
target: pack.jface.viewer
10281028
================================= -->
10291029
<target name="pack.jface.viewer" description="Building jface/viewers.interfaces.z.js">
1030-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
1030+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
10311031
<arg value="false"/>
10321032
<arg value="${j2s.jface.bin}/org/eclipse/jface/viewers.interfaces.z.js"/>
10331033

@@ -1081,7 +1081,7 @@
10811081
target: pack.jface.resource
10821082
================================= -->
10831083
<target name="pack.jface.resource" description="Building jface/resource.z.js">
1084-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
1084+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
10851085
<arg value="false"/>
10861086
<arg value="${j2s.jface.bin}/org/eclipse/jface/resource.z.js"/>
10871087

@@ -1124,7 +1124,7 @@
11241124
target: pack.jface.util
11251125
================================= -->
11261126
<target name="pack.jface.util" description="Building jface/util.z.js">
1127-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
1127+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
11281128
<arg value="false"/>
11291129
<arg value="${j2s.jface.bin}/org/eclipse/jface/util.z.js"/>
11301130

@@ -1151,7 +1151,7 @@
11511151
target: pack.jface.window
11521152
================================= -->
11531153
<target name="pack.jface.window" description="Building jface/window.z.js">
1154-
<java classname="net.sf.j2s.lib.build.UTF8Concat">
1154+
<java failonerror="true" classname="net.sf.j2s.lib.build.UTF8Concat">
11551155
<arg value="false"/>
11561156
<arg value="${j2s.jface.bin}/org/eclipse/jface/window.z.js"/>
11571157

‎sources/net.sf.j2s.lib/src/net/sf/j2s/lib/build/UTF8Concat.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public static void main(String[] args) {
7979
//*/
8080
} catch (FileNotFoundException e) {
8181
e.printStackTrace();
82-
return;
82+
System.exit(1);
8383
}
8484
}
8585
try {
@@ -98,6 +98,7 @@ public static void main(String[] args) {
9898
fos.close();
9999
} catch (IOException e) {
100100
e.printStackTrace();
101+
System.exit(1);
101102
}
102103

103104
}

0 commit comments

Comments
 (0)