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

Commit 479fb58d authored by john's avatar john
Browse files

added small tool for helping process docs, added some blank docs and alterred...

added small tool for helping process docs, added some blank docs and alterred build to construct documentation
parent c686de9c
<HTML>
<HEAD>
<TITLE>DaCapo Benchmarks: Avrora</TITLE>
<META HTTP-EQUIV="Description" NAME="DaCapo Benchmark: Avrora"
CONTENT="The DaCapo Benchmark: Avrora.">
<META HTTP-EQUIV="Keywords" NAME="Keywords"
CONTENT="dacapo benchmarks performance java avrora">
<LINK REL="stylesheet" TYPE="text/css" HREF="../dacapo.css"/>
</HEAD>
<BODY>
<CENTER><H3>avrora</H3></CENTER>
<H4>Description:</H4>
<H4>Characteristics:</H4>
<H4>References:</H4>
<H4>Harness:</H4>
<A HREF="index.html" TARGET="_top">Javadoc for avrora harness.</A>
</BODY>
</HTML>
<HTML>
<HEAD>
<TITLE>DaCapo Benchmarks: Avrora</TITLE>
<META HTTP-EQUIV="Description" NAME="DaCapo Benchmark: Avrora"
CONTENT="The DaCapo Benchmark: Avrora.">
<META HTTP-EQUIV="Keywords" NAME="Keywords"
CONTENT="dacapo benchmarks performance java batik">
<LINK REL="stylesheet" TYPE="text/css" HREF="../dacapo.css"/>
</HEAD>
<BODY>
<CENTER><H3>batik</H3></CENTER>
<H4>Description:</H4>
<H4>Characteristics:</H4>
<H4>References:</H4>
<H4>Harness:</H4>
<A HREF="index.html" TARGET="_top">Javadoc for batik harness.</A>
</BODY>
</HTML>
...@@ -9,13 +9,20 @@ ...@@ -9,13 +9,20 @@
<project name="common"> <project name="common">
<import file="../util.xml"/> <import file="../util.xml"/>
<import file="../libs/libs.xml"/> <import file="../libs/libs.xml"/>
<tstamp>
<format property="build.time" pattern="yyyyMMdd-hhmm"/>
</tstamp>
<property file="dacapo.properties"/> <property file="dacapo.properties"/>
<property file="local.properties"/> <property file="local.properties"/>
<property file="default.properties"/> <property file="default.properties"/>
<property name="bm-files" value="${basedir}/bms/${bm-name}"/> <property name="bm-files" value="${basedir}/bms/${bm-name}"/>
<property name="bm-build-dir" value="${bm-files}/build"/> <property name="bm-build-dir" value="${bm-files}/build"/>
<property name="bm-doc-dir" value="${bm-files}/doc"/>
<property name="bm-output-dir" value="${bm-files}/dist"/> <property name="bm-output-dir" value="${bm-files}/dist"/>
<property name="bm-output-doc-dir" value="${bm-files}/dist/doc/${bm-name}"/>
<property name="bm-output-harness-dir" value="${bm-files}/dist/harness"/> <property name="bm-output-harness-dir" value="${bm-files}/dist/harness"/>
<property name="bm-output-benchmark-dir" value="${bm-files}/dist/benchmark"/> <property name="bm-output-benchmark-dir" value="${bm-files}/dist/benchmark"/>
<property name="bm-deps-output-dir" value="${bm-files}/deps"/> <property name="bm-deps-output-dir" value="${bm-files}/deps"/>
...@@ -32,7 +39,7 @@ ...@@ -32,7 +39,7 @@
<property name="harness-classpath" value="harness/dist/harness"/> <property name="harness-classpath" value="harness/dist/harness"/>
<target name="all" depends="source, svn-source, cvs-source, pre-build, build, complete"/> <target name="all" depends="source,svn-source,cvs-source,pre-build,build,complete"/>
<target name="incremental"> <target name="incremental">
<property name="incremental-build" value="true"/> <property name="incremental-build" value="true"/>
...@@ -108,12 +115,24 @@ ...@@ -108,12 +115,24 @@
<javac srcdir="${bm-src-harness-dir}" classpath="${harness-classpath}" destdir="${bm-output-harness-dir}" <javac srcdir="${bm-src-harness-dir}" classpath="${harness-classpath}" destdir="${bm-output-harness-dir}"
includes="org/dacapo/harness/**" includes="org/dacapo/harness/**"
debug="true" debuglevel="lines,vars,source"/> debug="true" debuglevel="lines,vars,source"/>
<copy todir="${bm-output-doc-dir}">
<fileset dir="${bm-doc-dir}">
<include name="**"/>
</fileset>
</copy>
<javadoc sourcepath="${bm-src-harness-dir}" classpath="${harness-classpath}" destdir="${bm-output-doc-dir}"/>
</target> </target>
<target name="bm-harness-with" if="bm-harness-classpath"> <target name="bm-harness-with" if="bm-harness-classpath">
<javac srcdir="${bm-src-harness-dir}" classpath="${harness-classpath}:${bm-harness-classpath}" destdir="${bm-output-harness-dir}" <javac srcdir="${bm-src-harness-dir}" classpath="${harness-classpath}:${bm-harness-classpath}" destdir="${bm-output-harness-dir}"
includes="org/dacapo/harness/**" includes="org/dacapo/harness/**"
debug="true" debuglevel="lines,vars,source"/> debug="true" debuglevel="lines,vars,source"/>
<copy todir="${bm-output-doc-dir}">
<fileset dir="${bm-doc-dir}">
<include name="**"/>
</fileset>
</copy>
<javadoc sourcepath="${bm-src-harness-dir}" classpath="${harness-classpath}:${bm-harness-classpath}" destdir="${bm-output-doc-dir}"/>
</target> </target>
<target name="dacapo-harness" unless="incremental-build"> <target name="dacapo-harness" unless="incremental-build">
...@@ -143,6 +162,19 @@ ...@@ -143,6 +162,19 @@
</target> </target>
<target name="complete"> <target name="complete">
<unjar src="${jar-target}" dest="${bm-output-dir}" overwrite="yes">
<patternset>
<include name="doc/menu.html"/>
</patternset>
</unjar>
<tempfile property="temp.file" destdir="${bm-output-dir}/doc"/>
<java jar="${toolsdir}/transformer/bin/transformer.jar" fork="yes">
<arg value="${bm-output-dir}/doc/menu.html"/>
<arg value="${bm-name}"/>
<arg value="${temp.file}"/>
</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="${jar-target}" basedir="${bm-output-dir}" update="true"/>
</target> </target>
......
<HTML>
<HEAD>
<TITLE>DaCapo Benchmarks: Avrora</TITLE>
<META HTTP-EQUIV="Description" NAME="DaCapo Benchmark: Avrora"
CONTENT="The DaCapo Benchmark: Avrora.">
<META HTTP-EQUIV="Keywords" NAME="Keywords"
CONTENT="dacapo benchmarks performance java eclipse">
<LINK REL="stylesheet" TYPE="text/css" HREF="../dacapo.css"/>
</HEAD>
<BODY>
<CENTER><H3>eclipse</H3></CENTER>
<H4>Description:</H4>
<H4>Characteristics:</H4>
<H4>References:</H4>
<H4>Harness:</H4>
<A HREF="index.html" TARGET="_top">Javadoc for eclipse harness.</A>
</BODY>
</HTML>
<HTML>
<HEAD>
<TITLE>DaCapo Benchmarks: Avrora</TITLE>
<META HTTP-EQUIV="Description" NAME="DaCapo Benchmark: Avrora"
CONTENT="The DaCapo Benchmark: Avrora.">
<META HTTP-EQUIV="Keywords" NAME="Keywords"
CONTENT="dacapo benchmarks performance java fop">
<LINK REL="stylesheet" TYPE="text/css" HREF="../dacapo.css"/>
</HEAD>
<BODY>
<CENTER><H3>fop</H3></CENTER>
<H4>Description:</H4>
<H4>Characteristics:</H4>
<H4>References:</H4>
<H4>Harness:</H4>
<A HREF="index.html" TARGET="_top">Javadoc for fop harness.</A>
</BODY>
</HTML>
<HTML>
<HEAD>
<TITLE>DaCapo Benchmarks: Avrora</TITLE>
<META HTTP-EQUIV="Description" NAME="DaCapo Benchmark: Avrora"
CONTENT="The DaCapo Benchmark: Avrora.">
<META HTTP-EQUIV="Keywords" NAME="Keywords"
CONTENT="dacapo benchmarks performance java h2">
<LINK REL="stylesheet" TYPE="text/css" HREF="../dacapo.css"/>
</HEAD>
<BODY>
<CENTER><H3>h2</H3></CENTER>
<H4>Description:</H4>
<H4>Characteristics:</H4>
<H4>References:</H4>
<H4>Harness:</H4>
<A HREF="index.html" TARGET="_top">Javadoc for h2 harness.</A>
</BODY>
</HTML>
<HTML>
<HEAD>
<TITLE>DaCapo Benchmarks: Avrora</TITLE>
<META HTTP-EQUIV="Description" NAME="DaCapo Benchmark: Avrora"
CONTENT="The DaCapo Benchmark: Avrora.">
<META HTTP-EQUIV="Keywords" NAME="Keywords"
CONTENT="dacapo benchmarks performance java jython">
<LINK REL="stylesheet" TYPE="text/css" HREF="../dacapo.css"/>
</HEAD>
<BODY>
<CENTER><H3>jython</H3></CENTER>
<H4>Description:</H4>
<H4>Characteristics:</H4>
<H4>References:</H4>
<H4>Harness:</H4>
<A HREF="index.html" TARGET="_top">Javadoc for jython harness.</A>
</BODY>
</HTML>
<HTML>
<HEAD>
<TITLE>DaCapo Benchmarks: Avrora</TITLE>
<META HTTP-EQUIV="Description" NAME="DaCapo Benchmark: Avrora"
CONTENT="The DaCapo Benchmark: Avrora.">
<META HTTP-EQUIV="Keywords" NAME="Keywords"
CONTENT="dacapo benchmarks performance java luindex">
<LINK REL="stylesheet" TYPE="text/css" HREF="../dacapo.css"/>
</HEAD>
<BODY>
<CENTER><H3>luindex</H3></CENTER>
<H4>Description:</H4>
<H4>Characteristics:</H4>
<H4>References:</H4>
<H4>Harness:</H4>
<A HREF="index.html" TARGET="_top">Javadoc for luindex harness.</A>
</BODY>
</HTML>
<HTML>
<HEAD>
<TITLE>DaCapo Benchmarks: Avrora</TITLE>
<META HTTP-EQUIV="Description" NAME="DaCapo Benchmark: Avrora"
CONTENT="The DaCapo Benchmark: Avrora.">
<META HTTP-EQUIV="Keywords" NAME="Keywords"
CONTENT="dacapo benchmarks performance java lusearch">
<LINK REL="stylesheet" TYPE="text/css" HREF="../dacapo.css"/>
</HEAD>
<BODY>
<CENTER><H3>lusearch</H3></CENTER>
<H4>Description:</H4>
<H4>Characteristics:</H4>
<H4>References:</H4>
<H4>Harness:</H4>
<A HREF="index.html" TARGET="_top">Javadoc for lusearch harness.</A>
</BODY>
</HTML>
<HTML>
<HEAD>
<TITLE>DaCapo Benchmarks: Avrora</TITLE>
<META HTTP-EQUIV="Description" NAME="DaCapo Benchmark: Avrora"
CONTENT="The DaCapo Benchmark: Avrora.">
<META HTTP-EQUIV="Keywords" NAME="Keywords"
CONTENT="dacapo benchmarks performance java pmd">
<LINK REL="stylesheet" TYPE="text/css" HREF="../dacapo.css"/>
</HEAD>
<BODY>
<CENTER><H3>pmd</H3></CENTER>
<H4>Description:</H4>
<H4>Characteristics:</H4>
<H4>References:</H4>
<H4>Harness:</H4>
<A HREF="index.html" TARGET="_top">Javadoc for pmd harness.</A>
</BODY>
</HTML>
<HTML>
<HEAD>
<TITLE>DaCapo Benchmarks: Avrora</TITLE>
<META HTTP-EQUIV="Description" NAME="DaCapo Benchmark: Avrora"
CONTENT="The DaCapo Benchmark: Avrora.">
<META HTTP-EQUIV="Keywords" NAME="Keywords"
CONTENT="dacapo benchmarks performance java sunflow">
<LINK REL="stylesheet" TYPE="text/css" HREF="../dacapo.css"/>
</HEAD>
<BODY>
<CENTER><H3>sunflow</H3></CENTER>
<H4>Description:</H4>
<H4>Characteristics:</H4>
<H4>References:</H4>
<H4>Harness:</H4>
<A HREF="index.html" TARGET="_top">Javadoc for sunflow harness.</A>
</BODY>
</HTML>
<HTML>
<HEAD>
<TITLE>DaCapo Benchmarks: Avrora</TITLE>
<META HTTP-EQUIV="Description" NAME="DaCapo Benchmark: Avrora"
CONTENT="The DaCapo Benchmark: Avrora.">
<META HTTP-EQUIV="Keywords" NAME="Keywords"
CONTENT="dacapo benchmarks performance java tomcat">
<LINK REL="stylesheet" TYPE="text/css" HREF="../dacapo.css"/>
</HEAD>
<BODY>
<CENTER><H3>tomcat</H3></CENTER>
<H4>Description:</H4>
<H4>Characteristics:</H4>
<H4>References:</H4>
<H4>Harness:</H4>
<A HREF="index.html" TARGET="_top">Javadoc for tomcat harness.</A>
</BODY>
</HTML>
<HTML>
<HEAD>
<TITLE>DaCapo Benchmarks: Avrora</TITLE>
<META HTTP-EQUIV="Description" NAME="DaCapo Benchmark: Avrora"
CONTENT="The DaCapo Benchmark: Avrora.">
<META HTTP-EQUIV="Keywords" NAME="Keywords"
CONTENT="dacapo benchmarks performance java tradebeans">
<LINK REL="stylesheet" TYPE="text/css" HREF="../dacapo.css"/>
</HEAD>
<BODY>
<CENTER><H3>tradebeans</H3></CENTER>
<H4>Description:</H4>
<H4>Characteristics:</H4>
<H4>References:</H4>
<H4>Harness:</H4>
<A HREF="index.html" TARGET="_top">Javadoc for tradebeans harness.</A>
</BODY>
</HTML>
<HTML>
<HEAD>
<TITLE>DaCapo Benchmarks: Avrora</TITLE>
<META HTTP-EQUIV="Description" NAME="DaCapo Benchmark: Avrora"
CONTENT="The DaCapo Benchmark: Avrora.">
<META HTTP-EQUIV="Keywords" NAME="Keywords"
CONTENT="dacapo benchmarks performance java tradesoap">
<LINK REL="stylesheet" TYPE="text/css" HREF="../dacapo.css"/>
</HEAD>
<BODY>
<CENTER><H3>tradesoap</H3></CENTER>
<H4>Description:</H4>
<H4>Characteristics:</H4>
<H4>References:</H4>
<H4>Harness:</H4>
<A HREF="index.html" TARGET="_top">Javadoc for tradesoap harness.</A>
</BODY>
</HTML>
<HTML>
<HEAD>
<TITLE>DaCapo Benchmarks: Avrora</TITLE>
<META HTTP-EQUIV="Description" NAME="DaCapo Benchmark: Avrora"
CONTENT="The DaCapo Benchmark: Avrora.">
<META HTTP-EQUIV="Keywords" NAME="Keywords"
CONTENT="dacapo benchmarks performance java xalan">
<LINK REL="stylesheet" TYPE="text/css" HREF="../dacapo.css"/>
</HEAD>
<BODY>
<CENTER><H3>xalan</H3></CENTER>
<H4>Description:</H4>
<H4>Characteristics:</H4>
<H4>References:</H4>
<H4>Harness:</H4>
<A HREF="index.html" TARGET="_top">Javadoc for xalan harness.</A>
</BODY>
</HTML>
...@@ -72,6 +72,8 @@ BUILDING: ...@@ -72,6 +72,8 @@ BUILDING:
<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.build.dir" value="${basedir}/build"/>
<property name="dacapo.build.doc.dir" value="${dacapo.build.dir}/doc"/>
<property name="dacapo.doc.dir" value="${basedir}/doc"/>
<property name="dacapo.src.dir" value="${basedir}/src"/> <property name="dacapo.src.dir" value="${basedir}/src"/>
<target name="check-svn-present"> <target name="check-svn-present">
...@@ -105,6 +107,20 @@ BUILDING: ...@@ -105,6 +107,20 @@ BUILDING:
<property name="build.version" value="head-r${svn.revision}"/> <property name="build.version" value="head-r${svn.revision}"/>
</target> </target>
<target name="init" depends="set-build-version-info">
<!-- Create the time stamp -->
<tstamp/>
<delete dir="${log.build.dir}" />
<delete dir="${dacapo.build.doc.dir}"/>
<delete dir="${dacapo.build.dir}" />
<mkdir dir="${log.build.dir}" />
<mkdir dir="${dacapo.build.dir}" />
<mkdir dir="${dacapo.build.doc.dir}"/>
<echo>build.nickname=${build.nickname}</echo>
<echo>build.version=${build.version}</echo>
</target>
<!-- BEGIN PUBLIC TARGETS --> <!-- BEGIN PUBLIC TARGETS -->
...@@ -191,37 +207,44 @@ BUILDING: ...@@ -191,37 +207,44 @@ BUILDING:
<move file="dacapo.jar" tofile="dacapo-${DSTAMP}.jar"/> <move file="dacapo.jar" tofile="dacapo-${DSTAMP}.jar"/>
</target> </target>
<target name="init" depends="set-build-version-info"> <target name="doc" depends="init,bootstrap,harness" description="make the top level documentation">
<!-- Create the time stamp -->
<tstamp/>
<delete dir="${log.build.dir}" />
<delete dir="${dacapo.build.dir}" />
<mkdir dir="${log.build.dir}" />
<mkdir dir="${dacapo.build.dir}" />
<echo>build.nickname=${build.nickname}</echo> <jar />
<echo>build.version=${build.version}</echo>
</target> </target>
<!-- ================================= <!-- =================================
target: bootstrap for running harness target: bootstrap for running harness
================================= --> ================================= -->
<target name="bootstrap" depends="init"> <target name="bootstrap" depends="init">
<!-- construct the bootstrap -->
<javac srcdir="${dacapo.src.dir}" destdir="${dacapo.build.dir}"/> <javac srcdir="${dacapo.src.dir}" destdir="${dacapo.build.dir}"/>
<!-- set the manifest for the jar -->
<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>
<!-- form the top level info -->
<copy file="${basedir}/LICENSE-2.0.txt" todir="${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}/README.txt" todir="${dacapo.build.dir}"/>
<copy file="${basedir}/RELEASE_NOTES.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}"/> <!-- this forms the base document section -->
<echo file="${dacapo.build.dir}/MANIFEST.MF" append="yes">Specification-Version: ${build.nickname}${line.separator}</echo> <copy file="${basedir}/LICENSE-2.0.txt" tofile="${dacapo.build.doc.dir}/LICENSE.txt" />
<echo file="${dacapo.build.dir}/MANIFEST.MF" append="yes">Implementation-Version: ${build.version}${line.separator}</echo> <copy file="${basedir}/README.txt" todir="${dacapo.build.doc.dir}" />
<copy file="${basedir}/RELEASE_NOTES.txt" todir="${dacapo.build.doc.dir}" />
<copy todir="${dacapo.build.doc.dir}">
<fileset dir="${dacapo.doc.dir}"/>
</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="${jar-target}" basedir="${dacapo.build.dir}" update="false" manifest="${dacapo.build.dir}/MANIFEST.MF" excludes="MANIFEST.MF"/>
</target> </target>
<target name="clean-bootstrap" depends="init"> <target name="clean-bootstrap" depends="init">
<delete dir="${dacpao.build.doc.dir}"/>
<delete dir="${dacpao.build.dir}"/> <delete dir="${dacpao.build.dir}"/>
</target> </target>
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<property name="src" value="${base-dir}/src"/> <property name="src" value="${base-dir}/src"/>
<property name="output-parent-dir" value="${base-dir}/dist"/> <property name="output-parent-dir" value="${base-dir}/dist"/>
<property name="output-dir" value="${output-parent-dir}/harness"/> <property name="output-dir" value="${output-parent-dir}/harness"/>
<property name="output-doc-dir" value="${output-parent-dir}/doc/harness"/>
<property name="build-dir" value="${base-dir}/build"/> <property name="build-dir" value="${base-dir}/build"/>
<property name="harness-downloads" value="${base-dir}/downloads"/> <property name="harness-downloads" value="${base-dir}/downloads"/>
...@@ -21,7 +22,7 @@ ...@@ -21,7 +22,7 @@
<property name="cli-basename" value="${cli}-${cli-version}"/> <property name="cli-basename" value="${cli}-${cli-version}"/>
<property name="cli-name" value="${cli-basename}-bin.tar.gz"/> <property name="cli-name" value="${cli-basename}-bin.tar.gz"/>
<target name="all" depends="clean, init, harness, jar"/> <target name="all" depends="clean,init,harness,jar"/>
<target name="clean"> <target name="clean">
<delete dir="${output-parent-dir}"/> <delete dir="${output-parent-dir}"/>
...@@ -30,6 +31,7 @@ ...@@ -30,6 +31,7 @@
<target name="init"> <target name="init">
<mkdir dir="${output-dir}"/> <mkdir dir="${output-dir}"/>
<mkdir dir="${output-doc-dir}"/>
<mkdir dir="${build-dir}"/> <mkdir dir="${build-dir}"/>
</target> </target>
...@@ -58,6 +60,7 @@ ...@@ -58,6 +60,7 @@
<!-- 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"/>
<javadoc sourcepath="${src}" destdir="${output-doc-dir}" />
</target> </target>
<target name="jar"> <target name="jar">
......
<!--
* Copyright (c) 2009 The Australian National University.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Apache License v2.0.