1.1 --- a/java/alt2xml-in-fs/nbproject/build-impl.xml Sat Nov 14 12:51:17 2020 +0100
1.2 +++ b/java/alt2xml-in-fs/nbproject/build-impl.xml Sun Nov 15 20:08:59 2020 +0100
1.3 @@ -46,8 +46,8 @@
1.4 <property file="${user.properties.file}"/>
1.5 <!-- The two properties below are usually overridden -->
1.6 <!-- by the active platform. Just a fallback. -->
1.7 - <property name="default.javac.source" value="1.4"/>
1.8 - <property name="default.javac.target" value="1.4"/>
1.9 + <property name="default.javac.source" value="1.6"/>
1.10 + <property name="default.javac.target" value="1.6"/>
1.11 </target>
1.12 <target depends="-pre-init,-init-private,-init-user" name="-init-project">
1.13 <property file="nbproject/configs/${config}.properties"/>
1.14 @@ -76,7 +76,7 @@
1.15 <and>
1.16 <isset property="javac.profile"/>
1.17 <length length="0" string="${javac.profile}" when="greater"/>
1.18 - <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
1.19 + <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
1.20 </and>
1.21 </condition>
1.22 <condition property="do.archive">
1.23 @@ -157,6 +157,7 @@
1.24 <property name="application.args" value=""/>
1.25 <property name="source.encoding" value="${file.encoding}"/>
1.26 <property name="runtime.encoding" value="${source.encoding}"/>
1.27 + <property name="manifest.encoding" value="${source.encoding}"/>
1.28 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
1.29 <and>
1.30 <isset property="javadoc.encoding"/>
1.31 @@ -842,7 +843,7 @@
1.32 </chainedmapper>
1.33 </pathconvert>
1.34 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
1.35 - <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}">
1.36 + <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}">
1.37 <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
1.38 <manifest>
1.39 <attribute name="Class-Path" value="${jar.classpath}"/>
1.40 @@ -854,7 +855,7 @@
1.41 </target>
1.42 <target name="-init-presetdef-jar">
1.43 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
1.44 - <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
1.45 + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
1.46 <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
1.47 </jar>
1.48 </presetdef>
1.49 @@ -986,15 +987,15 @@
1.50 </target>
1.51 <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
1.52 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
1.53 - <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
1.54 + <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
1.55 </target>
1.56 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
1.57 - <manifest file="${tmp.manifest.file}" mode="update">
1.58 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
1.59 <attribute name="Main-Class" value="${main.class}"/>
1.60 </manifest>
1.61 </target>
1.62 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
1.63 - <manifest file="${tmp.manifest.file}" mode="update">
1.64 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
1.65 <attribute name="Profile" value="${javac.profile}"/>
1.66 </manifest>
1.67 </target>
1.68 @@ -1002,7 +1003,7 @@
1.69 <basename file="${application.splash}" property="splashscreen.basename"/>
1.70 <mkdir dir="${build.classes.dir}/META-INF"/>
1.71 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
1.72 - <manifest file="${tmp.manifest.file}" mode="update">
1.73 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
1.74 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
1.75 </manifest>
1.76 </target>
1.77 @@ -1197,7 +1198,7 @@
1.78 <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
1.79 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
1.80 <startprofiler/>
1.81 - <antcal target="run-test-with-main"/>
1.82 + <antcall target="run-test-with-main"/>
1.83 </target>
1.84 <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
1.85 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
2.1 --- a/java/alt2xml-in-fs/nbproject/genfiles.properties Sat Nov 14 12:51:17 2020 +0100
2.2 +++ b/java/alt2xml-in-fs/nbproject/genfiles.properties Sun Nov 15 20:08:59 2020 +0100
2.3 @@ -4,5 +4,5 @@
2.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
2.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
2.6 nbproject/build-impl.xml.data.CRC32=f3bd0cda
2.7 -nbproject/build-impl.xml.script.CRC32=2a40b72b
2.8 -nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
2.9 +nbproject/build-impl.xml.script.CRC32=93b62f00
2.10 +nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
3.1 --- a/java/alt2xml-in-ini/nbproject/build-impl.xml Sat Nov 14 12:51:17 2020 +0100
3.2 +++ b/java/alt2xml-in-ini/nbproject/build-impl.xml Sun Nov 15 20:08:59 2020 +0100
3.3 @@ -46,8 +46,8 @@
3.4 <property file="${user.properties.file}"/>
3.5 <!-- The two properties below are usually overridden -->
3.6 <!-- by the active platform. Just a fallback. -->
3.7 - <property name="default.javac.source" value="1.4"/>
3.8 - <property name="default.javac.target" value="1.4"/>
3.9 + <property name="default.javac.source" value="1.6"/>
3.10 + <property name="default.javac.target" value="1.6"/>
3.11 </target>
3.12 <target depends="-pre-init,-init-private,-init-user" name="-init-project">
3.13 <property file="nbproject/configs/${config}.properties"/>
3.14 @@ -76,7 +76,7 @@
3.15 <and>
3.16 <isset property="javac.profile"/>
3.17 <length length="0" string="${javac.profile}" when="greater"/>
3.18 - <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
3.19 + <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
3.20 </and>
3.21 </condition>
3.22 <condition property="do.archive">
3.23 @@ -157,6 +157,7 @@
3.24 <property name="application.args" value=""/>
3.25 <property name="source.encoding" value="${file.encoding}"/>
3.26 <property name="runtime.encoding" value="${source.encoding}"/>
3.27 + <property name="manifest.encoding" value="${source.encoding}"/>
3.28 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
3.29 <and>
3.30 <isset property="javadoc.encoding"/>
3.31 @@ -842,7 +843,7 @@
3.32 </chainedmapper>
3.33 </pathconvert>
3.34 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
3.35 - <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}">
3.36 + <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}">
3.37 <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
3.38 <manifest>
3.39 <attribute name="Class-Path" value="${jar.classpath}"/>
3.40 @@ -854,7 +855,7 @@
3.41 </target>
3.42 <target name="-init-presetdef-jar">
3.43 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
3.44 - <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
3.45 + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
3.46 <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
3.47 </jar>
3.48 </presetdef>
3.49 @@ -986,15 +987,15 @@
3.50 </target>
3.51 <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
3.52 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
3.53 - <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
3.54 + <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
3.55 </target>
3.56 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
3.57 - <manifest file="${tmp.manifest.file}" mode="update">
3.58 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
3.59 <attribute name="Main-Class" value="${main.class}"/>
3.60 </manifest>
3.61 </target>
3.62 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
3.63 - <manifest file="${tmp.manifest.file}" mode="update">
3.64 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
3.65 <attribute name="Profile" value="${javac.profile}"/>
3.66 </manifest>
3.67 </target>
3.68 @@ -1002,7 +1003,7 @@
3.69 <basename file="${application.splash}" property="splashscreen.basename"/>
3.70 <mkdir dir="${build.classes.dir}/META-INF"/>
3.71 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
3.72 - <manifest file="${tmp.manifest.file}" mode="update">
3.73 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
3.74 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
3.75 </manifest>
3.76 </target>
3.77 @@ -1197,7 +1198,7 @@
3.78 <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
3.79 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
3.80 <startprofiler/>
3.81 - <antcal target="run-test-with-main"/>
3.82 + <antcall target="run-test-with-main"/>
3.83 </target>
3.84 <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
3.85 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
4.1 --- a/java/alt2xml-in-ini/nbproject/genfiles.properties Sat Nov 14 12:51:17 2020 +0100
4.2 +++ b/java/alt2xml-in-ini/nbproject/genfiles.properties Sun Nov 15 20:08:59 2020 +0100
4.3 @@ -4,5 +4,5 @@
4.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
4.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
4.6 nbproject/build-impl.xml.data.CRC32=baf64108
4.7 -nbproject/build-impl.xml.script.CRC32=a2647b82
4.8 -nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
4.9 +nbproject/build-impl.xml.script.CRC32=1dba7183
4.10 +nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
5.1 --- a/java/alt2xml-in-json/nbproject/build-impl.xml Sat Nov 14 12:51:17 2020 +0100
5.2 +++ b/java/alt2xml-in-json/nbproject/build-impl.xml Sun Nov 15 20:08:59 2020 +0100
5.3 @@ -46,8 +46,8 @@
5.4 <property file="${user.properties.file}"/>
5.5 <!-- The two properties below are usually overridden -->
5.6 <!-- by the active platform. Just a fallback. -->
5.7 - <property name="default.javac.source" value="1.4"/>
5.8 - <property name="default.javac.target" value="1.4"/>
5.9 + <property name="default.javac.source" value="1.6"/>
5.10 + <property name="default.javac.target" value="1.6"/>
5.11 </target>
5.12 <target depends="-pre-init,-init-private,-init-user" name="-init-project">
5.13 <property file="nbproject/configs/${config}.properties"/>
5.14 @@ -76,7 +76,7 @@
5.15 <and>
5.16 <isset property="javac.profile"/>
5.17 <length length="0" string="${javac.profile}" when="greater"/>
5.18 - <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
5.19 + <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
5.20 </and>
5.21 </condition>
5.22 <condition property="do.archive">
5.23 @@ -157,6 +157,7 @@
5.24 <property name="application.args" value=""/>
5.25 <property name="source.encoding" value="${file.encoding}"/>
5.26 <property name="runtime.encoding" value="${source.encoding}"/>
5.27 + <property name="manifest.encoding" value="${source.encoding}"/>
5.28 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
5.29 <and>
5.30 <isset property="javadoc.encoding"/>
5.31 @@ -842,7 +843,7 @@
5.32 </chainedmapper>
5.33 </pathconvert>
5.34 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
5.35 - <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}">
5.36 + <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}">
5.37 <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
5.38 <manifest>
5.39 <attribute name="Class-Path" value="${jar.classpath}"/>
5.40 @@ -854,7 +855,7 @@
5.41 </target>
5.42 <target name="-init-presetdef-jar">
5.43 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
5.44 - <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
5.45 + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
5.46 <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
5.47 </jar>
5.48 </presetdef>
5.49 @@ -986,15 +987,15 @@
5.50 </target>
5.51 <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
5.52 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
5.53 - <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
5.54 + <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
5.55 </target>
5.56 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
5.57 - <manifest file="${tmp.manifest.file}" mode="update">
5.58 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
5.59 <attribute name="Main-Class" value="${main.class}"/>
5.60 </manifest>
5.61 </target>
5.62 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
5.63 - <manifest file="${tmp.manifest.file}" mode="update">
5.64 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
5.65 <attribute name="Profile" value="${javac.profile}"/>
5.66 </manifest>
5.67 </target>
5.68 @@ -1002,7 +1003,7 @@
5.69 <basename file="${application.splash}" property="splashscreen.basename"/>
5.70 <mkdir dir="${build.classes.dir}/META-INF"/>
5.71 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
5.72 - <manifest file="${tmp.manifest.file}" mode="update">
5.73 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
5.74 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
5.75 </manifest>
5.76 </target>
5.77 @@ -1197,7 +1198,7 @@
5.78 <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
5.79 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
5.80 <startprofiler/>
5.81 - <antcal target="run-test-with-main"/>
5.82 + <antcall target="run-test-with-main"/>
5.83 </target>
5.84 <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
5.85 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
6.1 --- a/java/alt2xml-in-json/nbproject/genfiles.properties Sat Nov 14 12:51:17 2020 +0100
6.2 +++ b/java/alt2xml-in-json/nbproject/genfiles.properties Sun Nov 15 20:08:59 2020 +0100
6.3 @@ -4,5 +4,5 @@
6.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
6.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6.6 nbproject/build-impl.xml.data.CRC32=36d981c5
6.7 -nbproject/build-impl.xml.script.CRC32=64d29189
6.8 -nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
6.9 +nbproject/build-impl.xml.script.CRC32=62477e6b
6.10 +nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
7.1 --- a/java/alt2xml-in-properties/nbproject/build-impl.xml Sat Nov 14 12:51:17 2020 +0100
7.2 +++ b/java/alt2xml-in-properties/nbproject/build-impl.xml Sun Nov 15 20:08:59 2020 +0100
7.3 @@ -46,8 +46,8 @@
7.4 <property file="${user.properties.file}"/>
7.5 <!-- The two properties below are usually overridden -->
7.6 <!-- by the active platform. Just a fallback. -->
7.7 - <property name="default.javac.source" value="1.4"/>
7.8 - <property name="default.javac.target" value="1.4"/>
7.9 + <property name="default.javac.source" value="1.6"/>
7.10 + <property name="default.javac.target" value="1.6"/>
7.11 </target>
7.12 <target depends="-pre-init,-init-private,-init-user" name="-init-project">
7.13 <property file="nbproject/configs/${config}.properties"/>
7.14 @@ -76,7 +76,7 @@
7.15 <and>
7.16 <isset property="javac.profile"/>
7.17 <length length="0" string="${javac.profile}" when="greater"/>
7.18 - <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
7.19 + <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
7.20 </and>
7.21 </condition>
7.22 <condition property="do.archive">
7.23 @@ -157,6 +157,7 @@
7.24 <property name="application.args" value=""/>
7.25 <property name="source.encoding" value="${file.encoding}"/>
7.26 <property name="runtime.encoding" value="${source.encoding}"/>
7.27 + <property name="manifest.encoding" value="${source.encoding}"/>
7.28 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
7.29 <and>
7.30 <isset property="javadoc.encoding"/>
7.31 @@ -842,7 +843,7 @@
7.32 </chainedmapper>
7.33 </pathconvert>
7.34 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
7.35 - <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}">
7.36 + <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}">
7.37 <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
7.38 <manifest>
7.39 <attribute name="Class-Path" value="${jar.classpath}"/>
7.40 @@ -854,7 +855,7 @@
7.41 </target>
7.42 <target name="-init-presetdef-jar">
7.43 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
7.44 - <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
7.45 + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
7.46 <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
7.47 </jar>
7.48 </presetdef>
7.49 @@ -986,15 +987,15 @@
7.50 </target>
7.51 <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
7.52 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
7.53 - <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
7.54 + <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
7.55 </target>
7.56 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
7.57 - <manifest file="${tmp.manifest.file}" mode="update">
7.58 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
7.59 <attribute name="Main-Class" value="${main.class}"/>
7.60 </manifest>
7.61 </target>
7.62 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
7.63 - <manifest file="${tmp.manifest.file}" mode="update">
7.64 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
7.65 <attribute name="Profile" value="${javac.profile}"/>
7.66 </manifest>
7.67 </target>
7.68 @@ -1002,7 +1003,7 @@
7.69 <basename file="${application.splash}" property="splashscreen.basename"/>
7.70 <mkdir dir="${build.classes.dir}/META-INF"/>
7.71 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
7.72 - <manifest file="${tmp.manifest.file}" mode="update">
7.73 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
7.74 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
7.75 </manifest>
7.76 </target>
7.77 @@ -1197,7 +1198,7 @@
7.78 <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
7.79 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
7.80 <startprofiler/>
7.81 - <antcal target="run-test-with-main"/>
7.82 + <antcall target="run-test-with-main"/>
7.83 </target>
7.84 <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
7.85 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
8.1 --- a/java/alt2xml-in-properties/nbproject/genfiles.properties Sat Nov 14 12:51:17 2020 +0100
8.2 +++ b/java/alt2xml-in-properties/nbproject/genfiles.properties Sun Nov 15 20:08:59 2020 +0100
8.3 @@ -4,5 +4,5 @@
8.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
8.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
8.6 nbproject/build-impl.xml.data.CRC32=d90e5067
8.7 -nbproject/build-impl.xml.script.CRC32=b7ef3300
8.8 -nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
8.9 +nbproject/build-impl.xml.script.CRC32=b92023a8
8.10 +nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
9.1 --- a/java/alt2xml-lib-input/nbproject/build-impl.xml Sat Nov 14 12:51:17 2020 +0100
9.2 +++ b/java/alt2xml-lib-input/nbproject/build-impl.xml Sun Nov 15 20:08:59 2020 +0100
9.3 @@ -46,8 +46,8 @@
9.4 <property file="${user.properties.file}"/>
9.5 <!-- The two properties below are usually overridden -->
9.6 <!-- by the active platform. Just a fallback. -->
9.7 - <property name="default.javac.source" value="1.4"/>
9.8 - <property name="default.javac.target" value="1.4"/>
9.9 + <property name="default.javac.source" value="1.6"/>
9.10 + <property name="default.javac.target" value="1.6"/>
9.11 </target>
9.12 <target depends="-pre-init,-init-private,-init-user" name="-init-project">
9.13 <property file="nbproject/configs/${config}.properties"/>
9.14 @@ -76,7 +76,7 @@
9.15 <and>
9.16 <isset property="javac.profile"/>
9.17 <length length="0" string="${javac.profile}" when="greater"/>
9.18 - <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
9.19 + <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
9.20 </and>
9.21 </condition>
9.22 <condition property="do.archive">
9.23 @@ -156,6 +156,7 @@
9.24 <property name="application.args" value=""/>
9.25 <property name="source.encoding" value="${file.encoding}"/>
9.26 <property name="runtime.encoding" value="${source.encoding}"/>
9.27 + <property name="manifest.encoding" value="${source.encoding}"/>
9.28 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
9.29 <and>
9.30 <isset property="javadoc.encoding"/>
9.31 @@ -840,7 +841,7 @@
9.32 </chainedmapper>
9.33 </pathconvert>
9.34 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
9.35 - <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}">
9.36 + <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}">
9.37 <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
9.38 <manifest>
9.39 <attribute name="Class-Path" value="${jar.classpath}"/>
9.40 @@ -852,7 +853,7 @@
9.41 </target>
9.42 <target name="-init-presetdef-jar">
9.43 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
9.44 - <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
9.45 + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
9.46 <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
9.47 </jar>
9.48 </presetdef>
9.49 @@ -975,15 +976,15 @@
9.50 </target>
9.51 <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
9.52 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
9.53 - <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
9.54 + <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
9.55 </target>
9.56 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
9.57 - <manifest file="${tmp.manifest.file}" mode="update">
9.58 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
9.59 <attribute name="Main-Class" value="${main.class}"/>
9.60 </manifest>
9.61 </target>
9.62 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
9.63 - <manifest file="${tmp.manifest.file}" mode="update">
9.64 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
9.65 <attribute name="Profile" value="${javac.profile}"/>
9.66 </manifest>
9.67 </target>
9.68 @@ -991,7 +992,7 @@
9.69 <basename file="${application.splash}" property="splashscreen.basename"/>
9.70 <mkdir dir="${build.classes.dir}/META-INF"/>
9.71 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
9.72 - <manifest file="${tmp.manifest.file}" mode="update">
9.73 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
9.74 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
9.75 </manifest>
9.76 </target>
9.77 @@ -1186,7 +1187,7 @@
9.78 <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
9.79 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
9.80 <startprofiler/>
9.81 - <antcal target="run-test-with-main"/>
9.82 + <antcall target="run-test-with-main"/>
9.83 </target>
9.84 <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
9.85 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
10.1 --- a/java/alt2xml-lib-input/nbproject/genfiles.properties Sat Nov 14 12:51:17 2020 +0100
10.2 +++ b/java/alt2xml-lib-input/nbproject/genfiles.properties Sun Nov 15 20:08:59 2020 +0100
10.3 @@ -4,5 +4,5 @@
10.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
10.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
10.6 nbproject/build-impl.xml.data.CRC32=0525abf5
10.7 -nbproject/build-impl.xml.script.CRC32=6e1be653
10.8 -nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
10.9 +nbproject/build-impl.xml.script.CRC32=832f4802
10.10 +nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
11.1 --- a/java/alt2xml-lib-output/nbproject/build-impl.xml Sat Nov 14 12:51:17 2020 +0100
11.2 +++ b/java/alt2xml-lib-output/nbproject/build-impl.xml Sun Nov 15 20:08:59 2020 +0100
11.3 @@ -46,8 +46,8 @@
11.4 <property file="${user.properties.file}"/>
11.5 <!-- The two properties below are usually overridden -->
11.6 <!-- by the active platform. Just a fallback. -->
11.7 - <property name="default.javac.source" value="1.4"/>
11.8 - <property name="default.javac.target" value="1.4"/>
11.9 + <property name="default.javac.source" value="1.6"/>
11.10 + <property name="default.javac.target" value="1.6"/>
11.11 </target>
11.12 <target depends="-pre-init,-init-private,-init-user" name="-init-project">
11.13 <property file="nbproject/configs/${config}.properties"/>
11.14 @@ -76,7 +76,7 @@
11.15 <and>
11.16 <isset property="javac.profile"/>
11.17 <length length="0" string="${javac.profile}" when="greater"/>
11.18 - <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
11.19 + <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
11.20 </and>
11.21 </condition>
11.22 <condition property="do.archive">
11.23 @@ -156,6 +156,7 @@
11.24 <property name="application.args" value=""/>
11.25 <property name="source.encoding" value="${file.encoding}"/>
11.26 <property name="runtime.encoding" value="${source.encoding}"/>
11.27 + <property name="manifest.encoding" value="${source.encoding}"/>
11.28 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
11.29 <and>
11.30 <isset property="javadoc.encoding"/>
11.31 @@ -840,7 +841,7 @@
11.32 </chainedmapper>
11.33 </pathconvert>
11.34 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
11.35 - <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}">
11.36 + <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}">
11.37 <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
11.38 <manifest>
11.39 <attribute name="Class-Path" value="${jar.classpath}"/>
11.40 @@ -852,7 +853,7 @@
11.41 </target>
11.42 <target name="-init-presetdef-jar">
11.43 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
11.44 - <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
11.45 + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
11.46 <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
11.47 </jar>
11.48 </presetdef>
11.49 @@ -975,15 +976,15 @@
11.50 </target>
11.51 <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
11.52 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
11.53 - <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
11.54 + <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
11.55 </target>
11.56 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
11.57 - <manifest file="${tmp.manifest.file}" mode="update">
11.58 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
11.59 <attribute name="Main-Class" value="${main.class}"/>
11.60 </manifest>
11.61 </target>
11.62 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
11.63 - <manifest file="${tmp.manifest.file}" mode="update">
11.64 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
11.65 <attribute name="Profile" value="${javac.profile}"/>
11.66 </manifest>
11.67 </target>
11.68 @@ -991,7 +992,7 @@
11.69 <basename file="${application.splash}" property="splashscreen.basename"/>
11.70 <mkdir dir="${build.classes.dir}/META-INF"/>
11.71 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
11.72 - <manifest file="${tmp.manifest.file}" mode="update">
11.73 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
11.74 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
11.75 </manifest>
11.76 </target>
11.77 @@ -1186,7 +1187,7 @@
11.78 <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
11.79 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
11.80 <startprofiler/>
11.81 - <antcal target="run-test-with-main"/>
11.82 + <antcall target="run-test-with-main"/>
11.83 </target>
11.84 <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
11.85 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
12.1 --- a/java/alt2xml-lib-output/nbproject/genfiles.properties Sat Nov 14 12:51:17 2020 +0100
12.2 +++ b/java/alt2xml-lib-output/nbproject/genfiles.properties Sun Nov 15 20:08:59 2020 +0100
12.3 @@ -4,5 +4,5 @@
12.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
12.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
12.6 nbproject/build-impl.xml.data.CRC32=e334806b
12.7 -nbproject/build-impl.xml.script.CRC32=99672274
12.8 -nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
12.9 +nbproject/build-impl.xml.script.CRC32=d243f770
12.10 +nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
13.1 --- a/java/alt2xml-out-xml/nbproject/build-impl.xml Sat Nov 14 12:51:17 2020 +0100
13.2 +++ b/java/alt2xml-out-xml/nbproject/build-impl.xml Sun Nov 15 20:08:59 2020 +0100
13.3 @@ -46,8 +46,8 @@
13.4 <property file="${user.properties.file}"/>
13.5 <!-- The two properties below are usually overridden -->
13.6 <!-- by the active platform. Just a fallback. -->
13.7 - <property name="default.javac.source" value="1.4"/>
13.8 - <property name="default.javac.target" value="1.4"/>
13.9 + <property name="default.javac.source" value="1.6"/>
13.10 + <property name="default.javac.target" value="1.6"/>
13.11 </target>
13.12 <target depends="-pre-init,-init-private,-init-user" name="-init-project">
13.13 <property file="nbproject/configs/${config}.properties"/>
13.14 @@ -76,7 +76,7 @@
13.15 <and>
13.16 <isset property="javac.profile"/>
13.17 <length length="0" string="${javac.profile}" when="greater"/>
13.18 - <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
13.19 + <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
13.20 </and>
13.21 </condition>
13.22 <condition property="do.archive">
13.23 @@ -157,6 +157,7 @@
13.24 <property name="application.args" value=""/>
13.25 <property name="source.encoding" value="${file.encoding}"/>
13.26 <property name="runtime.encoding" value="${source.encoding}"/>
13.27 + <property name="manifest.encoding" value="${source.encoding}"/>
13.28 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
13.29 <and>
13.30 <isset property="javadoc.encoding"/>
13.31 @@ -842,7 +843,7 @@
13.32 </chainedmapper>
13.33 </pathconvert>
13.34 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
13.35 - <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}">
13.36 + <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}">
13.37 <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
13.38 <manifest>
13.39 <attribute name="Class-Path" value="${jar.classpath}"/>
13.40 @@ -854,7 +855,7 @@
13.41 </target>
13.42 <target name="-init-presetdef-jar">
13.43 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
13.44 - <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
13.45 + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
13.46 <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
13.47 </jar>
13.48 </presetdef>
13.49 @@ -986,15 +987,15 @@
13.50 </target>
13.51 <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
13.52 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
13.53 - <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
13.54 + <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
13.55 </target>
13.56 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
13.57 - <manifest file="${tmp.manifest.file}" mode="update">
13.58 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
13.59 <attribute name="Main-Class" value="${main.class}"/>
13.60 </manifest>
13.61 </target>
13.62 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
13.63 - <manifest file="${tmp.manifest.file}" mode="update">
13.64 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
13.65 <attribute name="Profile" value="${javac.profile}"/>
13.66 </manifest>
13.67 </target>
13.68 @@ -1002,7 +1003,7 @@
13.69 <basename file="${application.splash}" property="splashscreen.basename"/>
13.70 <mkdir dir="${build.classes.dir}/META-INF"/>
13.71 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
13.72 - <manifest file="${tmp.manifest.file}" mode="update">
13.73 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
13.74 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
13.75 </manifest>
13.76 </target>
13.77 @@ -1197,7 +1198,7 @@
13.78 <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
13.79 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
13.80 <startprofiler/>
13.81 - <antcal target="run-test-with-main"/>
13.82 + <antcall target="run-test-with-main"/>
13.83 </target>
13.84 <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
13.85 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
14.1 --- a/java/alt2xml-out-xml/nbproject/genfiles.properties Sat Nov 14 12:51:17 2020 +0100
14.2 +++ b/java/alt2xml-out-xml/nbproject/genfiles.properties Sun Nov 15 20:08:59 2020 +0100
14.3 @@ -4,5 +4,5 @@
14.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
14.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
14.6 nbproject/build-impl.xml.data.CRC32=8237fb99
14.7 -nbproject/build-impl.xml.script.CRC32=2f8bdd01
14.8 -nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
14.9 +nbproject/build-impl.xml.script.CRC32=0c2cf87a
14.10 +nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
15.1 --- a/java/alt2xml-out-xpath/nbproject/build-impl.xml Sat Nov 14 12:51:17 2020 +0100
15.2 +++ b/java/alt2xml-out-xpath/nbproject/build-impl.xml Sun Nov 15 20:08:59 2020 +0100
15.3 @@ -46,8 +46,8 @@
15.4 <property file="${user.properties.file}"/>
15.5 <!-- The two properties below are usually overridden -->
15.6 <!-- by the active platform. Just a fallback. -->
15.7 - <property name="default.javac.source" value="1.4"/>
15.8 - <property name="default.javac.target" value="1.4"/>
15.9 + <property name="default.javac.source" value="1.6"/>
15.10 + <property name="default.javac.target" value="1.6"/>
15.11 </target>
15.12 <target depends="-pre-init,-init-private,-init-user" name="-init-project">
15.13 <property file="nbproject/configs/${config}.properties"/>
15.14 @@ -76,7 +76,7 @@
15.15 <and>
15.16 <isset property="javac.profile"/>
15.17 <length length="0" string="${javac.profile}" when="greater"/>
15.18 - <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
15.19 + <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
15.20 </and>
15.21 </condition>
15.22 <condition property="do.archive">
15.23 @@ -157,6 +157,7 @@
15.24 <property name="application.args" value=""/>
15.25 <property name="source.encoding" value="${file.encoding}"/>
15.26 <property name="runtime.encoding" value="${source.encoding}"/>
15.27 + <property name="manifest.encoding" value="${source.encoding}"/>
15.28 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
15.29 <and>
15.30 <isset property="javadoc.encoding"/>
15.31 @@ -842,7 +843,7 @@
15.32 </chainedmapper>
15.33 </pathconvert>
15.34 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
15.35 - <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}">
15.36 + <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}">
15.37 <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
15.38 <manifest>
15.39 <attribute name="Class-Path" value="${jar.classpath}"/>
15.40 @@ -854,7 +855,7 @@
15.41 </target>
15.42 <target name="-init-presetdef-jar">
15.43 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
15.44 - <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
15.45 + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
15.46 <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
15.47 </jar>
15.48 </presetdef>
15.49 @@ -986,15 +987,15 @@
15.50 </target>
15.51 <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
15.52 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
15.53 - <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
15.54 + <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
15.55 </target>
15.56 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
15.57 - <manifest file="${tmp.manifest.file}" mode="update">
15.58 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
15.59 <attribute name="Main-Class" value="${main.class}"/>
15.60 </manifest>
15.61 </target>
15.62 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
15.63 - <manifest file="${tmp.manifest.file}" mode="update">
15.64 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
15.65 <attribute name="Profile" value="${javac.profile}"/>
15.66 </manifest>
15.67 </target>
15.68 @@ -1002,7 +1003,7 @@
15.69 <basename file="${application.splash}" property="splashscreen.basename"/>
15.70 <mkdir dir="${build.classes.dir}/META-INF"/>
15.71 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
15.72 - <manifest file="${tmp.manifest.file}" mode="update">
15.73 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
15.74 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
15.75 </manifest>
15.76 </target>
15.77 @@ -1197,7 +1198,7 @@
15.78 <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
15.79 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
15.80 <startprofiler/>
15.81 - <antcal target="run-test-with-main"/>
15.82 + <antcall target="run-test-with-main"/>
15.83 </target>
15.84 <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
15.85 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
16.1 --- a/java/alt2xml-out-xpath/nbproject/genfiles.properties Sat Nov 14 12:51:17 2020 +0100
16.2 +++ b/java/alt2xml-out-xpath/nbproject/genfiles.properties Sun Nov 15 20:08:59 2020 +0100
16.3 @@ -4,5 +4,5 @@
16.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
16.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
16.6 nbproject/build-impl.xml.data.CRC32=bc595ddc
16.7 -nbproject/build-impl.xml.script.CRC32=568b087c
16.8 -nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
16.9 +nbproject/build-impl.xml.script.CRC32=d53b8cca
16.10 +nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
17.1 --- a/java/alt2xml-out-xslt/nbproject/build-impl.xml Sat Nov 14 12:51:17 2020 +0100
17.2 +++ b/java/alt2xml-out-xslt/nbproject/build-impl.xml Sun Nov 15 20:08:59 2020 +0100
17.3 @@ -46,8 +46,8 @@
17.4 <property file="${user.properties.file}"/>
17.5 <!-- The two properties below are usually overridden -->
17.6 <!-- by the active platform. Just a fallback. -->
17.7 - <property name="default.javac.source" value="1.4"/>
17.8 - <property name="default.javac.target" value="1.4"/>
17.9 + <property name="default.javac.source" value="1.6"/>
17.10 + <property name="default.javac.target" value="1.6"/>
17.11 </target>
17.12 <target depends="-pre-init,-init-private,-init-user" name="-init-project">
17.13 <property file="nbproject/configs/${config}.properties"/>
17.14 @@ -76,7 +76,7 @@
17.15 <and>
17.16 <isset property="javac.profile"/>
17.17 <length length="0" string="${javac.profile}" when="greater"/>
17.18 - <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
17.19 + <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
17.20 </and>
17.21 </condition>
17.22 <condition property="do.archive">
17.23 @@ -157,6 +157,7 @@
17.24 <property name="application.args" value=""/>
17.25 <property name="source.encoding" value="${file.encoding}"/>
17.26 <property name="runtime.encoding" value="${source.encoding}"/>
17.27 + <property name="manifest.encoding" value="${source.encoding}"/>
17.28 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
17.29 <and>
17.30 <isset property="javadoc.encoding"/>
17.31 @@ -842,7 +843,7 @@
17.32 </chainedmapper>
17.33 </pathconvert>
17.34 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
17.35 - <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}">
17.36 + <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}">
17.37 <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
17.38 <manifest>
17.39 <attribute name="Class-Path" value="${jar.classpath}"/>
17.40 @@ -854,7 +855,7 @@
17.41 </target>
17.42 <target name="-init-presetdef-jar">
17.43 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
17.44 - <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
17.45 + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
17.46 <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
17.47 </jar>
17.48 </presetdef>
17.49 @@ -986,15 +987,15 @@
17.50 </target>
17.51 <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
17.52 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
17.53 - <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
17.54 + <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
17.55 </target>
17.56 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
17.57 - <manifest file="${tmp.manifest.file}" mode="update">
17.58 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
17.59 <attribute name="Main-Class" value="${main.class}"/>
17.60 </manifest>
17.61 </target>
17.62 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
17.63 - <manifest file="${tmp.manifest.file}" mode="update">
17.64 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
17.65 <attribute name="Profile" value="${javac.profile}"/>
17.66 </manifest>
17.67 </target>
17.68 @@ -1002,7 +1003,7 @@
17.69 <basename file="${application.splash}" property="splashscreen.basename"/>
17.70 <mkdir dir="${build.classes.dir}/META-INF"/>
17.71 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
17.72 - <manifest file="${tmp.manifest.file}" mode="update">
17.73 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
17.74 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
17.75 </manifest>
17.76 </target>
17.77 @@ -1197,7 +1198,7 @@
17.78 <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
17.79 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
17.80 <startprofiler/>
17.81 - <antcal target="run-test-with-main"/>
17.82 + <antcall target="run-test-with-main"/>
17.83 </target>
17.84 <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
17.85 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
18.1 --- a/java/alt2xml-out-xslt/nbproject/genfiles.properties Sat Nov 14 12:51:17 2020 +0100
18.2 +++ b/java/alt2xml-out-xslt/nbproject/genfiles.properties Sun Nov 15 20:08:59 2020 +0100
18.3 @@ -4,5 +4,5 @@
18.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
18.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
18.6 nbproject/build-impl.xml.data.CRC32=9ab460fa
18.7 -nbproject/build-impl.xml.script.CRC32=d9d1bcab
18.8 -nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
18.9 +nbproject/build-impl.xml.script.CRC32=03e1a655
18.10 +nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48