# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1475425238 -7200
# Node ID d4e5d65ba7cfbc568462db9bdd6201f50d85c28e
# Parent 76df01fc4aa224bb9298164e207e4104dd70717a
netbeans
diff -r 76df01fc4aa2 -r d4e5d65ba7cf java/alt2xml-in-fs/nbproject/build-impl.xml
--- a/java/alt2xml-in-fs/nbproject/build-impl.xml Sun Oct 02 15:23:20 2016 +0200
+++ b/java/alt2xml-in-fs/nbproject/build-impl.xml Sun Oct 02 18:20:38 2016 +0200
@@ -192,7 +192,12 @@
</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"/>
@@ -218,6 +223,7 @@
<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. -->
@@ -695,7 +701,7 @@
<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}"/>
@@ -770,7 +776,7 @@
<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}"/>
@@ -797,7 +803,7 @@
<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}"/>
diff -r 76df01fc4aa2 -r d4e5d65ba7cf java/alt2xml-in-fs/nbproject/genfiles.properties
--- a/java/alt2xml-in-fs/nbproject/genfiles.properties Sun Oct 02 15:23:20 2016 +0200
+++ b/java/alt2xml-in-fs/nbproject/genfiles.properties Sun Oct 02 18:20:38 2016 +0200
@@ -4,5 +4,5 @@
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=f3bd0cda
-nbproject/build-impl.xml.script.CRC32=7d9f3106
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
+nbproject/build-impl.xml.script.CRC32=2a40b72b
+nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
diff -r 76df01fc4aa2 -r d4e5d65ba7cf java/alt2xml-in-ini/nbproject/build-impl.xml
--- a/java/alt2xml-in-ini/nbproject/build-impl.xml Sun Oct 02 15:23:20 2016 +0200
+++ b/java/alt2xml-in-ini/nbproject/build-impl.xml Sun Oct 02 18:20:38 2016 +0200
@@ -192,7 +192,12 @@
</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"/>
@@ -218,6 +223,7 @@
<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. -->
@@ -695,7 +701,7 @@
<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}"/>
@@ -770,7 +776,7 @@
<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}"/>
@@ -797,7 +803,7 @@
<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}"/>
diff -r 76df01fc4aa2 -r d4e5d65ba7cf java/alt2xml-in-ini/nbproject/genfiles.properties
--- a/java/alt2xml-in-ini/nbproject/genfiles.properties Sun Oct 02 15:23:20 2016 +0200
+++ b/java/alt2xml-in-ini/nbproject/genfiles.properties Sun Oct 02 18:20:38 2016 +0200
@@ -4,5 +4,5 @@
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=baf64108
-nbproject/build-impl.xml.script.CRC32=ddfd8d33
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.2.48
+nbproject/build-impl.xml.script.CRC32=a2647b82
+nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
diff -r 76df01fc4aa2 -r d4e5d65ba7cf java/alt2xml-in-json/nbproject/build-impl.xml
--- a/java/alt2xml-in-json/nbproject/build-impl.xml Sun Oct 02 15:23:20 2016 +0200
+++ b/java/alt2xml-in-json/nbproject/build-impl.xml Sun Oct 02 18:20:38 2016 +0200
@@ -192,7 +192,12 @@
</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"/>
@@ -218,6 +223,7 @@
<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. -->
@@ -695,7 +701,7 @@
<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}"/>
@@ -770,7 +776,7 @@
<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}"/>
@@ -797,7 +803,7 @@
<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}"/>
diff -r 76df01fc4aa2 -r d4e5d65ba7cf java/alt2xml-in-json/nbproject/genfiles.properties
--- a/java/alt2xml-in-json/nbproject/genfiles.properties Sun Oct 02 15:23:20 2016 +0200
+++ b/java/alt2xml-in-json/nbproject/genfiles.properties Sun Oct 02 18:20:38 2016 +0200
@@ -4,5 +4,5 @@
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=36d981c5
-nbproject/build-impl.xml.script.CRC32=5b826399
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.2.48
+nbproject/build-impl.xml.script.CRC32=64d29189
+nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
diff -r 76df01fc4aa2 -r d4e5d65ba7cf java/alt2xml-in-properties/nbproject/build-impl.xml
--- a/java/alt2xml-in-properties/nbproject/build-impl.xml Sun Oct 02 15:23:20 2016 +0200
+++ b/java/alt2xml-in-properties/nbproject/build-impl.xml Sun Oct 02 18:20:38 2016 +0200
@@ -192,7 +192,12 @@
</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"/>
@@ -218,6 +223,7 @@
<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. -->
@@ -695,7 +701,7 @@
<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}"/>
@@ -770,7 +776,7 @@
<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}"/>
@@ -797,7 +803,7 @@
<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}"/>
diff -r 76df01fc4aa2 -r d4e5d65ba7cf java/alt2xml-in-properties/nbproject/genfiles.properties
--- a/java/alt2xml-in-properties/nbproject/genfiles.properties Sun Oct 02 15:23:20 2016 +0200
+++ b/java/alt2xml-in-properties/nbproject/genfiles.properties Sun Oct 02 18:20:38 2016 +0200
@@ -4,5 +4,5 @@
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=d90e5067
-nbproject/build-impl.xml.script.CRC32=a04fd84f
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.2.48
+nbproject/build-impl.xml.script.CRC32=b7ef3300
+nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
diff -r 76df01fc4aa2 -r d4e5d65ba7cf java/alt2xml-lib-input/nbproject/build-impl.xml
--- a/java/alt2xml-lib-input/nbproject/build-impl.xml Sun Oct 02 15:23:20 2016 +0200
+++ b/java/alt2xml-lib-input/nbproject/build-impl.xml Sun Oct 02 18:20:38 2016 +0200
@@ -191,7 +191,12 @@
</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"/>
@@ -217,6 +222,7 @@
<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. -->
@@ -693,7 +699,7 @@
<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}"/>
@@ -768,7 +774,7 @@
<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}"/>
@@ -795,7 +801,7 @@
<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}"/>
diff -r 76df01fc4aa2 -r d4e5d65ba7cf java/alt2xml-lib-input/nbproject/genfiles.properties
--- a/java/alt2xml-lib-input/nbproject/genfiles.properties Sun Oct 02 15:23:20 2016 +0200
+++ b/java/alt2xml-lib-input/nbproject/genfiles.properties Sun Oct 02 18:20:38 2016 +0200
@@ -4,5 +4,5 @@
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=0525abf5
-nbproject/build-impl.xml.script.CRC32=9bda5398
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.2.48
+nbproject/build-impl.xml.script.CRC32=6e1be653
+nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
diff -r 76df01fc4aa2 -r d4e5d65ba7cf java/alt2xml-lib-output/nbproject/build-impl.xml
--- a/java/alt2xml-lib-output/nbproject/build-impl.xml Sun Oct 02 15:23:20 2016 +0200
+++ b/java/alt2xml-lib-output/nbproject/build-impl.xml Sun Oct 02 18:20:38 2016 +0200
@@ -191,7 +191,12 @@
</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"/>
@@ -217,6 +222,7 @@
<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. -->
@@ -693,7 +699,7 @@
<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}"/>
@@ -768,7 +774,7 @@
<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}"/>
@@ -795,7 +801,7 @@
<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}"/>
diff -r 76df01fc4aa2 -r d4e5d65ba7cf java/alt2xml-lib-output/nbproject/genfiles.properties
--- a/java/alt2xml-lib-output/nbproject/genfiles.properties Sun Oct 02 15:23:20 2016 +0200
+++ b/java/alt2xml-lib-output/nbproject/genfiles.properties Sun Oct 02 18:20:38 2016 +0200
@@ -4,5 +4,5 @@
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=e334806b
-nbproject/build-impl.xml.script.CRC32=70a60178
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.2.48
+nbproject/build-impl.xml.script.CRC32=99672274
+nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
diff -r 76df01fc4aa2 -r d4e5d65ba7cf java/alt2xml-out-xml/nbproject/build-impl.xml
--- a/java/alt2xml-out-xml/nbproject/build-impl.xml Sun Oct 02 15:23:20 2016 +0200
+++ b/java/alt2xml-out-xml/nbproject/build-impl.xml Sun Oct 02 18:20:38 2016 +0200
@@ -192,7 +192,12 @@
</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"/>
@@ -218,6 +223,7 @@
<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. -->
@@ -695,7 +701,7 @@
<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}"/>
@@ -770,7 +776,7 @@
<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}"/>
@@ -797,7 +803,7 @@
<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}"/>
diff -r 76df01fc4aa2 -r d4e5d65ba7cf java/alt2xml-out-xml/nbproject/genfiles.properties
--- a/java/alt2xml-out-xml/nbproject/genfiles.properties Sun Oct 02 15:23:20 2016 +0200
+++ b/java/alt2xml-out-xml/nbproject/genfiles.properties Sun Oct 02 18:20:38 2016 +0200
@@ -4,5 +4,5 @@
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=8237fb99
-nbproject/build-impl.xml.script.CRC32=88681dba
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.2.48
+nbproject/build-impl.xml.script.CRC32=2f8bdd01
+nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
diff -r 76df01fc4aa2 -r d4e5d65ba7cf java/alt2xml-out-xpath/nbproject/build-impl.xml
--- a/java/alt2xml-out-xpath/nbproject/build-impl.xml Sun Oct 02 15:23:20 2016 +0200
+++ b/java/alt2xml-out-xpath/nbproject/build-impl.xml Sun Oct 02 18:20:38 2016 +0200
@@ -192,7 +192,12 @@
</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"/>
@@ -218,6 +223,7 @@
<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. -->
@@ -695,7 +701,7 @@
<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}"/>
@@ -770,7 +776,7 @@
<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}"/>
@@ -797,7 +803,7 @@
<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}"/>
diff -r 76df01fc4aa2 -r d4e5d65ba7cf java/alt2xml-out-xpath/nbproject/genfiles.properties
--- a/java/alt2xml-out-xpath/nbproject/genfiles.properties Sun Oct 02 15:23:20 2016 +0200
+++ b/java/alt2xml-out-xpath/nbproject/genfiles.properties Sun Oct 02 18:20:38 2016 +0200
@@ -4,5 +4,5 @@
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=bc595ddc
-nbproject/build-impl.xml.script.CRC32=0906c83d
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.2.48
+nbproject/build-impl.xml.script.CRC32=568b087c
+nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
diff -r 76df01fc4aa2 -r d4e5d65ba7cf java/alt2xml-out-xslt/nbproject/build-impl.xml
--- a/java/alt2xml-out-xslt/nbproject/build-impl.xml Sun Oct 02 15:23:20 2016 +0200
+++ b/java/alt2xml-out-xslt/nbproject/build-impl.xml Sun Oct 02 18:20:38 2016 +0200
@@ -192,7 +192,12 @@
</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"/>
@@ -218,6 +223,7 @@
<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. -->
@@ -695,7 +701,7 @@
<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}"/>
@@ -770,7 +776,7 @@
<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}"/>
@@ -797,7 +803,7 @@
<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}"/>
diff -r 76df01fc4aa2 -r d4e5d65ba7cf java/alt2xml-out-xslt/nbproject/genfiles.properties
--- a/java/alt2xml-out-xslt/nbproject/genfiles.properties Sun Oct 02 15:23:20 2016 +0200
+++ b/java/alt2xml-out-xslt/nbproject/genfiles.properties Sun Oct 02 18:20:38 2016 +0200
@@ -4,5 +4,5 @@
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=9ab460fa
-nbproject/build-impl.xml.script.CRC32=e3f35d0a
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.2.48
+nbproject/build-impl.xml.script.CRC32=d9d1bcab
+nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48