< prev index next >

apps/toys/Industrial/nbproject/build-impl.xml

Print this page
rev 10114 : 8161704: Switch to Jigsaw-aware boot JDK for compiling FX 9
Reviewed-by:

*** 17,28 **** - test debugging - applet - cleanup --> ! <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="Industrial-impl"> ! <import file="jfx-impl.xml"/> <fail message="Please build using Ant 1.8.0 or higher."> <condition> <not> <antversion atleast="1.8.0"/> </not> --- 17,27 ---- - test debugging - applet - cleanup --> ! <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="TouchSuite-impl"> <fail message="Please build using Ant 1.8.0 or higher."> <condition> <not> <antversion atleast="1.8.0"/> </not>
*** 156,168 **** <isset property="profile.available"/> <istrue value="${do.archive}"/> </and> </condition> <condition property="have.tests"> ! <or> ! <available file="${test.src.dir}"/> ! </or> </condition> <condition property="have.sources"> <or> <available file="${src.dir}"/> </or> --- 155,165 ---- <isset property="profile.available"/> <istrue value="${do.archive}"/> </and> </condition> <condition property="have.tests"> ! <or/> </condition> <condition property="have.sources"> <or> <available file="${src.dir}"/> </or>
*** 250,260 **** <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check"> <fail unless="src.dir">Must set src.dir</fail> - <fail unless="test.src.dir">Must set test.src.dir</fail> <fail unless="build.dir">Must set build.dir</fail> <fail unless="dist.dir">Must set dist.dir</fail> <fail unless="build.classes.dir">Must set build.classes.dir</fail> <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail> <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail> --- 247,256 ----
*** 432,444 **** <element name="customize" optional="true"/> <sequential> <property name="junit.forkmode" value="perTest"/> <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> <batchtest todir="${build.test.results.dir}"> - <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}"> <filename name="${test.binarytestincludes}"/> </fileset> </batchtest> <syspropertyset> --- 428,437 ----
*** 463,479 **** <element name="customize" optional="true"/> <sequential> <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}"> <isset property="test.method"/> </condition> ! <union id="test.set"> ! <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}"> ! <filename name="@{testincludes}"/> ! </fileset> ! </union> <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/> ! <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Industrial" testname="TestNG tests" workingDir="${work.dir}"> <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> <propertyset> <propertyref prefix="test-sys-prop."/> <mapper from="test-sys-prop.*" to="*" type="glob"/> </propertyset> --- 456,468 ---- <element name="customize" optional="true"/> <sequential> <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}"> <isset property="test.method"/> </condition> ! <union id="test.set"/> <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/> ! <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="TouchSuite" testname="TestNG tests" workingDir="${work.dir}"> <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> <propertyset> <propertyref prefix="test-sys-prop."/> <mapper from="test-sys-prop.*" to="*" type="glob"/> </propertyset>
*** 576,588 **** <element name="customize" optional="true"/> <sequential> <property name="junit.forkmode" value="perTest"/> <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> <batchtest todir="${build.test.results.dir}"> - <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}"> <filename name="${test.binarytestincludes}"/> </fileset> </batchtest> <syspropertyset> --- 565,574 ----
*** 620,630 **** <element name="customize2" optional="true"/> <sequential> <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}"> <isset property="test.method"/> </condition> ! <condition else="-suitename Industrial -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}"> <matches pattern=".*\.xml" string="@{testClass}"/> </condition> <delete dir="${build.test.results.dir}" quiet="true"/> <mkdir dir="${build.test.results.dir}"/> <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}"> --- 606,616 ---- <element name="customize2" optional="true"/> <sequential> <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}"> <isset property="test.method"/> </condition> ! <condition else="-suitename TouchSuite -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}"> <matches pattern=".*\.xml" string="@{testClass}"/> </condition> <delete dir="${build.test.results.dir}" quiet="true"/> <mkdir dir="${build.test.results.dir}"/> <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
*** 917,927 **** <target name="-deps-jar-init" unless="built-jar.properties"> <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/> <delete file="${built-jar.properties}" quiet="true"/> </target> <target if="already.built.jar.${basedir}" name="-warn-already-built-jar"> ! <echo level="warn" message="Cycle detected: Industrial was already built"/> </target> <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps"> <mkdir dir="${build.dir}"/> <touch file="${built-jar.properties}" verbose="false"/> <property file="${built-jar.properties}" prefix="already.built.jar."/> --- 903,913 ---- <target name="-deps-jar-init" unless="built-jar.properties"> <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/> <delete file="${built-jar.properties}" quiet="true"/> </target> <target if="already.built.jar.${basedir}" name="-warn-already-built-jar"> ! <echo level="warn" message="Cycle detected: TouchSuite was already built"/> </target> <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps"> <mkdir dir="${build.dir}"/> <touch file="${built-jar.properties}" verbose="false"/> <property file="${built-jar.properties}" prefix="already.built.jar."/>
*** 1049,1070 **** <fileset file="${tmp.manifest.file}"/> </delete> </target> <target depends="init,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,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/> <target depends="init,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,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/> ! <target depends="-jfx-copylibs,-rebase-libs,jfx-deployment" name="-post-jar"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/> <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/> <!-- ================= EXECUTION SECTION ================= --> ! <target depends="init,compile,jar" description="Run a main class." name="run"> <j2seproject1:java> <customize> <arg line="${application.args}"/> </customize> </j2seproject1:java> --- 1035,1056 ---- <fileset file="${tmp.manifest.file}"/> </delete> </target> <target depends="init,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,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/> <target depends="init,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,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/> ! <target name="-post-jar"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/> <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/> <!-- ================= EXECUTION SECTION ================= --> ! <target depends="init,compile" description="Run a main class." name="run"> <j2seproject1:java> <customize> <arg line="${application.args}"/> </customize> </j2seproject1:java>
*** 1096,1106 **** <customize> <arg line="${application.args}"/> </customize> </j2seproject3:debug> </target> ! <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee,jar" description="Debug project in IDE." if="netbeans.home" name="debug"/> <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto"> <j2seproject1:nbjpdastart stopclassname="${main.class}"/> </target> <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/> <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single"> --- 1082,1092 ---- <customize> <arg line="${application.args}"/> </customize> </j2seproject3:debug> </target> ! <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/> <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto"> <j2seproject1:nbjpdastart stopclassname="${main.class}"/> </target> <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/> <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
*** 1193,1203 **** <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/> <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/> </or> </condition> </target> ! <target depends="-profile-check,-profile-pre72,jar" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent"> <startprofiler/> <antcall target="run"/> </target> <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent"> <fail unless="run.class">Must select one file in the IDE or set run.class</fail> --- 1179,1189 ---- <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/> <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/> </or> </condition> </target> ! <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent"> <startprofiler/> <antcall target="run"/> </target> <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent"> <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
*** 1278,1294 **** <target name="-pre-compile-test"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> <target if="do.depend.true" name="-compile-test-depend"> ! <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/> </target> <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test"> ! <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/> ! <copy todir="${build.test.classes.dir}"> ! <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> ! </copy> </target> <target name="-post-compile-test"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> --- 1264,1278 ---- <target name="-pre-compile-test"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> <target if="do.depend.true" name="-compile-test-depend"> ! <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir=""/> </target> <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test"> ! <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir=""/> ! <copy todir="${build.test.classes.dir}"/> </target> <target name="-post-compile-test"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target>
*** 1298,1311 **** <!-- You can override this target in the ../build.xml file. --> </target> <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single"> <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/> ! <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/> ! <copy todir="${build.test.classes.dir}"> ! <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> ! </copy> </target> <target name="-post-compile-test-single"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> --- 1282,1293 ---- <!-- You can override this target in the ../build.xml file. --> </target> <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single"> <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/> ! <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="" srcdir=""/> ! <copy todir="${build.test.classes.dir}"/> </target> <target name="-post-compile-test-single"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target>
*** 1405,1415 **** <target name="-deps-clean-init" unless="built-clean.properties"> <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/> <delete file="${built-clean.properties}" quiet="true"/> </target> <target if="already.built.clean.${basedir}" name="-warn-already-built-clean"> ! <echo level="warn" message="Cycle detected: Industrial was already built"/> </target> <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps"> <mkdir dir="${build.dir}"/> <touch file="${built-clean.properties}" verbose="false"/> <property file="${built-clean.properties}" prefix="already.built.clean."/> --- 1387,1397 ---- <target name="-deps-clean-init" unless="built-clean.properties"> <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/> <delete file="${built-clean.properties}" quiet="true"/> </target> <target if="already.built.clean.${basedir}" name="-warn-already-built-clean"> ! <echo level="warn" message="Cycle detected: TouchSuite was already built"/> </target> <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps"> <mkdir dir="${build.dir}"/> <touch file="${built-clean.properties}" verbose="false"/> <property file="${built-clean.properties}" prefix="already.built.clean."/>
< prev index next >