@@ -46,8 +46,8 @@ is divided into following sections:
46
46
<property file =" ${user.properties.file}" />
47
47
<!-- The two properties below are usually overridden -->
48
48
<!-- by the active platform. Just a fallback. -->
49
- <property name =" default.javac.source" value =" 1.4 " />
50
- <property name =" default.javac.target" value =" 1.4 " />
49
+ <property name =" default.javac.source" value =" 1.6 " />
50
+ <property name =" default.javac.target" value =" 1.6 " />
51
51
</target >
52
52
<target depends =" -pre-init,-init-private,-init-user" name =" -init-project" >
53
53
<property file =" nbproject/configs/${config}.properties" />
@@ -76,7 +76,7 @@ is divided into following sections:
76
76
<and >
77
77
<isset property =" javac.profile" />
78
78
<length length =" 0" string =" ${javac.profile}" when =" greater" />
79
- <matches pattern =" 1\.[89](\..*)?" string =" ${javac.source}" />
79
+ <matches pattern =" (( 1\.[89])|9) (\..*)?" string =" ${javac.source}" />
80
80
</and >
81
81
</condition >
82
82
<condition property =" do.archive" >
@@ -156,6 +156,7 @@ is divided into following sections:
156
156
<property name =" application.args" value =" " />
157
157
<property name =" source.encoding" value =" ${file.encoding}" />
158
158
<property name =" runtime.encoding" value =" ${source.encoding}" />
159
+ <property name =" manifest.encoding" value =" ${source.encoding}" />
159
160
<condition property =" javadoc.encoding.used" value =" ${javadoc.encoding}" >
160
161
<and >
161
162
<isset property =" javadoc.encoding" />
@@ -191,7 +192,12 @@ is divided into following sections:
191
192
</not >
192
193
</and >
193
194
</condition >
194
- <property name =" javac.fork" value =" ${jdkBug6558476}" />
195
+ <condition else =" false" property =" javac.fork" >
196
+ <or >
197
+ <istrue value =" ${jdkBug6558476}" />
198
+ <istrue value =" ${javac.external.vm}" />
199
+ </or >
200
+ </condition >
195
201
<property name =" jar.index" value =" false" />
196
202
<property name =" jar.index.metainf" value =" ${jar.index}" />
197
203
<property name =" copylibs.rebase" value =" true" />
@@ -217,6 +223,7 @@ is divided into following sections:
217
223
<condition else =" " property =" testng.debug.mode" value =" -mixed" >
218
224
<istrue value =" ${junit+testng.available}" />
219
225
</condition >
226
+ <property name =" java.failonerror" value =" true" />
220
227
</target >
221
228
<target name =" -post-init" >
222
229
<!-- Empty placeholder for easier customization. -->
@@ -693,7 +700,7 @@ is divided into following sections:
693
700
<sequential >
694
701
<property environment =" env" />
695
702
<resolve name =" profiler.current.path" value =" ${profiler.info.pathvar}" />
696
- <java classname =" @{classname}" dir =" ${profiler.info.dir}" fork =" true" jvm =" ${profiler.info.jvm}" >
703
+ <java classname =" @{classname}" dir =" ${profiler.info.dir}" failonerror = " ${java.failonerror} " fork =" true" jvm =" ${profiler.info.jvm}" >
697
704
<jvmarg line =" ${endorsed.classpath.cmd.line.arg}" />
698
705
<jvmarg value =" ${profiler.info.jvmargs.agent}" />
699
706
<jvmarg line =" ${profiler.info.jvmargs}" />
@@ -768,7 +775,7 @@ is divided into following sections:
768
775
<attribute default =" ${debug.classpath}" name =" classpath" />
769
776
<element name =" customize" optional =" true" />
770
777
<sequential >
771
- <java classname =" @{classname}" dir =" ${work.dir}" fork =" true" >
778
+ <java classname =" @{classname}" dir =" ${work.dir}" failonerror = " ${java.failonerror} " fork =" true" >
772
779
<jvmarg line =" ${endorsed.classpath.cmd.line.arg}" />
773
780
<jvmarg line =" ${debug-args-line}" />
774
781
<jvmarg value =" -Xrunjdwp:transport=${debug-transport},address=${jpda.address}" />
@@ -795,7 +802,7 @@ is divided into following sections:
795
802
<attribute default =" jvm" name =" jvm" />
796
803
<element name =" customize" optional =" true" />
797
804
<sequential >
798
- <java classname =" @{classname}" dir =" ${work.dir}" fork =" true" >
805
+ <java classname =" @{classname}" dir =" ${work.dir}" failonerror = " ${java.failonerror} " fork =" true" >
799
806
<jvmarg line =" ${endorsed.classpath.cmd.line.arg}" />
800
807
<jvmarg value =" -Dfile.encoding=${runtime.encoding}" />
801
808
<redirector errorencoding =" ${runtime.encoding}" inputencoding =" ${runtime.encoding}" outputencoding =" ${runtime.encoding}" />
@@ -834,7 +841,7 @@ is divided into following sections:
834
841
</chainedmapper >
835
842
</pathconvert >
836
843
<taskdef classname =" org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath =" ${libs.CopyLibs.classpath}" name =" copylibs" />
837
- <copylibs compress =" ${jar.compress}" excludeFromCopy =" ${copylibs.excludes}" index =" ${jar.index}" indexMetaInf =" ${jar.index.metainf}" jarfile =" ${dist.jar}" manifest =" @{manifest}" rebase =" ${copylibs.rebase}" runtimeclasspath =" ${run.classpath.without.build.classes.dir}" >
844
+ <copylibs compress =" ${jar.compress}" excludeFromCopy =" ${copylibs.excludes}" index =" ${jar.index}" indexMetaInf =" ${jar.index.metainf}" jarfile =" ${dist.jar}" manifest =" @{manifest}" manifestencoding = " UTF-8 " rebase =" ${copylibs.rebase}" runtimeclasspath =" ${run.classpath.without.build.classes.dir}" >
838
845
<fileset dir =" ${build.classes.dir}" excludes =" ${dist.archive.excludes}" />
839
846
<manifest >
840
847
<attribute name =" Class-Path" value =" ${jar.classpath}" />
@@ -846,7 +853,7 @@ is divided into following sections:
846
853
</target >
847
854
<target name =" -init-presetdef-jar" >
848
855
<presetdef name =" jar" uri =" http://www.netbeans.org/ns/j2se-project/1" >
849
- <jar compress =" ${jar.compress}" index =" ${jar.index}" jarfile =" ${dist.jar}" >
856
+ <jar compress =" ${jar.compress}" index =" ${jar.index}" jarfile =" ${dist.jar}" manifestencoding = " UTF-8 " >
850
857
<j2seproject1 : fileset dir =" ${build.classes.dir}" excludes =" ${dist.archive.excludes}" />
851
858
</jar >
852
859
</presetdef >
@@ -969,23 +976,23 @@ is divided into following sections:
969
976
</target >
970
977
<target depends =" init" if =" do.archive+manifest.available" name =" -do-jar-copy-manifest" >
971
978
<tempfile deleteonexit =" true" destdir =" ${build.dir}" property =" tmp.manifest.file" />
972
- <copy file =" ${manifest.file}" tofile =" ${tmp.manifest.file}" />
979
+ <copy encoding = " ${manifest.encoding} " file =" ${manifest.file}" outputencoding = " UTF-8 " tofile =" ${tmp.manifest.file}" />
973
980
</target >
974
981
<target depends =" init,-do-jar-create-manifest,-do-jar-copy-manifest" if =" do.archive+main.class.available" name =" -do-jar-set-mainclass" >
975
- <manifest file =" ${tmp.manifest.file}" mode =" update" >
982
+ <manifest encoding = " UTF-8 " file =" ${tmp.manifest.file}" mode =" update" >
976
983
<attribute name =" Main-Class" value =" ${main.class}" />
977
984
</manifest >
978
985
</target >
979
986
<target depends =" init,-do-jar-create-manifest,-do-jar-copy-manifest" if =" do.archive+profile.available" name =" -do-jar-set-profile" >
980
- <manifest file =" ${tmp.manifest.file}" mode =" update" >
987
+ <manifest encoding = " UTF-8 " file =" ${tmp.manifest.file}" mode =" update" >
981
988
<attribute name =" Profile" value =" ${javac.profile}" />
982
989
</manifest >
983
990
</target >
984
991
<target depends =" init,-do-jar-create-manifest,-do-jar-copy-manifest" if =" do.archive+splashscreen.available" name =" -do-jar-set-splashscreen" >
985
992
<basename file =" ${application.splash}" property =" splashscreen.basename" />
986
993
<mkdir dir =" ${build.classes.dir}/META-INF" />
987
994
<copy failonerror =" false" file =" ${application.splash}" todir =" ${build.classes.dir}/META-INF" />
988
- <manifest file =" ${tmp.manifest.file}" mode =" update" >
995
+ <manifest encoding = " UTF-8 " file =" ${tmp.manifest.file}" mode =" update" >
989
996
<attribute name =" SplashScreen-Image" value =" META-INF/${splashscreen.basename}" />
990
997
</manifest >
991
998
</target >
@@ -1180,7 +1187,7 @@ is divided into following sections:
1180
1187
<target depends =" -profile-check" description =" Profile a selected class in the IDE." if =" profiler.configured" name =" profile-test-with-main" >
1181
1188
<fail unless =" run.class" >Must select one file in the IDE or set run.class</fail >
1182
1189
<startprofiler />
1183
- <antcal target =" run-test-with-main" />
1190
+ <antcall target =" run-test-with-main" />
1184
1191
</target >
1185
1192
<target depends =" -profile-check,-profile-applet-pre72" if =" profiler.configured" name =" profile-applet" unless =" profiler.info.jvmargs.agent" >
1186
1193
<fail unless =" applet.url" >Must select one file in the IDE or set applet.url</fail >
0 commit comments