Build: Add buildSusiMailJar target for testing

More test targets
This commit is contained in:
zzz
2018-01-08 14:46:26 +00:00
parent 25d16b13f5
commit 9f7ec398c1
2 changed files with 35 additions and 3 deletions

View File

@@ -53,7 +53,25 @@
</classpath>
</javac>
</target>
<target name="jar" depends="compile, war" />
<!-- jar (not war) for testing only -->
<target name="jar" depends="compile, bundle, warUpToDate, listChangedFiles" >
<!-- set if unset -->
<property name="workspace.changes.tr" value="" />
<copy file="src/susimail.properties" todir="src/WEB-INF/classes" />
<jar destfile="susimail.jar"
basedir="src/WEB-INF/classes">
<manifest>
<attribute name="Implementation-Version" value="${full.version}" />
<attribute name="Built-By" value="${build.built-by}" />
<attribute name="Build-Date" value="${build.timestamp}" />
<attribute name="Base-Revision" value="${workspace.version}" />
<attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
<attribute name="X-Compile-Source-JDK" value="${javac.version}" />
<attribute name="X-Compile-Target-JDK" value="${javac.version}" />
</manifest>
</jar>
</target>
<target name="listChangedFiles" depends="warUpToDate" if="shouldListChanges" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
@@ -152,6 +170,7 @@
<target name="clean">
<delete dir="src/WEB-INF/classes"/>
<delete file="susimail.war"/>
<delete file="susimail.jar"/>
<delete dir="build"/>
</target>
<target name="cleandep" depends="clean" />

View File

@@ -313,6 +313,12 @@
<copy file="apps/susimail/susimail.war" todir="build/" />
</target>
<!-- jar (not war) for testing only -->
<target name="buildSusiMailJar" depends="buildCore, buildJetty" >
<ant dir="apps/susimail/" target="jar" />
<copy file="apps/susimail/susimail.jar" todir="build/" />
</target>
<target name="buildSusiDNS" depends="buildCore, buildJetty, buildImagegen, buildAddressbook" >
<ant dir="apps/susidns/src" target="all" />
<copy file="apps/susidns/src/susidns.war" todir="build/" />
@@ -1807,11 +1813,18 @@
<!-- note there are no router scala tests yet -->
<ant dir="router/java/" target="scalatest.test" />
</target>
<target name="test" depends="buildProperties, jbigi" >
<!-- both junit and scala -->
<!-- both junit and scala -->
<target name="test" depends="testCore, testRouter, testMinistreaming, testStreaming" />
<target name="testCore" depends="buildProperties, jbigi" >
<ant dir="core/java/" target="test" />
</target>
<target name="testRouter" depends="buildProperties, jbigi" >
<ant dir="router/java/" target="test" />
</target>
<target name="testMinistreaming" depends="buildProperties, jbigi" >
<ant dir="apps/ministreaming/java/" target="test" />
</target>
<target name="testStreaming" depends="buildProperties" >
<ant dir="apps/streaming/java/" target="test" />
</target>
<target name="scalatest.report" depends="buildProperties" >