Commit e9a43ca0 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Ant's delete is unable to deal with files with non-ascii file names

parent 57ff2e62
...@@ -27,7 +27,9 @@ ...@@ -27,7 +27,9 @@
<exec executable="./make.bash" dir="${makedir}/src"> <exec executable="./make.bash" dir="${makedir}/src">
<env key="GOROOT_BOOTSTRAP" path="${builddir}/go1.4"/> <env key="GOROOT_BOOTSTRAP" path="${builddir}/go1.4"/>
</exec> </exec>
<delete dir="${builddir}/go1.4"/> <exec executable="rm" failonerror="true">
<arg line="-rf ${builddir}/go1.4"/>
</exec>
</target> </target>
<target name="build-mender-artifact" depends="build-go"> <target name="build-mender-artifact" depends="build-go">
...@@ -44,7 +46,9 @@ ...@@ -44,7 +46,9 @@
<exec executable="mv" dir="${builddir}" failonerror="true"> <exec executable="mv" dir="${builddir}" failonerror="true">
<arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact/cli/mender-artifact/mender-artifact ${builddir}"/> <arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact/cli/mender-artifact/mender-artifact ${builddir}"/>
</exec> </exec>
<delete dir="${builddir}/go"/> <exec executable="rm" failonerror="true">
<arg line="-rf ${builddir}/go"/>
</exec>
<antcall target="mount"/> <antcall target="mount"/>
<exec executable="bash" dir="${sysdir}" failonerror="true"> <exec executable="bash" dir="${sysdir}" failonerror="true">
<arg line="-c &quot;echo 'artifact_name=${ARTIFACT_NAME}-${BUILD_ID}' > ${sysdir}/etc/mender/artifact_info&quot;"/> <arg line="-c &quot;echo 'artifact_name=${ARTIFACT_NAME}-${BUILD_ID}' > ${sysdir}/etc/mender/artifact_info&quot;"/>
...@@ -88,7 +92,9 @@ ...@@ -88,7 +92,9 @@
<exec executable="mv" dir="${builddir}" failonerror="true"> <exec executable="mv" dir="${builddir}" failonerror="true">
<arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact/cli/mender-artifact/mender-artifact ${builddir}"/> <arg line="${builddir}/go/src/github.com/mendersoftware/mender-artifact/cli/mender-artifact/mender-artifact ${builddir}"/>
</exec> </exec>
<delete dir="${builddir}/go"/> <exec executable="rm" failonerror="true">
<arg line="-rf ${builddir}/go"/>
</exec>
<antcall target="mount"/> <antcall target="mount"/>
<loadfile property="ARTIFACT_NAME" srcFile="${sysdir}/etc/mender/artifact_info" failonerror="true"> <loadfile property="ARTIFACT_NAME" srcFile="${sysdir}/etc/mender/artifact_info" failonerror="true">
<filterchain> <filterchain>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment