1.1 --- a/java/RAII/nbproject/build-impl.xml Sat Nov 19 20:10:17 2016 +0100
1.2 +++ b/java/RAII/nbproject/build-impl.xml Sat Nov 19 22:28:08 2016 +0100
1.3 @@ -191,7 +191,12 @@
1.4 </not>
1.5 </and>
1.6 </condition>
1.7 - <property name="javac.fork" value="${jdkBug6558476}"/>
1.8 + <condition else="false" property="javac.fork">
1.9 + <or>
1.10 + <istrue value="${jdkBug6558476}"/>
1.11 + <istrue value="${javac.external.vm}"/>
1.12 + </or>
1.13 + </condition>
1.14 <property name="jar.index" value="false"/>
1.15 <property name="jar.index.metainf" value="${jar.index}"/>
1.16 <property name="copylibs.rebase" value="true"/>
1.17 @@ -217,6 +222,7 @@
1.18 <condition else="" property="testng.debug.mode" value="-mixed">
1.19 <istrue value="${junit+testng.available}"/>
1.20 </condition>
1.21 + <property name="java.failonerror" value="true"/>
1.22 </target>
1.23 <target name="-post-init">
1.24 <!-- Empty placeholder for easier customization. -->
1.25 @@ -693,7 +699,7 @@
1.26 <sequential>
1.27 <property environment="env"/>
1.28 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
1.29 - <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
1.30 + <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
1.31 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.32 <jvmarg value="${profiler.info.jvmargs.agent}"/>
1.33 <jvmarg line="${profiler.info.jvmargs}"/>
1.34 @@ -768,7 +774,7 @@
1.35 <attribute default="${debug.classpath}" name="classpath"/>
1.36 <element name="customize" optional="true"/>
1.37 <sequential>
1.38 - <java classname="@{classname}" dir="${work.dir}" fork="true">
1.39 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
1.40 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.41 <jvmarg line="${debug-args-line}"/>
1.42 <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
1.43 @@ -795,7 +801,7 @@
1.44 <attribute default="jvm" name="jvm"/>
1.45 <element name="customize" optional="true"/>
1.46 <sequential>
1.47 - <java classname="@{classname}" dir="${work.dir}" fork="true">
1.48 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
1.49 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.50 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
1.51 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>