Fix build depends
This commit is contained in:
parent
d06352e507
commit
b6573d7538
18
build.xml
18
build.xml
|
@ -379,7 +379,7 @@
|
||||||
</antcall>
|
</antcall>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="appbundle-maspkg" depends="update, fatjar">
|
<target name="appbundle-maspkg">
|
||||||
<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpathref="jars.classpath" />
|
<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpathref="jars.classpath" />
|
||||||
|
|
||||||
<property name="path.app" value="${application.name}.app" />
|
<property name="path.app" value="${application.name}.app" />
|
||||||
|
@ -503,7 +503,7 @@
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
||||||
<target name="snap" depends="update, fatjar">
|
<target name="snap">
|
||||||
<copy tofile="${dir.dist}/snappy/filebot/FileBot.jar" file="${path.fatjar}" />
|
<copy tofile="${dir.dist}/snappy/filebot/FileBot.jar" file="${path.fatjar}" />
|
||||||
<copy todir="${dir.dist}/snappy/filebot/lib/amd64">
|
<copy todir="${dir.dist}/snappy/filebot/lib/amd64">
|
||||||
<fileset dir="${dir.lib}/native/linux-amd64" excludes="fpcalc, libmediainfo.so, libzen.so" />
|
<fileset dir="${dir.lib}/native/linux-amd64" excludes="fpcalc, libmediainfo.so, libzen.so" />
|
||||||
|
@ -655,7 +655,7 @@
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
||||||
<target name="build">
|
<target name="build" depends="revision">
|
||||||
<!-- create build dir -->
|
<!-- create build dir -->
|
||||||
<mkdir dir="${dir.build}" />
|
<mkdir dir="${dir.build}" />
|
||||||
|
|
||||||
|
@ -688,13 +688,7 @@
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
||||||
<target name="update">
|
<target name="revision">
|
||||||
<exec executable="git" failonerror="true">
|
|
||||||
<arg line="reset --hard" />
|
|
||||||
</exec>
|
|
||||||
<exec executable="git" failonerror="true">
|
|
||||||
<arg line="pull" />
|
|
||||||
</exec>
|
|
||||||
<exec executable="git" outputproperty="revision" failonerror="true">
|
<exec executable="git" outputproperty="revision" failonerror="true">
|
||||||
<arg line="rev-list --count master" />
|
<arg line="rev-list --count master" />
|
||||||
</exec>
|
</exec>
|
||||||
|
@ -702,7 +696,7 @@
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
||||||
<target name="stage-release" depends="resolve, update, fatjar, portable, spk, ipkg, deb, msi, appbundle">
|
<target name="stage-release" depends="fatjar, portable, spk, ipkg, deb, msi, appbundle">
|
||||||
<delete dir="${dir.release}" />
|
<delete dir="${dir.release}" />
|
||||||
<mkdir dir="${dir.release}" />
|
<mkdir dir="${dir.release}" />
|
||||||
|
|
||||||
|
@ -859,7 +853,7 @@
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
||||||
<target name="deploy-beta-jar" depends="resolve, update, fatjar" description="Build and deploy the latest jar">
|
<target name="deploy-beta-jar" depends="fatjar" description="Build and deploy the latest jar">
|
||||||
<scp file="${path.fatjar}" remoteTofile="${deploy.release}/HEAD/filebot-r${revision}.jar" trust="yes" verbose="true" sftp="true" keyfile="${deploy.keyfile}" />
|
<scp file="${path.fatjar}" remoteTofile="${deploy.release}/HEAD/filebot-r${revision}.jar" trust="yes" verbose="true" sftp="true" keyfile="${deploy.keyfile}" />
|
||||||
<scp file="${path.fatjar}" remoteTofile="${deploy.release}/HEAD/FileBot.jar" trust="yes" verbose="true" sftp="true" keyfile="${deploy.keyfile}" />
|
<scp file="${path.fatjar}" remoteTofile="${deploy.release}/HEAD/FileBot.jar" trust="yes" verbose="true" sftp="true" keyfile="${deploy.keyfile}" />
|
||||||
</target>
|
</target>
|
||||||
|
|
Loading…
Reference in New Issue