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

Commit 4dbf0201 authored by John Zhang's avatar John Zhang
Browse files

Merge branch 'dacapo-versioning' into 'master'

build versioning

See merge request !4
parents 4a4e4978 8587f2de
Pipeline #2052 failed with stage
in 21 minutes and 12 seconds
......@@ -7,80 +7,75 @@ before_script:
avrora:
script:
- ant avrora
- ant -Dbuild.target-jar=dacapo.jar avrora
- java -jar dacapo.jar avrora
batik:
script:
- ant batik
- ant -Dbuild.target-jar=dacapo.jar batik
- java -jar dacapo.jar batik
eclipse:
script:
- ant eclipse
- ant -Dbuild.target-jar=dacapo.jar eclipse
- java -jar dacapo.jar eclipse
fop:
script:
- ant fop
- ant -Dbuild.target-jar=dacapo.jar fop
- java -jar dacapo.jar fop
h2:
script:
- ant h2
- ant -Dbuild.target-jar=dacapo.jar h2
- java -jar dacapo.jar h2
jython:
script:
- ant jython
- ant -Dbuild.target-jar=dacapo.jar jython
- java -jar dacapo.jar jython
luindex:
script:
- ant luindex
- ant -Dbuild.target-jar=dacapo.jar luindex
- java -jar dacapo.jar luindex
lusearch:
script:
- ant lusearch
- java -jar dacapo.jar lusearch
lusearch:
script:
- ant lusearch
- ant -Dbuild.target-jar=dacapo.jar lusearch
- java -jar dacapo.jar lusearch
lusearch-fix:
script:
- ant lusearch-fix
- ant -Dbuild.target-jar=dacapo.jar lusearch-fix
- java -jar dacapo.jar lusearch-fix
pmd:
script:
- ant pmd
- ant -Dbuild.target-jar=dacapo.jar pmd
- java -jar dacapo.jar pmd
sunflow:
script:
- ant sunflow
- ant -Dbuild.target-jar=dacapo.jar sunflow
- java -jar dacapo.jar sunflow
tomcat:
script:
- ant tomcat
- ant -Dbuild.target-jar=dacapo.jar tomcat
- java -jar dacapo.jar tomcat
tradebeans:
script:
- ant tradebeans
- ant -Dbuild.target-jar=dacapo.jar tradebeans
- java -jar dacapo.jar tradebeans
tradesoap:
script:
- ant tradesoap
- ant -Dbuild.target-jar=dacapo.jar tradesoap
- java -jar dacapo.jar tradesoap
xalan:
script:
- ant xalan
- ant -Dbuild.target-jar=dacapo.jar xalan
- java -jar dacapo.jar xalan
......@@ -175,7 +175,7 @@
</target>
<target name="complete">
<unjar src="${jar-target}" dest="${bm-output-dir}" overwrite="yes">
<unjar src="${build.target-jar}" dest="${bm-output-dir}" overwrite="yes">
<patternset>
<include name="doc/menu.html"/>
</patternset>
......@@ -188,7 +188,7 @@
</java>
<copy file="${temp.file}" tofile="${bm-output-dir}/doc/menu.html"/>
<delete file="${temp.file}"/>
<jar jarfile="${jar-target}" basedir="${bm-output-dir}" update="true"/>
<jar jarfile="${build.target-jar}" basedir="${bm-output-dir}" update="true"/>
</target>
</project>
......@@ -105,7 +105,7 @@ BUILDING:
<target name="extract-git-revision" depends="check-git-present" if="git.present">
<exec executable="${git.exe}" failonerror="no" failifexecutionfails="no">
<arg line="show --abbrev-commit HEAD"/>
<redirector outputproperty="git.revision">
<redirector outputproperty="git.hash">
<outputfilterchain>
<linecontainsregexp>
<regexp pattern="^commit [a-z0-9]+$"/>
......@@ -118,14 +118,21 @@ BUILDING:
</exec>
</target>
<target name="get-git-revision" depends="extract-git-revision" unless="git.revision">
<target name="get-git-revision" depends="extract-git-revision" unless="git.hash">
<!-- set property if not already set -->
<property name="git.revision" value="unknown"/>
<property name="git.hash" value="unknown"/>
</target>
<target name="set-build-version-info" depends="get-git-revision">
<property name="build.nickname" value="development"/>
<property name="build.version" value="head-r${git.revision}"/>
<property name="build.nickname" value="${dacapo.nickname}"/>
<!-- overwritable with -Dbuild.is-official=true on commandline-->
<condition property="build.version"
value="${dacapo.version}"
else="${dacapo.version}+${git.hash}">
<isset property="build.is-official"/>
</condition>
<!-- set target jar name -->
<property name="build.target-jar" value="dacapo-${build.version}.jar"/>
</target>
<target name="init" depends="set-build-version-info">
......@@ -234,7 +241,7 @@ BUILDING:
target: dist
================================= -->
<target name="dist" depends="harness,compile">
<move file="dacapo.jar" tofile="dacapo-${DSTAMP}.jar"/>
<move file="${build.target-jar}" tofile="dacapo-${DSTAMP}.jar"/>
</target>
<target name="doc" depends="init,bootstrap,harness" description="make the top level documentation">
......@@ -270,7 +277,7 @@ BUILDING:
</copy>
<!-- construct the base jar -->
<jar jarfile="${jar-target}" basedir="${dacapo.build.dir}" update="false" manifest="${dacapo.build.dir}/MANIFEST.MF" excludes="MANIFEST.MF"/>
<jar jarfile="${build.target-jar}" basedir="${dacapo.build.dir}" update="false" manifest="${dacapo.build.dir}/MANIFEST.MF" excludes="MANIFEST.MF"/>
</target>
<target name="clean-bootstrap" depends="init">
......@@ -358,6 +365,7 @@ See ${log.build.report} for a summary of benchmark build status.
<arg value="-Dtoolsdir=${toolsdir}"/>
<arg value="-Dbuild.time=${build.time}"/>
<arg value="-Dlog.build.dir=${log.build.dir}"/>
<arg value="-Dbuild.target-jar=${build.target-jar}"/>
<arg value="-buildfile"/>
<arg value="bms/@{benchmark}/build.xml"/>
<arg value="incremental"/>
......
# DaCapo version
dacapo.version=9.12-MR1
dacapo.nickname=uncalibrated
#
# Common properties for the dacapo benchmarks
#
......@@ -12,5 +16,3 @@ sfdata.url=http://dacapobench.sourceforge.net/source-data
apache.dl.url=http://archive.apache.org/dist
apache.mirror=http://apache.mirror.amaze.com.au
github.url=https://github.com
jar-target=dacapo.jar
......@@ -64,6 +64,6 @@
</target>
<target name="jar">
<jar jarfile="${jar-target}" basedir="${output-parent-dir}" update="true"/>
<jar jarfile="${build.target-jar}" basedir="${output-parent-dir}" update="true"/>
</target>
</project>
......@@ -215,7 +215,7 @@ public class CommandLineArgs {
*/
static void printUsage() {
HelpFormatter formatter = new HelpFormatter();
formatter.printHelp("DaCapo Benchmark suite", visibleOptions);
formatter.printHelp("DaCapo Benchmark suite " + TestHarness.getBuildVersion(), visibleOptions);
}
/**
......
......@@ -81,6 +81,7 @@ public class TestHarness {
/* All benchmarks run headless */
System.setProperty("java.awt.headless", "true");
setBuildInfo(); // set BuildVersion and BuildNickName.
try {
commandLineArgs = new CommandLineArgs(args);
......@@ -253,8 +254,7 @@ public class TestHarness {
return null; // not reached
}
}
{
private static void setBuildInfo() {
try {
String url = TestHarness.class.getProtectionDomain().getCodeSource().getLocation().getFile();
JarFile jarFile = new JarFile(url.replace("!/harness", "").replace("file:", ""));
......
......@@ -70,6 +70,6 @@
<target name="jar"/>
<target name="complete">
<jar jarfile="${jar-target}" basedir="${lib-output-dir}" update="true"/>
<jar jarfile="${build.target-jar}" basedir="${lib-output-dir}" update="true"/>
</target>
</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