Skip to content

Corrected the jar task in the build.xml that Strongback uses to build projects #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhauch merged 2 commits into from
Dec 10, 2015
Merged

Corrected the jar task in the build.xml that Strongback uses to build projects #50

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daf763b
Corrected the jar task in the build.xml that Strongback uses to build…
rhauch Dec 10, 2015
7bc54a7
Reformatted the build.xml to remove tabs.
rhauch Dec 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 63 additions & 64 deletions ant/strongback/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="Strongback Deployment">
<property name="resources.dir" value="resources"/>
<property name="test.resources.dir" value="testresources"/>
<property name="test.source.dir" value="testsrc"/>
<property name="test.output.dir" value="tests"/>
<property name="test.report.dir" value="${test.output.dir}/classes"/>
<property name="test.target.dir" value="${test.output.dir}/classes"/>
<property file="${user.home}/wpilib/wpilib.properties"/>
<property file="${user.home}/wpilib/java/${version}/ant/build.properties"/>
<property file="${user.home}/strongback/java/ant/build.properties"/>
<property name="resources.dir" value="resources" />
<property name="test.resources.dir" value="testresources" />
<property name="test.source.dir" value="testsrc" />
<property name="test.output.dir" value="tests" />
<property name="test.report.dir" value="${test.output.dir}/classes" />
<property name="test.target.dir" value="${test.output.dir}/classes" />
<property file="${user.home}/wpilib/wpilib.properties" />
<property file="${user.home}/wpilib/java/${version}/ant/build.properties" />
<property file="${user.home}/strongback/java/ant/build.properties" />

<import file="${wpilib.ant.dir}/build.xml"/>
<import file="${wpilib.ant.dir}/build.xml" />

<!-- Define the classpaths -->
<path id="compile.classpath">
<fileset dir="${strongback.home}/java/lib" includes="**/*.jar" excludes="**/*-sources.jar"/>
<fileset dir="${user.home}/wpilib/java/${version}/lib" includes="**/*.jar" excludes="**/*-sources.jar"/>
<fileset dir="${strongback.home}/java/lib" includes="**/*.jar" excludes="**/*-sources.jar" />
<fileset dir="${user.home}/wpilib/java/${version}/lib" includes="**/*.jar" excludes="**/*-sources.jar" />
<pathelement path="${classpath}" />
</path>

<!-- Define a classpath for unit testing -->
<path id="junit.classpath">
<fileset dir="${strongback.home}/java/lib" includes="**/*.jar" excludes="**/*-sources.jar"/>
<fileset dir="${strongback.home}/java/lib-tests" includes="**/*.jar" excludes="**/*-sources.jar"/>
<fileset dir="${strongback.home}/java/lib" includes="**/*.jar" excludes="**/*-sources.jar" />
<fileset dir="${strongback.home}/java/lib-tests" includes="**/*.jar" excludes="**/*-sources.jar" />
<pathelement location="${build.dir}" />
<pathelement path="${classpath}" />
</path>
Expand All @@ -34,54 +34,53 @@

<!-- Deletes the directories used by the tests-->
<target name="clean" depends="clean-tests" description="Clean up all generated files">
<ant antfile="${wpilib.ant.dir}/build.xml" target="clean"/>
<ant antfile="${wpilib.ant.dir}/build.xml" target="clean" />
</target>

<target name="compile" description="Compile the source code.">
<mkdir dir="${build.dir}"/>
<javac srcdir="${src.dir}" destdir="${build.dir}" includeantruntime="false">
<classpath refid="compile.classpath"/>
</javac>
<target name="compile" description="Compile the source code.">
<mkdir dir="${build.dir}" />
<javac srcdir="${src.dir}" destdir="${build.dir}" includeantruntime="false">
<classpath refid="compile.classpath" />
</javac>
<copy todir="${build.dir}">
<fileset dir="${src.dir}" includes="**/*.xml,**/*.properties,**/*.txt,**/*.ico" />
</copy>
<copy todir="${build.dir}" failonerror="false" quiet="true">
<fileset dir="${resources.dir}"/>
<fileset dir="${resources.dir}" />
</copy>
</target>
</target>

