sql-dk/sql-dk: comparison java/sql-dk/nbproject/build-impl.xml

equal deleted inserted replaced

-:8bae71482622
+:71439ecbe71f
 </target>
 <target depends="-pre-init,-init-private" name="-init-user">
 <property file="${user.properties.file}"/>
 <!-- The two properties below are usually overridden -->
 <!-- by the active platform. Just a fallback. -->
-<property name="default.javac.source" value="1.4"/>
+<property name="default.javac.source" value="1.6"/>
-<property name="default.javac.target" value="1.4"/>
+<property name="default.javac.target" value="1.6"/>
 </target>
 <target depends="-pre-init,-init-private,-init-user" name="-init-project">
 <property file="nbproject/configs/${config}.properties"/>
 <property file="nbproject/project.properties"/>
 </target>
 </condition>
 <condition property="profile.available">
 <and>
 <isset property="javac.profile"/>
 <length length="0" string="${javac.profile}" when="greater"/>
-<matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
+<matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
 </and>
 </condition>
 <condition property="do.archive">
 <or>
 <not>
 <property name="javac.debug" value="true"/>
 <property name="javadoc.preview" value="true"/>
 <property name="application.args" value=""/>
 <property name="source.encoding" value="${file.encoding}"/>
 <property name="runtime.encoding" value="${source.encoding}"/>
+<property name="manifest.encoding" value="${source.encoding}"/>
 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
 <and>
 <isset property="javadoc.encoding"/>
 <not>
 <equals arg1="${javadoc.encoding}" arg2=""/>
 <not>
 <os family="unix"/>
 </not>
 </and>
 </condition>
-<property name="javac.fork" value="${jdkBug6558476}"/>
+<condition else="false" property="javac.fork">
+<or>
+<istrue value="${jdkBug6558476}"/>
+<istrue value="${javac.external.vm}"/>
+</or>
+</condition>
 <property name="jar.index" value="false"/>
 <property name="jar.index.metainf" value="${jar.index}"/>
 <property name="copylibs.rebase" value="true"/>
 <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
 <condition property="junit.available">
 <istrue value="${junit+testng.available}"/>
 </condition>
 <condition else="" property="testng.debug.mode" value="-mixed">
 <istrue value="${junit+testng.available}"/>
 </condition>
+<property name="java.failonerror" value="true"/>
 </target>
 <target name="-post-init">
 <!-- Empty placeholder for easier customization. -->
 <!-- You can override this target in the ../build.xml file. -->
 </target>
 <attribute default="${main.class}" name="classname"/>
 <element name="customize" optional="true"/>
 <sequential>
 <property environment="env"/>
 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
-<java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
+<java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
 <jvmarg value="${profiler.info.jvmargs.agent}"/>
 <jvmarg line="${profiler.info.jvmargs}"/>
 <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
 <arg line="${application.args}"/>
 <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
 <attribute default="${main.class}" name="classname"/>
 <attribute default="${debug.classpath}" name="classpath"/>
 <element name="customize" optional="true"/>
 <sequential>
-<java classname="@{classname}" dir="${work.dir}" fork="true">
+<java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
 <jvmarg line="${debug-args-line}"/>
 <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
 <attribute default="${main.class}" name="classname"/>
 <attribute default="${run.classpath}" name="classpath"/>
 <attribute default="jvm" name="jvm"/>
 <element name="customize" optional="true"/>
 <sequential>
-<java classname="@{classname}" dir="${work.dir}" fork="true">
+<java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
 <jvmarg line="${run.jvmargs}"/>
 <jvmarg line="${run.jvmargs.ide}"/>
 </filtermapper>
 <globmapper from="*" to="lib/*"/>
 </chainedmapper>
 </pathconvert>
 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-<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}">
+<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}">
 <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
 <manifest>
 <attribute name="Class-Path" value="${jar.classpath}"/>
 <customize/>
 </manifest>
 </sequential>
 </macrodef>
 </target>
 <target name="-init-presetdef-jar">
 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-<jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
+<jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
 <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
 </jar>
 </presetdef>
 </target>
 <target name="-init-ap-cmdline-properties">
 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
 <touch file="${tmp.manifest.file}" verbose="false"/>
 </target>
 <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-<copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
+<copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
 </target>
 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
-<manifest file="${tmp.manifest.file}" mode="update">
+<manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
 <attribute name="Main-Class" value="${main.class}"/>
 </manifest>
 </target>
 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
-<manifest file="${tmp.manifest.file}" mode="update">
+<manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
 <attribute name="Profile" value="${javac.profile}"/>
 </manifest>
 </target>
 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
 <basename file="${application.splash}" property="splashscreen.basename"/>
 <mkdir dir="${build.classes.dir}/META-INF"/>
 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
-<manifest file="${tmp.manifest.file}" mode="update">
+<manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
 </manifest>
 </target>
 <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
 <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
 <antcall target="test-single"/>
 </target>
 <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
 <startprofiler/>
-<antcal target="run-test-with-main"/>
+<antcall target="run-test-with-main"/>
 </target>
 <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
 <startprofiler/>
 <antcall target="run-applet"/>

branch	v_0
changeset 231	71439ecbe71f
parent 173	b48a82a64a02