Skip to content

Commit

Permalink
Ant build file uses variable and reformatting
Browse files Browse the repository at this point in the history 
* Paths are stored in variable and the variables are used
* Removed the extra space in self-closing tags

Conflicts:
	build.xml
  • Loading branch information
@awulder @amolenaar
awulder authored and amolenaar committed Mar 9, 2013
1 parent bf8307f commit c246f97
Showing 1 changed file with 75 additions and 74 deletions.
149 changes: 75 additions & 74 deletions build.xml
View file
@@ -1,31 +1,33 @@
<project name="Fitnesse" default="all" basedir="." <project name="Fitnesse" default="all" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
xmlns:ivy="antlib:org.apache.ivy.ant">


<description> <description>
Fitnesse is a wiki wrapper for fit, an acceptance test framework. Fitnesse is a wiki wrapper for fit, an acceptance test framework.
</description> </description>


<property environment="env" /> <property environment="env"/>
<property name="env.FITNESSE_TEST_PORT" value="8080" /> <property name="env.FITNESSE_TEST_PORT" value="8080"/>
<property name="src" location="src" /> <property name="src.dir" location="src"/>
<property name="src2" location="srcFitServerTests" /> <property name="classes.dir" location="classes"/>
<property name="classes" location="classes" /> <property name="fitnesseRoot" value="FitNesseRoot"/>
<property name="fitnesseRoot" value="FitNesseRoot" /> <property name="results.dir" location="test-results"/>
<property name="results.dir" location="test-results" /> <property name="dist.dir" location="dist"/>
<property name="port" value="8001" /> <property name="javadoc.dir" location="javadoc"/>

<property name="lib.dir" location="lib"/>
<target name="all" depends="unit_tests" description="Run this target any time you change code or acceptance tests. It will clean, then compile the source, run all the unit test and fitnesse acceptance tests." /> <property name="antlib.dir" location="antlib"/>

<property name="port" value="8001"/>
<target name="build" depends="clean, compile" description="clean, then compile the source" />

<target name="all" depends="unit_tests" description="Run this target any time you change code or acceptance tests. It will clean, then compile the source, run all the unit test and fitnesse acceptance tests."/>
<target name="unit_tests" depends="clean, unit_test" description="builds code from scratch, runs all the unit tests" />

<target name="build" depends="clean, compile" description="clean, then compile the source"/>

<target name="unit_tests" depends="clean, unit_test" description="builds code from scratch, runs all the unit tests"/>

<zipfileset id="wikipages.fileset" prefix="Resources/FitNesseRoot" dir="FitNesseRoot"> <zipfileset id="wikipages.fileset" prefix="Resources/FitNesseRoot" dir="FitNesseRoot">
<include name="FitNesse/**" /> <include name="FitNesse/**"/>
<include name="FrontPage/**" /> <include name="FrontPage/**"/>
<include name="PageHeader/**" /> <include name="PageHeader/**"/>
<include name="PageFooter/**" /> <include name="PageFooter/**"/>
<exclude name="**/*.zip" /> <exclude name="**/*.zip"/>
</zipfileset> </zipfileset>


<target name="run" depends="compile, compile-bootstrap-less" description="Start FitNesse from the command line"> <target name="run" depends="compile, compile-bootstrap-less" description="Start FitNesse from the command line">
Expand All @@ -40,10 +42,10 @@
Bundling Bundling
--> -->
<target name="jar" depends="compile, compile-bootstrap-less, createUpdateLists" description="generate the jar file"> <target name="jar" depends="compile, compile-bootstrap-less, createUpdateLists" description="generate the jar file">
<mkdir dir="dist" /> <mkdir dir="${dist.dir}" />
<delete file="dist/fitnesse.jar" /> <delete file="${dist.dir}/fitnesse.jar" />


<jar jarfile="dist/fitnesse.jar" basedir="${classes}"> <jar jarfile="${dist.dir}/fitnesse.jar" basedir="${classes.dir}">
<include name="**/*.class" /> <include name="**/*.class" />
<exclude name="**/*Test.class" /> <exclude name="**/*Test.class" />
<exclude name="**/*TestSuite.class" /> <exclude name="**/*TestSuite.class" />
Expand All @@ -52,7 +54,7 @@
<include name="tasks.properties" /> <include name="tasks.properties" />
<include name="META-INF/FitNesseVersion.txt" /> <include name="META-INF/FitNesseVersion.txt" />


