Added reposting of mender artifact

mender.xml

@@ -11,12 +11,6 @@
  </fail>
  <property name="MENDER_KEYS" value="present"/>
 
- <target name="post-mender-artifact">
-  <antcall target="build-go"/>
-  <antcall target="build-mender-artifact"/>
-  <antcall target="upload-mender-artifact"/>
- </target>
-
  <target name="build-go">
   <property name="makedir" value="${builddir}/go"/>
   <exec executable="tar" failonerror="true">
@@ -33,6 +27,12 @@
   <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">
   <mkdir dir="${builddir}/go/src/github.com/mendersoftware"/>
   <exec executable="tar" dir="${builddir}" failonerror="true">
@@ -67,6 +67,70 @@
   <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>
+
+ <target name="rebuild-mender-artifact">
+  <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"/>
+  </exec>
+  <exec executable="mv" dir="${builddir}" failonerror="true">
+   <arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact-2.1.1 ${builddir}/go/src/github.com/mendersoftware/mender-artifact"/>
+  </exec>
+  <exec executable="${builddir}/go/bin/go" dir="${builddir}/go/src/github.com/mendersoftware/mender-artifact" failonerror="true">
+   <arg line="build -ldflags &quot;-X main.Version=2.1.1&quot;"/>
+  </exec>
+  <exec executable="mv" dir="${builddir}" failonerror="true">
+   <arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact/mender-artifact ${builddir}"/>
+  </exec>
+  <delete dir="${builddir}/go"/>
+  <antcall target="mount"/>
+  <loadfile property="ARTIFACT_NAME" srcFile="${sysdir}/etc/mender/artifact_info" failonerror="true">
+    <filterchain>
+      <striplinebreaks/>
+      <tokenfilter>
+        <replaceregex pattern="^.*=" replace=""/>
+        <replaceregex pattern="-\d+$" replace=""/>
+      </tokenfilter>
+    </filterchain>
+  </loadfile>
+  <loadfile property="ARTIFACT_INFO" srcFile="${sysdir}/etc/mender/artifact_info" failonerror="true">
+    <filterchain>
+      <striplinebreaks/>
+      <tokenfilter>
+        <replaceregex pattern="^.*=" replace=""/>
+      </tokenfilter>
+    </filterchain>
+  </loadfile>
+  <loadfile property="DEVICE_TYPE" srcFile="${sysdir}/etc/device_info" failonerror="true">
+    <filterchain>
+      <tokenfilter>
+        <containsregex pattern="^DEVICE_PRODUCT="/>
+        <replaceregex pattern="^.*='" replace=""/>
+        <replaceregex pattern="'" replace=""/>
+      </tokenfilter>
+      <striplinebreaks/>
+    </filterchain>
+  </loadfile>
+  <copy todir="${builddir}/artifactscripts">
+    <fileset dir="${sysdir}/etc/mender/artifactscripts"/>
+  </copy>
+  <antcall target="unmount"/>
+  <exec executable="dd" dir="${builddir}" failonerror="true">
+   <arg line="if=${builddir}/disk.img of=${builddir}/${ARTIFACT_NAME}-${BUILD_ID}.ext4 bs=1048576 skip=${ABstart} count=${ABsize}"/>
+  </exec>
+  <exec executable="${builddir}/mender-artifact" dir="${builddir}" failonerror="true">
+   <arg line="write rootfs-image -t ${DEVICE_TYPE} -n ${ARTIFACT_NAME}-${BUILD_ID} -u ${ARTIFACT_NAME}-${BUILD_ID}.ext4 -o ${ARTIFACT_NAME}-${BUILD_ID}.mender -k ${basedir}/host/private.key -s artifactscripts"/>
+  </exec>
+  <delete file="${builddir}/mender-artifact"/>
+  <delete file="${builddir}/${ARTIFACT_NAME}-${BUILD_ID}.ext4"/>
+  <delete dir="${builddir}/artifactscripts"/>
+ </target>
+
  <target name="upload-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"/>