<!-- default TestNG groups to run -->
<property name="testng-groups" value="Functional" />
+ <!-- default verbosity for TestNG -->
+ <property name="testng-verbosity" value="2"/>
<!-- Java 9 JVM args -->
<condition property="java9">
<equals arg1="${ant.java.version}" arg2="9"/>
<target name="testng" depends="buildTests">
<testng outputDir="${reportDir}" haltOnFailure="false" groups="${testng-groups}" mode="testng"
- verbose="2">
+ verbose="${testng-verbosity}">
<classpath>
<pathelement location="${testOutputDir}" />
<pathelement location="${clover.jar}" if:set="clover.jar"/>
</target>
<target name="signApplet" description="internal target to sign applet" depends="-signappletnotsa,-signapplettsa" />
+<target name="pubapplet" description="Dummy target to keep legacy Jalview build system happy. We don't actually publish the applet anymore."/>
-<target name="pubapplet" description="installs the jalviewLite applet and dependent jars into an applet examples directory built under ${outputDir}" depends="makeApplet, signApplet">
+<target name="_pubapplet" description="installs the jalviewLite applet and dependent jars into an applet examples directory built under ${outputDir}" depends="makeApplet, signApplet">
<!-- bizarre bug causes JmolApplet to always get signed, even if excluded from above. so copy explicitly -->
<copy file="appletlib/${jmolJar}" tofile="${packageDir}/examples/u_${jmolJar}" overwrite="true" />
</copy>
</target>
<target name="unzip-to-site" depends="prepare-site">
- <property name="swingjs.zip" value="${swingjsdir}/SwingJS-site.zip" />
- <unzip dest="${site}/" overwrite="true">
- <fileset dir="libjs">
- <include name="*.zip" />
- </fileset>
- </unzip>
- <copy overwrite="true" todir="${site}/swingjs/j2s/">
- <fileset dir="${resourceDir}">
- <include name="**"/>
- </fileset>
- </copy>
-
- <!-- copy test files into place in site -->
- <copy todir="${site}/examples">
- <fileset dir="examples">
- <include name="*.*"/>
- </fileset>
- </copy>
- <!-- lastly, update SwingJS -->
- <unzip dest="${site}/" overwrite="true">
- <fileset dir="${swingjsdir}">
- <include name="SwingJS-site.zip"/>
- </fileset>
- </unzip>
+ <ant antfile="build-site.xml"/>
</target>
<target name="make-j2s-cores" depends="">