To protect your data, the CISO officer has suggested users to enable GitLab 2FA as soon as possible.

Commit 8613ad94 authored by jzigman's avatar jzigman
Browse files

[svn r488] Changed the temporary directory names for decompressing and generating checksums for

cvs and svn to (svn|cvs)-yyyyMMdd-hhmm also propagate yyyyMMdd-hhmm build.time and
log.dir to other ant scripts.
parent bf0f04b7
......@@ -109,6 +109,8 @@ See ${log.build.report} for a summary of benchmark build status.
<sequential>
<exec executable="ant" failifexecutionfails="no" failonerror="no" resultproperty="@{benchmark}-status">
<arg value="-Dtoolsdir=${toolsdir}"/>
<arg value="-Dbuild.time=${build.time}"/>
<arg value="-Dlog.build.dir=${log.build.dir}"/>
<arg value="-buildfile"/>
<arg value="bms/@{benchmark}/build.xml"/>
<arg value="incremental"/>
......
......@@ -62,7 +62,8 @@
<attribute name="compression" default="gzip" />
<sequential>
<echo>checksum-verify</echo>
<tempfile property="tmpfile"/>
<property name="tmpfile" value="chksum-${build.time}"/>
<delete dir="${tmpfile}" />
<mkdir dir="${tmpfile}"/>
<untar src="@{file}" dest="${tmpfile}" compression="@{compression}" />
<touch file="${tmpfile}.chk" />
......@@ -85,7 +86,9 @@
<attribute name="compression" default="gzip" />
<sequential>
<echo>checksum-write</echo>
<property name="tmpfile" value="chksum-${build.time}"/>
<tempfile property="tmpfile"/>
<delete dir="${tmpfile}" />
<mkdir dir="${tmpfile}"/>
<untar src="@{file}" dest="${tmpfile}" compression="@{compression}" />
<touch file="${tmpfile}.chk" />
......@@ -148,7 +151,7 @@
<!-- get the source from svn and tar up if necessary -->
<target name="get-svn-source" unless="target-valid-md5">
<tempfile property="svn-tmp"/>
<property name="svn-tmp" value="svn-${build.time}"/>
<exec executable="svn" failonerror="yes">
<arg line="-r${svn-revision}"/>
<arg line="checkout"/>
......@@ -204,7 +207,7 @@
<!-- get the source from cvs and tar up if necessary -->
<target name="get-cvs-source" unless="target-valid-md5">
<tempfile property="cvs-tmp"/>
<property name="cvs-tmp" value="cvs-${build.time}"/>
<mkdir dir="${cvs-tmp}"/>
<cvs cvsRoot="${cvs-root}" dest="${cvs-tmp}" package="${cvs-package}" date="${cvs-date}" compression="yes" failonerror="yes" />
<!-- since timestamps are kept in tar balls we force to a date before the dacapo project start -->
......
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