<fileset dir="${classes}" includes="**/SystemUnderTest.class,**/MySystemUnderTest.class" /> <fileset dir="${classes.dir}" includes="**/SystemUnderTest.class,**/MySystemUnderTest.class" />


<zipfileset refid="wikipages.fileset" /> <zipfileset refid="wikipages.fileset" />


Expand All @@ -65,8 +67,8 @@


<target name="standalone-jar" depends="jar" description="generate the standalone jar file"> <target name="standalone-jar" depends="jar" description="generate the standalone jar file">
<ivy:cachefileset setid="standalone.jar.fileset" conf="standalone" /> <ivy:cachefileset setid="standalone.jar.fileset" conf="standalone" />
<jar jarfile="dist/fitnesse-standalone.jar"> <jar jarfile="${dist.dir}/fitnesse-standalone.jar">
<zipfileset src="dist/fitnesse.jar" /> <zipfileset src="${dist.dir}/fitnesse.jar" />
<zipgroupfileset refid="standalone.jar.fileset" /> <zipgroupfileset refid="standalone.jar.fileset" />
<manifest> <manifest>
<attribute name="Built-By" value="Object Mentor, Inc." /> <attribute name="Built-By" value="Object Mentor, Inc." />
Expand All @@ -76,24 +78,24 @@
</target> </target>


<target name="sources-jar" depends="stamp-version"> <target name="sources-jar" depends="stamp-version">
<jar jarfile="dist/fitnesse-sources.jar" basedir="src"> <jar jarfile="${dist.dir}/fitnesse-sources.jar" basedir="src">
<include name="**" /> <include name="**" />
<zipfileset refid="wikipages.fileset" /> <zipfileset refid="wikipages.fileset" />
</jar> </jar>
</target> </target>


<target name="javadoc-jar" depends="compile"> <target name="javadoc-jar" depends="compile">
<mkdir dir="javadoc" /> <mkdir dir="${javadoc.dir}" />
<javadoc sourcepath="src" destdir="javadoc" classpathref="classpath" /> <javadoc sourcepath="${src.dir}" destdir="${javadoc.dir}" classpathref="classpath" />
<jar jarfile="dist/fitnesse-javadoc.jar" basedir="javadoc" /> <jar jarfile="${dist.dir}/fitnesse-javadoc.jar" basedir="${javadoc.dir}" />


</target> </target>


<target name="createUpdateLists" depends="compile" description="creates two lists of files to be updated"> <target name="createUpdateLists" depends="compile" description="creates two lists of files to be updated">
<mkdir dir="${classes}/Resources" /> <mkdir dir="${classes.dir}/Resources" />
<java classpath="${classes}" classname="fitnesse.updates.UpdateFileList" failonerror="true"> <java classpath="${classes.dir}" classname="fitnesse.updates.UpdateFileList" failonerror="true">
<arg value="-baseDirectory:." /> <arg value="-baseDirectory:." />
<arg value="-outputDirectory:${classes}/Resources" /> <arg value="-outputDirectory:${classes.dir}/Resources" />
<arg value="-doNotReplace:FitNesseRoot/FrontPage/content.txt" /> <arg value="-doNotReplace:FitNesseRoot/FrontPage/content.txt" />
<arg value="-doNotReplace:FitNesseRoot/FrontPage/properties.xml" /> <arg value="-doNotReplace:FitNesseRoot/FrontPage/properties.xml" />
<arg value="-doNotReplace:FitNesseRoot/PageHeader/content.txt" /> <arg value="-doNotReplace:FitNesseRoot/PageHeader/content.txt" />
Expand All @@ -108,30 +110,30 @@
</target> </target>


<target name="compile" depends="stamp-version, resolve" description="compile the source (make)"> <target name="compile" depends="stamp-version, resolve" description="compile the source (make)">
<mkdir dir="${classes}" /> <mkdir dir="${classes.dir}" />
<javac srcdir="src" destdir="${classes}" classpathref="classpath" debug="true" source="1.6" target="1.6" includeantruntime="false" /> <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath" debug="true" source="1.6" target="1.6" includeantruntime="false" />
<copy file="extra/ant/tasks.properties" todir="${classes}" /> <copy file="extra/ant/tasks.properties" todir="${classes.dir}" />
<copy todir="${classes}"> <copy todir="${classes.dir}">
<fileset dir="src"> <fileset dir="${src.dir}">
<include name="fitnesse/resources/**" /> <include name="fitnesse/resources/**" />
</fileset> </fileset>
</copy> </copy>
</target> </target>


<uptodate property="bootstrap-css-up-to-date" targetfile="${classes}/fitnesse/resources/bootstrap/css/fitnesse-bootstrap.css" > <uptodate property="bootstrap-css-up-to-date" targetfile="${classes.dir}/fitnesse/resources/bootstrap/css/fitnesse-bootstrap.css" >
<srcfiles dir="." includes="src/fitnesse/resources/bootstrap/less/*.less" /> <srcfiles dir="${basedir}" includes="${src.dir}/fitnesse/resources/bootstrap/less/*.less" />
</uptodate> </uptodate>


<target name="compile-bootstrap-less" depends="ivy-init" description="compile bootstrap less.js scripts" unless="bootstrap-css-up-to-date"> <target name="compile-bootstrap-less" depends="ivy-init" description="compile bootstrap less.js scripts" unless="bootstrap-css-up-to-date">
<mkdir dir="${classes}/fitnesse/resources/bootstrap/css" /> <mkdir dir="${classes.dir}/fitnesse/resources/bootstrap/css" />
<ivy:cachepath pathid="lesscss.classpath" conf="lesscss" /> <ivy:cachepath pathid="lesscss.classpath" conf="lesscss" />
<java classname="org.mozilla.javascript.tools.shell.Main" <java classname="org.mozilla.javascript.tools.shell.Main"
classpathref="lesscss.classpath" classpathref="lesscss.classpath"
failonerror="true" failonerror="true"
fork="true" fork="true"
output="${classes}/fitnesse/resources/bootstrap/css/fitnesse-bootstrap.css"> output="${classes.dir}/fitnesse/resources/bootstrap/css/fitnesse-bootstrap.css">
<arg value="extra/lesscss/less-rhino-1.3.3.js" /> <arg value="extra/lesscss/less-rhino-1.3.3.js" />
<arg value="src/fitnesse/resources/bootstrap/less/fitnesse-bootstrap.less" /> <arg value="${src.dir}/fitnesse/resources/bootstrap/less/fitnesse-bootstrap.less" />
</java> </java>
</target> </target>


Expand All @@ -142,28 +144,28 @@


<target name="stamp-version" depends="set-version-if-not-manualy-set" > <target name="stamp-version" depends="set-version-if-not-manualy-set" >
<echo message="Stamping fitnesse with version ${version}" /> <echo message="Stamping fitnesse with version ${version}" />
<mkdir dir="${classes}/META-INF" /> <mkdir dir="${classes.dir}/META-INF" />
<echo message="v${version}" file="${classes}/META-INF/FitNesseVersion.txt" /> <echo message="v${version}" file="${classes.dir}/META-INF/FitNesseVersion.txt" />
</target> </target>


<target name="clean" description="delete everything in the classes directory"> <target name="clean" description="delete everything in the classes directory">
<delete dir="${classes}" /> <delete dir="${classes.dir}" />
<delete dir="test-results" /> <delete dir="${results.dir}" />
<delete dir="lib" /> <delete dir="${lib.dir}" />
<delete dir="dist" /> <delete dir="${dist.dir}" />
<delete dir="javadoc" /> <delete dir="${javadoc.dir}" />
<delete file="updateList"/> <delete file="updateList"/>
<delete file="updateDoNotCopyOverList"/> <delete file="updateDoNotCopyOverList"/>
</target> </target>


<target name="unit_test" depends="compile" description="run the unit tests"> <target name="unit_test" depends="compile" description="run the unit tests">
<mkdir dir="test-results" /> <mkdir dir="${results.dir}" />
<junit forkmode="once" fork="yes" printsummary="no" haltonfailure="yes" haltonerror="yes" dir="${basedir}"> <junit forkmode="once" fork="yes" printsummary="no" haltonfailure="yes" haltonerror="yes" dir="${basedir}">
<classpath refid="classpath" /> <classpath refid="classpath" />
<formatter type="xml" usefile="true" /> <formatter type="xml" usefile="true" />
<formatter type="plain" usefile="false" /> <formatter type="plain" usefile="false" />
<batchtest todir="test-results"> <batchtest todir="${results.dir}">
<fileset dir="src"> <fileset dir="${src.dir}">
<include name="**/*Test.java" /> <include name="**/*Test.java" />
<exclude name="**/ShutdownResponderTest.java" /> <exclude name="**/ShutdownResponderTest.java" />
<exclude name="**/QueryTableBaseTest.java" /> <exclude name="**/QueryTableBaseTest.java" />
Expand All @@ -186,7 +188,7 @@
<target name="release_jar" depends="unit_tests, jar, standalone-jar, sources-jar, javadoc-jar"/> <target name="release_jar" depends="unit_tests, jar, standalone-jar, sources-jar, javadoc-jar"/>


<target name="acceptance_tests_xml" depends="standalone-jar"> <target name="acceptance_tests_xml" depends="standalone-jar">
<java jar="dist/fitnesse-standalone.jar" failonerror="true" fork="true" output="fitnesse-results.xml"> <java jar="${dist,dir}/fitnesse-standalone.jar" failonerror="true" fork="true" output="fitnesse-results.xml">
<arg value="-c" /> <arg value="-c" />
<arg value="FitNesse.SuiteAcceptanceTests?suite&amp;format=xml" /> <arg value="FitNesse.SuiteAcceptanceTests?suite&amp;format=xml" />
<arg value="-p" /> <arg value="-p" />
Expand All @@ -195,7 +197,7 @@
</target> </target>


<target name="acceptance_tests" depends="standalone-jar"> <target name="acceptance_tests" depends="standalone-jar">
<java jar="dist/fitnesse-standalone.jar" failonerror="true" fork="true"> <java jar="${dist.dir}/fitnesse-standalone.jar" failonerror="true" fork="true">
<arg value="-c" /> <arg value="-c" />
<arg value="FitNesse.SuiteAcceptanceTests?suite&amp;format=text" /> <arg value="FitNesse.SuiteAcceptanceTests?suite&amp;format=text" />
<arg value="-p" /> <arg value="-p" />
Expand All @@ -204,32 +206,31 @@
</target> </target>


<target name="retrieve" depends="resolve" description="Copy dependencies to lib/, mainly for IDE's"> <target name="retrieve" depends="resolve" description="Copy dependencies to lib/, mainly for IDE's">
<ivy:retrieve pattern="lib/[artifact].[ext]" /> <ivy:retrieve pattern="${lib.dir}/[artifact].[ext]" />
</target> </target>


<target name="resolve" depends="ivy-init"> <target name="resolve" depends="ivy-init">
<ivy:resolve /> <ivy:resolve />
<ivy:cachepath pathid="lib.classpath" /> <ivy:cachepath pathid="lib.classpath" />
<path id="classpath"> <path id="classpath">
<pathelement path="${classes}" /> <pathelement path="${classes.dir}" />
<path refid="lib.classpath" /> <path refid="lib.classpath" />
</path> </path>
</target> </target>


<target name="pom" depends="resolve,set-version-if-not-manualy-set"> <target name="pom" depends="resolve,set-version-if-not-manualy-set">
<ivy:deliver deliverpattern="dist/ivy.xml" pubrevision="${version}" status="release" /> <ivy:deliver deliverpattern="${dist.dir}/ivy.xml" pubrevision="${version}" status="release" />
<ivy:makepom ivyfile="${basedir}/dist/ivy.xml" templatefile="templates/pom.xml.template" pomfile="${basedir}/dist/fitnesse.pom" conf="standalone,default,test"> <ivy:makepom ivyfile="${dist.dir}/ivy.xml" templatefile="templates/pom.xml.template" pomfile="${dist.dir}/fitnesse.pom" conf="standalone,default,test">
<mapping conf="default" scope="compile"/> <mapping conf="standalone" scope="compile" />
<mapping conf="standalone" scope="runtime"/> <mapping conf="test" scope="test" />
<mapping conf="test" scope="test"/>
</ivy:makepom> </ivy:makepom>
</target> </target>


<target name="snapshot" depends="resolve,pom"> <target name="snapshot" depends="resolve,pom">
<ivy:publish resolver="sonatype-nexus-snapshots" <ivy:publish resolver="sonatype-nexus-snapshots"
pubrevision="${version}" pubrevision="${version}"
publishivy="false"> publishivy="false">
<artifacts pattern="dist/[artifact](-[classifier]).[ext]" /> <artifacts pattern="${dist.dir}/[artifact](-[classifier]).[ext]" />
</ivy:publish> </ivy:publish>
</target> </target>


Expand All @@ -244,7 +245,7 @@
publishivy="false" publishivy="false"
settingsref="ivy.publish.instance" settingsref="ivy.publish.instance"
overwrite="true"> overwrite="true">
<artifacts pattern="dist/[artifact](-[classifier]).[ext]" /> <artifacts pattern="${dist.dir}/[artifact](-[classifier]).[ext]" />
</ivy:publish> </ivy:publish>
</target> </target>


Expand All @@ -253,9 +254,9 @@
--> -->
<property name="maven.central.url" value="http://repo2.maven.org/maven2" /> <property name="maven.central.url" value="http://repo2.maven.org/maven2" />


<available file="antlib/ivy.jar" type="file" property="have.ivy.jar"/> <available file="${antlib.dir}/ivy.jar" type="file" property="have.ivy.jar"/>
<available file="antlib/bcprov.jar" type="file" property="have.bcprov.jar"/> <available file="${antlib.dir}/bcprov.jar" type="file" property="have.bcprov.jar"/>
<available file="antlib/bcpg.jar" type="file" property="have.bcpg.jar"/> <available file="${antlib.dir}/bcpg.jar" type="file" property="have.bcpg.jar"/>


<condition property="ivy.download.not.required"> <condition property="ivy.download.not.required">
<and> <and>
Expand All @@ -267,7 +268,7 @@


<target name="ivy-init" depends="ivy-download"> <target name="ivy-init" depends="ivy-download">
<path id="ivy.class.path"> <path id="ivy.class.path">
<fileset dir="antlib"> <fileset dir="${antlib.dir}">
<include name="*.jar"/> <include name="*.jar"/>
</fileset> </fileset>
</path> </path>
Expand All @@ -277,11 +278,11 @@
</target> </target>


<target name="ivy-download" unless="ivy.download.not.required"> <target name="ivy-download" unless="ivy.download.not.required">
<mkdir dir="antlib" /> <mkdir dir="${antlib.dir}" />
<get src="${maven.central.url}/org/apache/ivy/ivy/2.3.0-rc1/ivy-2.3.0-rc1.jar" dest="antlib/ivy.jar" usetimestamp="true" verbose="true" /> <get src="${maven.central.url}/org/apache/ivy/ivy/2.3.0/ivy-2.3.0.jar" dest="${antlib.dir}/ivy.jar" usetimestamp="true" verbose="true" />
<!-- The following libs are used for signing artifacts <!-- The following libs are used for signing artifacts
when deployed to Maven Central. --> when deployed to Maven Central. -->
<get src="${maven.central.url}/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar" dest="antlib/bcprov.jar" usetimestamp="true" verbose="true" /> <get src="${maven.central.url}/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar" dest="${antlib.dir}/bcprov.jar" usetimestamp="true" verbose="true" />
<get src="${maven.central.url}/org/bouncycastle/bcpg-jdk16/1.46/bcpg-jdk16-1.46.jar" dest="antlib/bcpg.jar" usetimestamp="true" verbose="true" /> <get src="${maven.central.url}/org/bouncycastle/bcpg-jdk16/1.46/bcpg-jdk16-1.46.jar" dest="${antlib.dir}/bcpg.jar" usetimestamp="true" verbose="true" />
</target> </target>
</project> </project>

0 comments on commit c246f97

Please sign in to comment.