To protect your data, the CISO officer has suggested users to enable 2FA as soon as possible.
Currently 2.7% of users enabled 2FA.

Commit c686de9c authored by john's avatar john
Browse files

moved the hoisted the harness bootstrap class out of benchmarks/harness/src...

moved the hoisted the harness bootstrap class out of benchmarks/harness/src into benchmarks/src and introduced a clean target
parent 3e78ab60
...@@ -71,6 +71,9 @@ BUILDING: ...@@ -71,6 +71,9 @@ BUILDING:
<property name="log.build.pass" value="${log.dir}/${build.time}/pass.txt"/> <property name="log.build.pass" value="${log.dir}/${build.time}/pass.txt"/>
<property name="log.build.fail" value="${log.dir}/${build.time}/fail.txt"/> <property name="log.build.fail" value="${log.dir}/${build.time}/fail.txt"/>
<property name="dacapo.build.dir" value="${basedir}/build"/>
<property name="dacapo.src.dir" value="${basedir}/src"/>
<target name="check-svn-present"> <target name="check-svn-present">
<available property="svn.present" file=".svn" type="dir"/> <available property="svn.present" file=".svn" type="dir"/>
<property name="svn.exe" value="svn"/> <property name="svn.exe" value="svn"/>
...@@ -192,12 +195,36 @@ BUILDING: ...@@ -192,12 +195,36 @@ BUILDING:
<!-- Create the time stamp --> <!-- Create the time stamp -->
<tstamp/> <tstamp/>
<delete dir="${log.build.dir}" /> <delete dir="${log.build.dir}" />
<delete dir="${dacapo.build.dir}" />
<mkdir dir="${log.build.dir}" /> <mkdir dir="${log.build.dir}" />
<mkdir dir="${dacapo.build.dir}" />
<echo>build.nickname=${build.nickname}</echo> <echo>build.nickname=${build.nickname}</echo>
<echo>build.version=${build.version}</echo> <echo>build.version=${build.version}</echo>
</target> </target>
<!-- =================================
target: bootstrap for running harness
================================= -->
<target name="bootstrap" depends="init">
<javac srcdir="${dacapo.src.dir}" destdir="${dacapo.build.dir}"/>
<copy file="${basedir}/LICENSE-2.0.txt" todir="${dacapo.build.dir}"/>
<copy file="${basedir}/README.txt" todir="${dacapo.build.dir}"/>
<copy file="${basedir}/RELEASE_NOTES.txt" todir="${dacapo.build.dir}"/>
<copy file="${dacapo.src.dir}/META-INF/MANIFEST.MF" todir="${dacapo.build.dir}"/>
<echo file="${dacapo.build.dir}/MANIFEST.MF" append="yes">Specification-Version: ${build.nickname}${line.separator}</echo>
<echo file="${dacapo.build.dir}/MANIFEST.MF" append="yes">Implementation-Version: ${build.version}${line.separator}</echo>
<jar jarfile="${jar-target}" basedir="${dacapo.build.dir}" update="false" manifest="${dacapo.build.dir}/MANIFEST.MF" excludes="MANIFEST.MF"/>
</target>
<target name="clean-bootstrap" depends="init">
<delete dir="${dacpao.build.dir}"/>
</target>
<!-- ================================= <!-- =================================
target: compile all sources target: compile all sources
================================= --> ================================= -->
...@@ -209,10 +236,51 @@ BUILDING: ...@@ -209,10 +236,51 @@ BUILDING:
<!-- ================================= <!-- =================================
target: harness target: harness
================================= --> ================================= -->
<target name="harness" depends="init" description="compile the source "> <target name="harness" depends="init,bootstrap" description="compile the source ">
<ant antfile="harness/build.xml"/> <ant antfile="harness/build.xml"/>
</target> </target>
<target name="clean-harness" depends="init">
<ant antfile="harness/build.xml" target="clean"/>
</target>
<!-- *************************************************************************** -->
<!-- Clean -->
<!-- *************************************************************************** -->
<macrodef name="clean.bm">
<attribute name="benchmark"/>
<sequential>
<exec executable="ant" failifexecutionfails="no" failonerror="no" resultproperty="clean-@{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="clean"/>
</exec>
</sequential>
</macrodef>
<target name="clean-benchmarks" depends="init">
<clean.bm benchmark="avrora"/>
<clean.bm benchmark="batik"/>
<clean.bm benchmark="h2"/>
<clean.bm benchmark="eclipse"/>
<clean.bm benchmark="fop"/>
<clean.bm benchmark="jython"/>
<clean.bm benchmark="luindex"/>
<clean.bm benchmark="lusearch"/>
<clean.bm benchmark="pmd"/>
<clean.bm benchmark="sunflow"/>
<clean.bm benchmark="tomcat"/>
<clean.bm benchmark="tradebeans"/>
<clean.bm benchmark="tradesoap"/>
<clean.bm benchmark="xalan"/>
</target>
<target name="clean" depends="clean-benchmarks,clean-harness,clean-bootstrap"/>
<!-- *************************************************************************** --> <!-- *************************************************************************** -->
<!-- Build --> <!-- Build -->
<!-- *************************************************************************** --> <!-- *************************************************************************** -->
......
...@@ -54,21 +54,13 @@ ...@@ -54,21 +54,13 @@
</unjar> </unjar>
</target> </target>
<target name="manifest"> <target name="harness" depends="init,dacapo-digest,cli,parser">
<copy file="${src}/META-INF/MANIFEST.MF" todir="${output-parent-dir}"/>
<echo file="${output-parent-dir}/MANIFEST.MF" append="yes">Specification-Version: ${build.nickname}${line.separator}</echo>
<echo file="${output-parent-dir}/MANIFEST.MF" append="yes">Implementation-Version: ${build.version}${line.separator}</echo>
</target>
<target name="harness" depends="init,dacapo-digest,cli,parser,manifest">
<!-- include digest --> <!-- include digest -->
<unjar src="${dacapo-digest-jar}" dest="${output-dir}" /> <unjar src="${dacapo-digest-jar}" dest="${output-dir}" />
<javac srcdir="${src}" destdir="${output-dir}" debug="true" debuglevel="lines,vars,source"/> <javac srcdir="${src}" destdir="${output-dir}" debug="true" debuglevel="lines,vars,source"/>
<copy file="${output-dir}/Harness.class" todir="${output-parent-dir}" />
<copy file="${basedir}/RELEASE_NOTES.txt" todir="${output-parent-dir}" />
</target> </target>
<target name="jar"> <target name="jar">
<jar jarfile="${jar-target}" basedir="${output-parent-dir}" update="false" manifest="${output-parent-dir}/MANIFEST.MF" excludes="MANIFEST.MF"/> <jar jarfile="${jar-target}" basedir="${output-parent-dir}" update="true"/>
</target> </target>
</project> </project>
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
<target name="build.init"> <target name="build.init">
<mkdir dir="${lib-build-dir}"/> <mkdir dir="${lib-build-dir}"/>
<mkdir dir="${lib-output-dir}/jar/${libs-jar}"/>
</target> </target>
</project> </project>
......
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