java/alt2xml-lib-input/nbproject/build-impl.xml
changeset 114 c3a2c32afaae
parent 110 d4e5d65ba7cf
     1.1 --- a/java/alt2xml-lib-input/nbproject/build-impl.xml	Sat Nov 14 12:51:17 2020 +0100
     1.2 +++ b/java/alt2xml-lib-input/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 @@ -156,6 +156,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 @@ -840,7 +841,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 @@ -852,7 +853,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 @@ -975,15 +976,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 @@ -991,7 +992,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 @@ -1186,7 +1187,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>