<target name="jar" depends="compile">
<echo>Making jar ${dist.jar}.</echo>
<mkdir dir="${dist.dir}" />
<mkdir dir="${build.jars}" />
<target name="jar" depends="compile">
<echo>Making jar ${dist.jar}.</echo>
<mkdir dir="${dist.dir}" />
<mkdir dir="${build.jars}" />

<jar destfile="${dist.jar}" update="false">
<manifest>
<attribute name="Main-Class" value="edu.wpi.first.wpilibj.RobotBase"/>
<attribute name="Robot-Class" value="${robot.class}"/>
<attribute name="Class-Path" value="."/>
</manifest>
<echo>Copying jars from ${strongback.classpath} to ${build.jars}.</echo>
<copy todir="${build.jars}" flatten="true">
<path>
<pathelement path="${strongback.classpath}" />
</path>
</copy>

<fileset dir="${build.dir}" includes="**/*.class"/>
<jar destfile="${dist.jar}" update="false">
<manifest>
<attribute name="Main-Class" value="edu.wpi.first.wpilibj.RobotBase" />
<attribute name="Robot-Class" value="${robot.class}" />
<attribute name="Class-Path" value="." />
</manifest>

<zipgroupfileset dir="${build.jars}">
<include name="**/*.jar" />
</zipgroupfileset>
</jar>
<fileset dir="${build.dir}" includes="**/*.class" />

<echo>Copying jars from ${strongback.classpath} to ${build.jars}.</echo>
<copy todir="${build.jars}" flatten="true">
<file file="${dist.jar}"/>
<path>
<pathelement path="${strongback.classpath}"/>
</path>
</copy>
</target>
<zipgroupfileset dir="${build.jars}">
<include name="**/*.jar" />
</zipgroupfileset>
</jar>
</target>

<!-- Check if there are any JUnit Tests -->
<target name="if-tests">
<condition property="tests-exists">
<available file="testsrc" type="dir"/>
<available file="testsrc" type="dir" />
</condition>
</target>

Expand All @@ -95,30 +94,30 @@
<fileset dir="${test.source.dir}" includes="**/*.xml,**/*.properties,**/*.txt,**/*.ico" />
</copy>
<copy todir="${test.target.dir}" failonerror="false" quiet="true">
<fileset dir="${test.resources.dir}"/>
<fileset dir="${test.resources.dir}" />
</copy>
</target>

<!-- Run the JUnit Tests -->
<target name="test" depends="compile-tests, if-tests" if="tests-exists" description="Run the unit tests">
<!-- Creates the directories used in the tests -->
<mkdir dir="${test.target.dir}" />
<mkdir dir="${test.report.dir}" />
<echo>[run-tests] Running all unit tests...</echo>
<junit printsummary="off" showOutput="false" fork="false" haltonfailure="no" failureproperty="test.failed" >
<classpath refid="junit.classpath" />
<classpath>
<pathelement location="${test.target.dir}"/>
</classpath>
<formatter type="plain" usefile="false" /> <!-- to screen -->
<batchtest todir="${test.report.dir}">
<fileset dir="${test.source.dir}">
<include name="**/*Test*.java" />
<include name="**/Test*.java" />
<exclude name="**/Abstract*.java" />
</fileset>
</batchtest>
</junit>
<mkdir dir="${test.target.dir}" />
<mkdir dir="${test.report.dir}" />
<echo>[run-tests] Running all unit tests...</echo>
<junit printsummary="off" showOutput="false" fork="false" haltonfailure="no" failureproperty="test.failed">
<classpath refid="junit.classpath" />
<classpath>
<pathelement location="${test.target.dir}" />
</classpath>
<formatter type="plain" usefile="false" /> <!-- to screen -->
<batchtest todir="${test.report.dir}">
<fileset dir="${test.source.dir}">
<include name="**/*Test*.java" />
<include name="**/Test*.java" />
<exclude name="**/Abstract*.java" />
</fileset>
</batchtest>
</junit>
<fail message="Test failure detected, check test results." if="test.failed" />
</target>

Expand Down