@@ -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,13 +76,16 @@ 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" >
83
- <not >
84
- <istrue value =" ${jar.archive.disabled}" />
85
- </not >
83
+ <or >
84
+ <not >
85
+ <istrue value =" ${jar.archive.disabled}" />
86
+ </not >
87
+ <istrue value =" ${not.archive.disabled}" />
88
+ </or >
86
89
</condition >
87
90
<condition property =" do.mkdist" >
88
91
<and >
@@ -153,6 +156,7 @@ is divided into following sections:
153
156
<property name =" application.args" value =" " />
154
157
<property name =" source.encoding" value =" ${file.encoding}" />
155
158
<property name =" runtime.encoding" value =" ${source.encoding}" />
159
+ <property name =" manifest.encoding" value =" ${source.encoding}" />
156
160
<condition property =" javadoc.encoding.used" value =" ${javadoc.encoding}" >
157
161
<and >
158
162
<isset property =" javadoc.encoding" />
@@ -188,7 +192,12 @@ is divided into following sections:
188
192
</not >
189
193
</and >
190
194
</condition >
191
- <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 >
192
201
<property name =" jar.index" value =" false" />
193
202
<property name =" jar.index.metainf" value =" ${jar.index}" />
194
203
<property name =" copylibs.rebase" value =" true" />
@@ -214,6 +223,7 @@ is divided into following sections:
214
223
<condition else =" " property =" testng.debug.mode" value =" -mixed" >
215
224
<istrue value =" ${junit+testng.available}" />
216
225
</condition >
226
+ <property name =" java.failonerror" value =" true" />
217
227
</target >
218
228
<target name =" -post-init" >
219
229
<!-- Empty placeholder for easier customization. -->
@@ -690,7 +700,7 @@ is divided into following sections:
690
700
<sequential >
691
701
<property environment =" env" />
692
702
<resolve name =" profiler.current.path" value =" ${profiler.info.pathvar}" />
693
- <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}" >
694
704
<jvmarg line =" ${endorsed.classpath.cmd.line.arg}" />
695
705
<jvmarg value =" ${profiler.info.jvmargs.agent}" />
696
706
<jvmarg line =" ${profiler.info.jvmargs}" />
@@ -765,7 +775,7 @@ is divided into following sections:
765
775
<attribute default =" ${debug.classpath}" name =" classpath" />
766
776
<element name =" customize" optional =" true" />
767
777
<sequential >
768
- <java classname =" @{classname}" dir =" ${work.dir}" fork =" true" >
778
+ <java classname =" @{classname}" dir =" ${work.dir}" failonerror = " ${java.failonerror} " fork =" true" >
769
779
<jvmarg line =" ${endorsed.classpath.cmd.line.arg}" />
770
780
<jvmarg line =" ${debug-args-line}" />
771
781
<jvmarg value =" -Xrunjdwp:transport=${debug-transport},address=${jpda.address}" />
@@ -792,7 +802,7 @@ is divided into following sections:
792
802
<attribute default =" jvm" name =" jvm" />
793
803
<element name =" customize" optional =" true" />
794
804
<sequential >
795
- <java classname =" @{classname}" dir =" ${work.dir}" fork =" true" >
805
+ <java classname =" @{classname}" dir =" ${work.dir}" failonerror = " ${java.failonerror} " fork =" true" >
796
806
<jvmarg line =" ${endorsed.classpath.cmd.line.arg}" />
797
807
<jvmarg value =" -Dfile.encoding=${runtime.encoding}" />
798
808
<redirector errorencoding =" ${runtime.encoding}" inputencoding =" ${runtime.encoding}" outputencoding =" ${runtime.encoding}" />
@@ -831,7 +841,7 @@ is divided into following sections:
831
841
</chainedmapper >
832
842
</pathconvert >
833
843
<taskdef classname =" org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath =" ${libs.CopyLibs.classpath}" name =" copylibs" />
834
- <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}" >
835
845
<fileset dir =" ${build.classes.dir}" excludes =" ${dist.archive.excludes}" />
836
846
<manifest >
837
847
<attribute name =" Class-Path" value =" ${jar.classpath}" />
@@ -843,7 +853,7 @@ is divided into following sections:
843
853
</target >
844
854
<target name =" -init-presetdef-jar" >
845
855
<presetdef name =" jar" uri =" http://www.netbeans.org/ns/j2se-project/1" >
846
- <jar compress =" ${jar.compress}" index =" ${jar.index}" jarfile =" ${dist.jar}" >
856
+ <jar compress =" ${jar.compress}" index =" ${jar.index}" jarfile =" ${dist.jar}" manifestencoding = " UTF-8 " >
847
857
<j2seproject1 : fileset dir =" ${build.classes.dir}" excludes =" ${dist.archive.excludes}" />
848
858
</jar >
849
859
</presetdef >
@@ -966,23 +976,23 @@ is divided into following sections:
966
976
</target >
967
977
<target depends =" init" if =" do.archive+manifest.available" name =" -do-jar-copy-manifest" >
968
978
<tempfile deleteonexit =" true" destdir =" ${build.dir}" property =" tmp.manifest.file" />
969
- <copy file =" ${manifest.file}" tofile =" ${tmp.manifest.file}" />
979
+ <copy encoding = " ${manifest.encoding} " file =" ${manifest.file}" outputencoding = " UTF-8 " tofile =" ${tmp.manifest.file}" />
970
980
</target >
971
981
<target depends =" init,-do-jar-create-manifest,-do-jar-copy-manifest" if =" do.archive+main.class.available" name =" -do-jar-set-mainclass" >
972
- <manifest file =" ${tmp.manifest.file}" mode =" update" >
982
+ <manifest encoding = " UTF-8 " file =" ${tmp.manifest.file}" mode =" update" >
973
983
<attribute name =" Main-Class" value =" ${main.class}" />
974
984
</manifest >
975
985
</target >
976
986
<target depends =" init,-do-jar-create-manifest,-do-jar-copy-manifest" if =" do.archive+profile.available" name =" -do-jar-set-profile" >
977
- <manifest file =" ${tmp.manifest.file}" mode =" update" >
987
+ <manifest encoding = " UTF-8 " file =" ${tmp.manifest.file}" mode =" update" >
978
988
<attribute name =" Profile" value =" ${javac.profile}" />
979
989
</manifest >
980
990
</target >
981
991
<target depends =" init,-do-jar-create-manifest,-do-jar-copy-manifest" if =" do.archive+splashscreen.available" name =" -do-jar-set-splashscreen" >
982
992
<basename file =" ${application.splash}" property =" splashscreen.basename" />
983
993
<mkdir dir =" ${build.classes.dir}/META-INF" />
984
994
<copy failonerror =" false" file =" ${application.splash}" todir =" ${build.classes.dir}/META-INF" />
985
- <manifest file =" ${tmp.manifest.file}" mode =" update" >
995
+ <manifest encoding = " UTF-8 " file =" ${tmp.manifest.file}" mode =" update" >
986
996
<attribute name =" SplashScreen-Image" value =" META-INF/${splashscreen.basename}" />
987
997
</manifest >
988
998
</target >
@@ -1177,7 +1187,7 @@ is divided into following sections:
1177
1187
<target depends =" -profile-check" description =" Profile a selected class in the IDE." if =" profiler.configured" name =" profile-test-with-main" >
1178
1188
<fail unless =" run.class" >Must select one file in the IDE or set run.class</fail >
1179
1189
<startprofiler />
1180
- <antcal target =" run-test-with-main" />
1190
+ <antcall target =" run-test-with-main" />
1181
1191
</target >
1182
1192
<target depends =" -profile-check,-profile-applet-pre72" if =" profiler.configured" name =" profile-applet" unless =" profiler.info.jvmargs.agent" >
1183
1193
<fail unless =" applet.url" >Must select one file in the IDE or set applet.url</fail >
@@ -1199,11 +1209,14 @@ is divided into following sections:
1199
1209
</not >
1200
1210
</and >
1201
1211
</condition >
1202
- <javadoc additionalparam =" ${javadoc.additionalparam}" author =" ${javadoc.author}" charset =" UTF-8" destdir =" ${dist.javadoc.dir}" docencoding =" UTF-8" encoding =" ${javadoc.encoding.used}" failonerror =" true" noindex =" ${javadoc.noindex}" nonavbar =" ${javadoc.nonavbar}" notree =" ${javadoc.notree}" private =" ${javadoc.private}" source =" ${javac.source}" splitindex =" ${javadoc.splitindex}" use =" ${javadoc.use}" useexternalfile =" true" version =" ${javadoc.version}" windowtitle =" ${javadoc.windowtitle}" >
1212
+ <condition else =" " property =" bug5101868workaround" value =" *.java" >
1213
+ <matches pattern =" 1\.[56](\..*)?" string =" ${java.version}" />
1214
+ </condition >
1215
+ <javadoc additionalparam =" -J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author =" ${javadoc.author}" charset =" UTF-8" destdir =" ${dist.javadoc.dir}" docencoding =" UTF-8" encoding =" ${javadoc.encoding.used}" failonerror =" true" noindex =" ${javadoc.noindex}" nonavbar =" ${javadoc.nonavbar}" notree =" ${javadoc.notree}" private =" ${javadoc.private}" source =" ${javac.source}" splitindex =" ${javadoc.splitindex}" use =" ${javadoc.use}" useexternalfile =" true" version =" ${javadoc.version}" windowtitle =" ${javadoc.windowtitle}" >
1203
1216
<classpath >
1204
1217
<path path =" ${javac.classpath}" />
1205
1218
</classpath >
1206
- <fileset dir =" ${src.dir}" excludes =" *.java ,${excludes}" includes =" ${includes}" >
1219
+ <fileset dir =" ${src.dir}" excludes =" ${bug5101868workaround} ,${excludes}" includes =" ${includes}" >
1207
1220
<filename name =" **/*.java" />
1208
1221
</fileset >
1209
1222
<fileset dir =" ${build.generated.sources.dir}" erroronmissingdir =" false" >
@@ -1277,7 +1290,7 @@ is divided into following sections:
1277
1290
<mkdir dir =" ${build.test.results.dir}" />
1278
1291
</target >
1279
1292
<target depends =" init,compile-test,-pre-test-run" if =" have.tests" name =" -do-test-run" >
1280
- <j2seproject3 : test testincludes =" **/*Test.java" />
1293
+ <j2seproject3 : test includes = " ${includes} " testincludes =" **/*Test.java" />
1281
1294
</target >
1282
1295
<target depends =" init,compile-test,-pre-test-run,-do-test-run" if =" have.tests" name =" -post-test-run" >
1283
1296
<fail if =" tests.failed" unless =" ignore.failing.tests" >Some tests failed; see details above.</fail >
0 commit comments