@@ -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" />
@@ -840,7 +841,7 @@ is divided into following sections:
840
841
</chainedmapper >
841
842
</pathconvert >
842
843
<taskdef classname =" org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath =" ${libs.CopyLibs.classpath}" name =" copylibs" />
843
- <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}" >
844
845
<fileset dir =" ${build.classes.dir}" excludes =" ${dist.archive.excludes}" />
845
846
<manifest >
846
847
<attribute name =" Class-Path" value =" ${jar.classpath}" />
@@ -852,7 +853,7 @@ is divided into following sections:
852
853
</target >
853
854
<target name =" -init-presetdef-jar" >
854
855
<presetdef name =" jar" uri =" http://www.netbeans.org/ns/j2se-project/1" >
855
- <jar compress =" ${jar.compress}" index =" ${jar.index}" jarfile =" ${dist.jar}" >
856
+ <jar compress =" ${jar.compress}" index =" ${jar.index}" jarfile =" ${dist.jar}" manifestencoding = " UTF-8 " >
856
857
<j2seproject1 : fileset dir =" ${build.classes.dir}" excludes =" ${dist.archive.excludes}" />
857
858
</jar >
858
859
</presetdef >
@@ -975,23 +976,23 @@ is divided into following sections:
975
976
</target >
976
977
<target depends =" init" if =" do.archive+manifest.available" name =" -do-jar-copy-manifest" >
977
978
<tempfile deleteonexit =" true" destdir =" ${build.dir}" property =" tmp.manifest.file" />
978
- <copy file =" ${manifest.file}" tofile =" ${tmp.manifest.file}" />
979
+ <copy encoding = " ${manifest.encoding} " file =" ${manifest.file}" outputencoding = " UTF-8 " tofile =" ${tmp.manifest.file}" />
979
980
</target >
980
981
<target depends =" init,-do-jar-create-manifest,-do-jar-copy-manifest" if =" do.archive+main.class.available" name =" -do-jar-set-mainclass" >
981
- <manifest file =" ${tmp.manifest.file}" mode =" update" >
982
+ <manifest encoding = " UTF-8 " file =" ${tmp.manifest.file}" mode =" update" >
982
983
<attribute name =" Main-Class" value =" ${main.class}" />
983
984
</manifest >
984
985
</target >
985
986
<target depends =" init,-do-jar-create-manifest,-do-jar-copy-manifest" if =" do.archive+profile.available" name =" -do-jar-set-profile" >
986
- <manifest file =" ${tmp.manifest.file}" mode =" update" >
987
+ <manifest encoding = " UTF-8 " file =" ${tmp.manifest.file}" mode =" update" >
987
988
<attribute name =" Profile" value =" ${javac.profile}" />
988
989
</manifest >
989
990
</target >
990
991
<target depends =" init,-do-jar-create-manifest,-do-jar-copy-manifest" if =" do.archive+splashscreen.available" name =" -do-jar-set-splashscreen" >
991
992
<basename file =" ${application.splash}" property =" splashscreen.basename" />
992
993
<mkdir dir =" ${build.classes.dir}/META-INF" />
993
994
<copy failonerror =" false" file =" ${application.splash}" todir =" ${build.classes.dir}/META-INF" />
994
- <manifest file =" ${tmp.manifest.file}" mode =" update" >
995
+ <manifest encoding = " UTF-8 " file =" ${tmp.manifest.file}" mode =" update" >
995
996
<attribute name =" SplashScreen-Image" value =" META-INF/${splashscreen.basename}" />
996
997
</manifest >
997
998
</target >
@@ -1186,7 +1187,7 @@ is divided into following sections:
1186
1187
<target depends =" -profile-check" description =" Profile a selected class in the IDE." if =" profiler.configured" name =" profile-test-with-main" >
1187
1188
<fail unless =" run.class" >Must select one file in the IDE or set run.class</fail >
1188
1189
<startprofiler />
1189
- <antcal target =" run-test-with-main" />
1190
+ <antcall target =" run-test-with-main" />
1190
1191
</target >
1191
1192
<target depends =" -profile-check,-profile-applet-pre72" if =" profiler.configured" name =" profile-applet" unless =" profiler.info.jvmargs.agent" >
1192
1193
<fail unless =" applet.url" >Must select one file in the IDE or set applet.url</fail >
0 commit comments