Changeset 9


Ignore:
Timestamp:
Oct 10, 2012, 4:25:19 PM (8 years ago)
Author:
w.spee@…
Message:

added message "not all required options are set" when exeting because not all required options are not set

Location:
XSQConverterJava
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • XSQConverterJava/nbproject/build-impl.xml

    r3 r9  
    1313  - debugging
    1414  - javadoc
    15   - junit compilation
    16   - junit execution
    17   - junit debugging
     15  - test compilation
     16  - test execution
     17  - test debugging
    1818  - applet
    1919  - cleanup
     
    157157        </condition>
    158158        <property name="run.jvmargs" value=""/>
     159        <property name="run.jvmargs.ide" value=""/>
    159160        <property name="javac.compilerargs" value=""/>
    160161        <property name="work.dir" value="${basedir}"/>
     
    201202        <property name="copylibs.rebase" value="true"/>
    202203        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
     204        <condition property="junit.available">
     205            <or>
     206                <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
     207                <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
     208            </or>
     209        </condition>
     210        <condition property="testng.available">
     211            <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
     212        </condition>
     213        <condition property="junit+testng.available">
     214            <and>
     215                <istrue value="${junit.available}"/>
     216                <istrue value="${testng.available}"/>
     217            </and>
     218        </condition>
     219        <condition else="testng" property="testng.mode" value="mixed">
     220            <istrue value="${junit+testng.available}"/>
     221        </condition>
     222        <condition else="" property="testng.debug.mode" value="-mixed">
     223            <istrue value="${junit+testng.available}"/>
     224        </condition>
    203225    </target>
    204226    <target name="-post-init">
     
    333355        </macrodef>
    334356    </target>
    335     <target name="-init-macrodef-junit">
     357    <target if="${junit.available}" name="-init-macrodef-junit-init">
     358        <condition else="false" property="nb.junit.batch" value="true">
     359            <and>
     360                <istrue value="${junit.available}"/>
     361                <not>
     362                    <isset property="test.method"/>
     363                </not>
     364            </and>
     365        </condition>
     366        <condition else="false" property="nb.junit.single" value="true">
     367            <and>
     368                <istrue value="${junit.available}"/>
     369                <isset property="test.method"/>
     370            </and>
     371        </condition>
     372    </target>
     373    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
    336374        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
    337375            <attribute default="${includes}" name="includes"/>
    338376            <attribute default="${excludes}" name="excludes"/>
    339377            <attribute default="**" name="testincludes"/>
     378            <attribute default="" name="testmethods"/>
     379            <element name="customize" optional="true"/>
     380            <sequential>
     381                <property name="junit.forkmode" value="perTest"/>
     382                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
     383                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
     384                    <syspropertyset>
     385                        <propertyref prefix="test-sys-prop."/>
     386                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
     387                    </syspropertyset>
     388                    <formatter type="brief" usefile="false"/>
     389                    <formatter type="xml"/>
     390                    <jvmarg value="-ea"/>
     391                    <customize/>
     392                </junit>
     393            </sequential>
     394        </macrodef>
     395    </target>
     396    <target if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
     397        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
     398            <attribute default="${includes}" name="includes"/>
     399            <attribute default="${excludes}" name="excludes"/>
     400            <attribute default="**" name="testincludes"/>
     401            <attribute default="" name="testmethods"/>
     402            <element name="customize" optional="true"/>
    340403            <sequential>
    341404                <property name="junit.forkmode" value="perTest"/>
     
    346409                        </fileset>
    347410                    </batchtest>
    348                     <classpath>
    349                         <path path="${run.test.classpath}"/>
    350                     </classpath>
    351411                    <syspropertyset>
    352412                        <propertyref prefix="test-sys-prop."/>
     
    355415                    <formatter type="brief" usefile="false"/>
    356416                    <formatter type="xml"/>
    357                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
    358417                    <jvmarg value="-ea"/>
    359                     <jvmarg line="${run.jvmargs}"/>
     418                    <customize/>
    360419                </junit>
    361420            </sequential>
    362421        </macrodef>
    363422    </target>
    364     <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
    365     <target name="-profile-pre-init">
     423    <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
     424    <target if="${testng.available}" name="-init-macrodef-testng">
     425        <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
     426            <attribute default="${includes}" name="includes"/>
     427            <attribute default="${excludes}" name="excludes"/>
     428            <attribute default="**" name="testincludes"/>
     429            <attribute default="" name="testmethods"/>
     430            <element name="customize" optional="true"/>
     431            <sequential>
     432                <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
     433                    <isset property="test.method"/>
     434                </condition>
     435                <union id="test.set">
     436                    <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
     437                        <filename name="@{testincludes}"/>
     438                    </fileset>
     439                </union>
     440                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
     441                <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="XSQConverterJava" testname="TestNG tests" workingDir="${work.dir}">
     442                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
     443                    <propertyset>
     444                        <propertyref prefix="test-sys-prop."/>
     445                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
     446                    </propertyset>
     447                    <customize/>
     448                </testng>
     449            </sequential>
     450        </macrodef>
     451    </target>
     452    <target name="-init-macrodef-test-impl">
     453        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
     454            <attribute default="${includes}" name="includes"/>
     455            <attribute default="${excludes}" name="excludes"/>
     456            <attribute default="**" name="testincludes"/>
     457            <attribute default="" name="testmethods"/>
     458            <element implicit="true" name="customize" optional="true"/>
     459            <sequential>
     460                <echo>No tests executed.</echo>
     461            </sequential>
     462        </macrodef>
     463    </target>
     464    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
     465        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
     466            <attribute default="${includes}" name="includes"/>
     467            <attribute default="${excludes}" name="excludes"/>
     468            <attribute default="**" name="testincludes"/>
     469            <attribute default="" name="testmethods"/>
     470            <element implicit="true" name="customize" optional="true"/>
     471            <sequential>
     472                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
     473                    <customize/>
     474                </j2seproject3:junit>
     475            </sequential>
     476        </macrodef>
     477    </target>
     478    <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
     479        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
     480            <attribute default="${includes}" name="includes"/>
     481            <attribute default="${excludes}" name="excludes"/>
     482            <attribute default="**" name="testincludes"/>
     483            <attribute default="" name="testmethods"/>
     484            <element implicit="true" name="customize" optional="true"/>
     485            <sequential>
     486                <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
     487                    <customize/>
     488                </j2seproject3:testng>
     489            </sequential>
     490        </macrodef>
     491    </target>
     492    <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
     493        <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">
     494            <attribute default="${includes}" name="includes"/>
     495            <attribute default="${excludes}" name="excludes"/>
     496            <attribute default="**" name="testincludes"/>
     497            <attribute default="" name="testmethods"/>
     498            <sequential>
     499                <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
     500                    <customize>
     501                        <classpath>
     502                            <path path="${run.test.classpath}"/>
     503                        </classpath>
     504                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
     505                        <jvmarg line="${run.jvmargs}"/>
     506                        <jvmarg line="${run.jvmargs.ide}"/>
     507                    </customize>
     508                </j2seproject3:test-impl>
     509            </sequential>
     510        </macrodef>
     511    </target>
     512    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
     513        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
     514            <attribute default="${includes}" name="includes"/>
     515            <attribute default="${excludes}" name="excludes"/>
     516            <attribute default="**" name="testincludes"/>
     517            <attribute default="" name="testmethods"/>
     518            <element name="customize" optional="true"/>
     519            <sequential>
     520                <property name="junit.forkmode" value="perTest"/>
     521                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
     522                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
     523                    <syspropertyset>
     524                        <propertyref prefix="test-sys-prop."/>
     525                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
     526                    </syspropertyset>
     527                    <formatter type="brief" usefile="false"/>
     528                    <formatter type="xml"/>
     529                    <jvmarg value="-ea"/>
     530                    <jvmarg line="${debug-args-line}"/>
     531                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
     532                    <customize/>
     533                </junit>
     534            </sequential>
     535        </macrodef>
     536    </target>
     537    <target if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
     538        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
     539            <attribute default="${includes}" name="includes"/>
     540            <attribute default="${excludes}" name="excludes"/>
     541            <attribute default="**" name="testincludes"/>
     542            <attribute default="" name="testmethods"/>
     543            <element name="customize" optional="true"/>
     544            <sequential>
     545                <property name="junit.forkmode" value="perTest"/>
     546                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
     547                    <batchtest todir="${build.test.results.dir}">
     548                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
     549                            <filename name="@{testincludes}"/>
     550                        </fileset>
     551                    </batchtest>
     552                    <syspropertyset>
     553                        <propertyref prefix="test-sys-prop."/>
     554                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
     555                    </syspropertyset>
     556                    <formatter type="brief" usefile="false"/>
     557                    <formatter type="xml"/>
     558                    <jvmarg value="-ea"/>
     559                    <jvmarg line="${debug-args-line}"/>
     560                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
     561                    <customize/>
     562                </junit>
     563            </sequential>
     564        </macrodef>
     565    </target>
     566    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
     567        <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
     568            <attribute default="${includes}" name="includes"/>
     569            <attribute default="${excludes}" name="excludes"/>
     570            <attribute default="**" name="testincludes"/>
     571            <attribute default="" name="testmethods"/>
     572            <element implicit="true" name="customize" optional="true"/>
     573            <sequential>
     574                <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
     575                    <customize/>
     576                </j2seproject3:junit-debug>
     577            </sequential>
     578        </macrodef>
     579    </target>
     580    <target if="${testng.available}" name="-init-macrodef-testng-debug">
     581        <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
     582            <attribute default="${main.class}" name="testClass"/>
     583            <attribute default="" name="testMethod"/>
     584            <element name="customize2" optional="true"/>
     585            <sequential>
     586                <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
     587                    <isset property="test.method"/>
     588                </condition>
     589                <condition else="-suitename XSQConverterJava -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
     590                    <matches pattern=".*\.xml" string="@{testClass}"/>
     591                </condition>
     592                <delete dir="${build.test.results.dir}" quiet="true"/>
     593                <mkdir dir="${build.test.results.dir}"/>
     594                <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
     595                    <customize>
     596                        <customize2/>
     597                        <jvmarg value="-ea"/>
     598                        <arg line="${testng.debug.mode}"/>
     599                        <arg line="-d ${build.test.results.dir}"/>
     600                        <arg line="-listener org.testng.reporters.VerboseReporter"/>
     601                        <arg line="${testng.cmd.args}"/>
     602                    </customize>
     603                </j2seproject3:debug>
     604            </sequential>
     605        </macrodef>
     606    </target>
     607    <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
     608        <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
     609            <attribute default="${main.class}" name="testClass"/>
     610            <attribute default="" name="testMethod"/>
     611            <element implicit="true" name="customize2" optional="true"/>
     612            <sequential>
     613                <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
     614                    <customize2/>
     615                </j2seproject3:testng-debug>
     616            </sequential>
     617        </macrodef>
     618    </target>
     619    <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
     620        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
     621            <attribute default="${includes}" name="includes"/>
     622            <attribute default="${excludes}" name="excludes"/>
     623            <attribute default="**" name="testincludes"/>
     624            <attribute default="" name="testmethods"/>
     625            <attribute default="${main.class}" name="testClass"/>
     626            <attribute default="" name="testMethod"/>
     627            <sequential>
     628                <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
     629                    <customize>
     630                        <classpath>
     631                            <path path="${run.test.classpath}"/>
     632                        </classpath>
     633                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
     634                        <jvmarg line="${run.jvmargs}"/>
     635                        <jvmarg line="${run.jvmargs.ide}"/>
     636                    </customize>
     637                </j2seproject3:test-debug-impl>
     638            </sequential>
     639        </macrodef>
     640    </target>
     641    <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
     642        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
     643            <attribute default="${includes}" name="includes"/>
     644            <attribute default="${excludes}" name="excludes"/>
     645            <attribute default="**" name="testincludes"/>
     646            <attribute default="" name="testmethods"/>
     647            <attribute default="${main.class}" name="testClass"/>
     648            <attribute default="" name="testMethod"/>
     649            <sequential>
     650                <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
     651                    <customize2>
     652                        <syspropertyset>
     653                            <propertyref prefix="test-sys-prop."/>
     654                            <mapper from="test-sys-prop.*" to="*" type="glob"/>
     655                        </syspropertyset>
     656                    </customize2>
     657                </j2seproject3:testng-debug-impl>
     658            </sequential>
     659        </macrodef>
     660    </target>
     661    <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
     662    <!--
     663                pre NB7.2 profiling section; consider it deprecated
     664            -->
     665    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
     666    <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
    366667        <!-- Empty placeholder for easier customization. -->
    367668        <!-- You can override this target in the ../build.xml file. -->
    368669    </target>
    369     <target name="-profile-post-init">
     670    <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
    370671        <!-- Empty placeholder for easier customization. -->
    371672        <!-- You can override this target in the ../build.xml file. -->
    372673    </target>
    373     <target name="-profile-init-macrodef-profile">
     674    <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
    374675        <macrodef name="resolve">
    375676            <attribute name="name"/>
     
    403704        </macrodef>
    404705    </target>
    405     <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">
     706    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
    406707        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
    407708        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
    408709    </target>
     710    <!--
     711                end of pre NB7.2 profiling section
     712            -->
    409713    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
    410714        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
     
    464768                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
    465769                    <jvmarg line="${run.jvmargs}"/>
     770                    <jvmarg line="${run.jvmargs.ide}"/>
    466771                    <classpath>
    467772                        <path path="@{classpath}"/>
     
    480785            <attribute default="${main.class}" name="classname"/>
    481786            <attribute default="${run.classpath}" name="classpath"/>
     787            <attribute default="jvm" name="jvm"/>
    482788            <element name="customize" optional="true"/>
    483789            <sequential>
     
    487793                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
    488794                    <jvmarg line="${run.jvmargs}"/>
     795                    <jvmarg line="${run.jvmargs.ide}"/>
    489796                    <classpath>
    490797                        <path path="@{classpath}"/>
     
    513820                    <chainedmapper>
    514821                        <flattenmapper/>
     822                        <filtermapper>
     823                            <replacestring from=" " to="%20"/>
     824                        </filtermapper>
    515825                        <globmapper from="*" to="lib/*"/>
    516826                    </chainedmapper>
     
    558868        <property name="ap.cmd.line.internal" value=""/>
    559869    </target>
    560     <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
     870    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
    561871    <!--
    562872                ===================
     
    7741084                =================
    7751085            -->
    776     <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">
     1086    <!--
     1087                pre NB7.2 profiler integration
     1088            -->
     1089    <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
     1090        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
    7771091        <nbprofiledirect>
    7781092            <classpath>
     
    7821096        <profile/>
    7831097    </target>
    784     <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">
     1098    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
    7851099        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
     1100        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
    7861101        <nbprofiledirect>
    7871102            <classpath>
     
    7911106        <profile classname="${profile.class}"/>
    7921107    </target>
    793     <!--
    794                 =========================
    795                 APPLET PROFILING  SECTION
    796                 =========================
    797             -->
    798     <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">
     1108    <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
     1109        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
    7991110        <nbprofiledirect>
    8001111            <classpath>
     
    8081119        </profile>
    8091120    </target>
    810     <!--
    811                 =========================
    812                 TESTS PROFILING  SECTION
    813                 =========================
    814             -->
    815     <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
     1121    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
     1122        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
    8161123        <nbprofiledirect>
    8171124            <classpath>
     
    8341141            <formatter type="xml"/>
    8351142        </junit>
     1143    </target>
     1144    <!--
     1145                end of pre NB72 profiling section
     1146            -->
     1147    <target if="netbeans.home" name="-profile-check">
     1148        <condition property="profiler.configured">
     1149            <or>
     1150                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
     1151                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
     1152            </or>
     1153        </condition>
     1154    </target>
     1155    <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
     1156        <startprofiler/>
     1157        <antcall target="run"/>
     1158    </target>
     1159    <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">
     1160        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
     1161        <startprofiler/>
     1162        <antcall target="run-single"/>
     1163    </target>
     1164    <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
     1165    <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
     1166        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
     1167        <startprofiler/>
     1168        <antcall target="test-single"/>
     1169    </target>
     1170    <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
     1171        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
     1172        <startprofiler/>
     1173        <antcal target="run-test-with-main"/>
     1174    </target>
     1175    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
     1176        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
     1177        <startprofiler/>
     1178        <antcall target="run-applet"/>
    8361179    </target>
    8371180    <!--
     
    8781221    <!--
    8791222                =========================
    880                 JUNIT COMPILATION SECTION
     1223                TEST COMPILATION SECTION
    8811224                =========================
    8821225            -->
     
    9211264    <!--
    9221265                =======================
    923                 JUNIT EXECUTION SECTION
     1266                TEST EXECUTION SECTION
    9241267                =======================
    9251268            -->
     
    9281271    </target>
    9291272    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
    930         <j2seproject3:junit testincludes="**/*Test.java"/>
     1273        <j2seproject3:test testincludes="**/*Test.java"/>
    9311274    </target>
    9321275    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
     
    9411284    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
    9421285        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
    943         <j2seproject3:junit excludes="" includes="${test.includes}"/>
     1286        <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
    9441287    </target>
    9451288    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
     
    9471290    </target>
    9481291    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
     1292    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
     1293        <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
     1294        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
     1295        <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
     1296    </target>
     1297    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
     1298        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
     1299    </target>
     1300    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
    9491301    <!--
    9501302                =======================
    951                 JUNIT DEBUGGING SECTION
     1303                TEST DEBUGGING SECTION
    9521304                =======================
    9531305            -->
    954     <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
     1306    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
    9551307        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
    956         <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
    957         <delete file="${test.report.file}"/>
    958         <mkdir dir="${build.test.results.dir}"/>
    959         <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
    960             <customize>
    961                 <syspropertyset>
    962                     <propertyref prefix="test-sys-prop."/>
    963                     <mapper from="test-sys-prop.*" to="*" type="glob"/>
    964                 </syspropertyset>
    965                 <arg value="${test.class}"/>
    966                 <arg value="showoutput=true"/>
    967                 <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
    968                 <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
    969             </customize>
    970         </j2seproject3:debug>
     1308        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
     1309    </target>
     1310    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
     1311        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
     1312        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
     1313        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
    9711314    </target>
    9721315    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
     
    9741317    </target>
    9751318    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
     1319    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
    9761320    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
    9771321        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
     
    10381382        <property file="${call.built.properties}" prefix="already.built."/>
    10391383        <condition property="should.call.dep">
    1040             <not>
    1041                 <isset property="already.built.${call.subproject}"/>
    1042             </not>
     1384            <and>
     1385                <not>
     1386                    <isset property="already.built.${call.subproject}"/>
     1387                </not>
     1388                <available file="${call.script}"/>
     1389            </and>
    10431390        </condition>
    10441391    </target>
  • XSQConverterJava/nbproject/genfiles.properties

    r3 r9  
    55# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    66nbproject/build-impl.xml.data.CRC32=13e0a3ca
    7 nbproject/build-impl.xml.script.CRC32=58531b80
    8 nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.3.46
     7nbproject/build-impl.xml.script.CRC32=c439acea
     8nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.54.0.46
  • XSQConverterJava/nbproject/project.properties

    r3 r9  
    2727excludes=
    2828file.reference.commons-cli-1.2.jar=/home/wim/Downloads/commons-cli-1.2/commons-cli-1.2.jar
     29file.reference.commons-cli-1.2.jar-1=/home/wim/java_libraries/hdf5_libs/commons-cli-1.2.jar
     30file.reference.commons-io-2.4.jar=/home/wim/java_libraries/hdf5_libs/commons-io-2.4.jar
    2931file.reference.jhdf.jar=/home/wim/hdf5_java/hdf_java_bin/32bit/hdf-java/lib/jhdf.jar
    3032file.reference.jhdf4obj.jar=/home/wim/hdf5_java/hdf_java_bin/32bit/hdf-java/lib/jhdf4obj.jar
    3133file.reference.jhdf5.jar=/home/wim/hdf5_java/hdf_java_bin/32bit/hdf-java/lib/jhdf5.jar
     34file.reference.jhdf5.jar-1=/home/wim/java_libraries/hdf5_libs/jhdf5.jar
    3235file.reference.jhdf5obj.jar=/home/wim/hdf5_java/hdf_java_bin/32bit/hdf-java/lib/jhdf5obj.jar
    3336file.reference.jhdfobj.jar=/home/wim/hdf5_java/hdf_java_bin/32bit/hdf-java/lib/jhdfobj.jar
     37file.reference.jhdfobj.jar-1=/home/wim/java_libraries/hdf5_libs/jhdfobj.jar
    3438includes=**
    3539jar.compress=false
     
    4044    ${file.reference.jhdf5obj.jar}:\
    4145    ${file.reference.jhdfobj.jar}:\
    42     ${file.reference.commons-cli-1.2.jar}
     46    ${file.reference.commons-cli-1.2.jar}:\
     47    ${file.reference.commons-cli-1.2.jar-1}:\
     48    ${file.reference.commons-io-2.4.jar}:\
     49    ${file.reference.jhdf5.jar-1}:\
     50    ${file.reference.jhdfobj.jar-1}
    4351# Space-separated list of extra javac options
    4452javac.compilerargs=
  • XSQConverterJava/src/xsqconverterjava2/XSQConverterJava.java

    r8 r9  
    7171        if(!requiredOptionsAreSet(cmd))
    7272        {
     73            System.out.println("Not all required options are set");
    7374            printHelp(options);           
    7475        } 
Note: See TracChangeset for help on using the changeset viewer.