* include svn.rev in deployment builds
This commit is contained in:
parent
8d46aef7ef
commit
b351c7a76a
18
build.xml
18
build.xml
|
@ -1,5 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
<project name="filebot" default="fatjar">
|
<project name="filebot" default="fatjar">
|
||||||
|
|
||||||
<!-- define source dirs -->
|
<!-- define source dirs -->
|
||||||
<property name="dir.source" location="${basedir}/source" />
|
<property name="dir.source" location="${basedir}/source" />
|
||||||
<property name="dir.test" location="${basedir}/test" />
|
<property name="dir.test" location="${basedir}/test" />
|
||||||
|
@ -13,13 +14,13 @@
|
||||||
<typedef resource="org/tigris/subversion/svnant/svnantlib.xml">
|
<typedef resource="org/tigris/subversion/svnant/svnantlib.xml">
|
||||||
<classpath><fileset dir="${dir.lib}/build" includes="*.jar" /></classpath>
|
<classpath><fileset dir="${dir.lib}/build" includes="*.jar" /></classpath>
|
||||||
</typedef>
|
</typedef>
|
||||||
|
<svnSetting id="svn.settings" javahl="false" svnkit="true" />
|
||||||
|
|
||||||
<!-- include application properties -->
|
<!-- include application properties -->
|
||||||
<property file="source/net/sourceforge/filebot/Settings.properties" />
|
<property file="source/net/sourceforge/filebot/Settings.properties" />
|
||||||
<property name="title" value="${application.name}" />
|
<property name="title" value="${application.name}" />
|
||||||
<property name="version" value="${application.version}" />
|
<property name="version" value="${application.version}" />
|
||||||
|
|
||||||
<svn svnkit="true"><status path="${basedir}" revisionProperty="svn.revision" /></svn>
|
|
||||||
<tstamp><format property="today" pattern="yyyy-MM-dd" /></tstamp>
|
<tstamp><format property="today" pattern="yyyy-MM-dd" /></tstamp>
|
||||||
|
|
||||||
<!-- define output paths -->
|
<!-- define output paths -->
|
||||||
|
@ -331,14 +332,19 @@
|
||||||
<fileset dir="${dir.lib}" includes="*.jar" />
|
<fileset dir="${dir.lib}" includes="*.jar" />
|
||||||
<pathelement location="${dir.lib}/build/junit.jar" />
|
<pathelement location="${dir.lib}/build/junit.jar" />
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
||||||
<formatter type="plain" />
|
<formatter type="plain" />
|
||||||
|
|
||||||
<test name="net.sourceforge.filebot.AllTests" outfile="test-report" />
|
<test name="net.sourceforge.filebot.AllTests" outfile="test-report" />
|
||||||
</junit>
|
</junit>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
||||||
|
<target name="svn-update">
|
||||||
|
<svn refid="svn.settings"><update revision="HEAD" dir="${basedir}" recurse="true" /></svn>
|
||||||
|
<svn refid="svn.settings"><status path="${basedir}" revisionProperty="svn.revision" /></svn>
|
||||||
|
<echo>Revision: ${svn.revision}</echo>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
|
||||||
<target name="test-fatjar" depends="fatjar">
|
<target name="test-fatjar" depends="fatjar">
|
||||||
<junit printsummary="yes" fork="true">
|
<junit printsummary="yes" fork="true">
|
||||||
<classpath>
|
<classpath>
|
||||||
|
@ -346,15 +352,13 @@
|
||||||
<pathelement location="${dir.dist}/filebot-test.jar" />
|
<pathelement location="${dir.dist}/filebot-test.jar" />
|
||||||
<pathelement location="${dir.lib}/build/junit.jar" />
|
<pathelement location="${dir.lib}/build/junit.jar" />
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
||||||
<formatter type="plain" />
|
<formatter type="plain" />
|
||||||
|
|
||||||
<test name="net.sourceforge.filebot.AllTests" outfile="test-report" />
|
<test name="net.sourceforge.filebot.AllTests" outfile="test-report" />
|
||||||
</junit>
|
</junit>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
||||||
<target name="deploy-release" depends="fatjar, appbundle, deb, msi, webstart">
|
<target name="deploy-release" depends="svn-update, fatjar, appbundle, deb, msi, webstart">
|
||||||
<mkdir dir="${dir.dist}/release" />
|
<mkdir dir="${dir.dist}/release" />
|
||||||
|
|
||||||
<!-- prepare release packages -->
|
<!-- prepare release packages -->
|
||||||
|
@ -438,7 +442,7 @@
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
||||||
<target name="deploy-test-package" depends="fatjar">
|
<target name="deploy-test-package" depends="svn-update, fatjar">
|
||||||
<!-- ask for sourceforge password -->
|
<!-- ask for sourceforge password -->
|
||||||
<property name="sf.user" value="rednoah" />
|
<property name="sf.user" value="rednoah" />
|
||||||
<input message="Please enter password:" addproperty="sf.password" />
|
<input message="Please enter password:" addproperty="sf.password" />
|
||||||
|
|
Loading…
Reference in New Issue