Fixed reposting of mender artifacts

mender.xml

@@ -27,13 +27,7 @@
   <delete dir="${builddir}/go1.4"/>
  </target>
 
- <target name="post-mender-artifact">
-  <antcall target="build-go"/>
-  <antcall target="build-mender-artifact"/>
-  <antcall target="upload-mender-artifact"/>
- </target>
-
- <target name="build-mender-artifact">
+ <target name="build-mender-artifact" depends="build-go">
   <mkdir dir="${builddir}/go/src/github.com/mendersoftware"/>
   <exec executable="tar" dir="${builddir}" failonerror="true">
    <arg line="xf ${basedir}/packages/mender-artifact/mender-artifact-2.1.1.tar.gz -C ${builddir}/go/src/github.com/mendersoftware"/>
@@ -67,13 +61,17 @@
   <delete dir="${builddir}/artifactscripts"/>
  </target>
 
- <target name="repost-mender-artifact">
-  <antcall target="build-go"/>
-  <antcall target="rebuild-mender-artifact"/>
-  <antcall target="upload-mender-artifact"/>
+ <target name="post-mender-artifact" depends="build-mender-artifact" if="env.MENDER_USER">
+  <exec executable="${basedir}/packages/mender-artifact/remove-mender-artifact.sh" dir="${builddir}" failonerror="true">
+   <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME} ${DEVICE_TYPE} ${basedir}/host/server.crt"/>
+  </exec>
+  <exec executable="${basedir}/packages/mender-artifact/upload-mender-artifact.sh" dir="${builddir}" failonerror="true">
+   <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME}-${BUILD_ID}.mender ${basedir}/host/server.crt"/>
+  </exec>
+  <delete file="${builddir}/${ARTIFACT_NAME}-${BUILD_ID}.mender"/>
  </target>
 
- <target name="rebuild-mender-artifact">
+ <target name="rebuild-mender-artifact" depends="build-go">
   <mkdir dir="${builddir}/go/src/github.com/mendersoftware"/>
   <exec executable="tar" dir="${builddir}" failonerror="true">
    <arg line="xf ${basedir}/packages/mender-artifact/mender-artifact-2.1.1.tar.gz -C ${builddir}/go/src/github.com/mendersoftware"/>
@@ -131,7 +129,7 @@
   <delete dir="${builddir}/artifactscripts"/>
  </target>
 
- <target name="upload-mender-artifact" if="env.MENDER_USER">
+ <target name="repost-mender-artifact" depends="rebuild-mender-artifact" if="env.MENDER_USER">
   <exec executable="${basedir}/packages/mender-artifact/remove-mender-artifact.sh" dir="${builddir}" failonerror="true">
    <arg line="${env.MENDER_HOST} ${env.MENDER_USER} ${env.MENDER_PASS} ${ARTIFACT_NAME} ${DEVICE_TYPE} ${basedir}/host/server.crt"/>
   </exec>