Skip to content

Commit

Permalink
Added build.xml driver in root directory. Moved a few files around to…
Browse files Browse the repository at this point in the history
… support

unittest.
  • Loading branch information
kruland2607 committed Sep 30, 2013
1 parent 5e27ea5 commit d692288
Show file tree
Hide file tree
Showing 18 changed files with 143 additions and 63 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@
/core/resources-src/pix/sormus.xcf.gz
/core/resources-src/pix/splashscreen-sormus.png
/core/resources-src/pix/splashscreen-sormus.xcf.gz

/swing/build
/swing/tmp
91 changes: 91 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<project name="OpenRocket" basedir="." default="jar">

<target name="clean">
<ant dir="core" target="clean"/>
<ant dir="swing" target="clean"/>
</target>

<target name="build">
<ant dir="core" target="build"/>
<ant dir="swing" target="build"/>
</target>

<target name="jar">
<ant dir="core" target="jar"/>
<ant dir="swing" target="jar"/>
</target>


<target name="unittest" depends="jar">
<ant dir="core" target="unittest"/>
<ant dir="swing" target="unittest"/>
</target>

<!-- CHECK -->
<target name="check" depends="checktodo,checkascii"/>

<!-- CHECK TODOs -->
<target name="todo" depends="checktodo"/>
<target name="checktodo">
<tempfile property="todo.file" prefix="checktodo-" destDir="${basedir}"/>
<echo>Checking project for FIXMEs.</echo>
<concat destfile="${todo.file}">
<fileset dir="core/src">
<include name="**/*.java"/>
</fileset>
<fileset dir="core/test">
<include name="**/*.java"/>
</fileset>
<fileset dir="swing/src">
<include name="**/*.java"/>
</fileset>
<fileset dir="swing/test">
<include name="**/*.java"/>
</fileset>
<filterchain>
<linecontainsregexp>
<regexp pattern="(FIXME|TODO:.*CRITICAL)"/>
</linecontainsregexp>
</filterchain>
</concat>
<loadfile srcfile="${todo.file}" property="criticaltodos"/>
<delete file="${todo.file}"/>
<fail if="criticaltodos">CRITICAL TODOs exist in project:
${criticaltodos}</fail>
<echo>No critical TODOs in project.</echo>
</target>


<!-- CHECK ASCII -->
<target name="ascii" depends="checkascii"/>
<target name="checkascii">
<tempfile property="ascii.file" prefix="checkascii-" destDir="${basedir}"/>
<echo>Checking project for non-ASCII characters.</echo>
<concat destfile="${ascii.file}">
<fileset dir="core/src">
<include name="**/*.java"/>
</fileset>
<fileset dir="core/test">
<include name="**/*.java"/>
</fileset>
<fileset dir="swing/src">
<include name="**/*.java"/>
</fileset>
<fileset dir="swing/test">
<include name="**/*.java"/>
</fileset>
<filterchain>
<linecontainsregexp>
<regexp pattern="\P{ASCII}"/>
</linecontainsregexp>
</filterchain>
</concat>
<loadfile srcfile="${ascii.file}" property="nonascii"/>
<delete file="${ascii.file}"/>
<fail if="nonascii">Non-ASCII characters exist in project:
${nonascii}</fail>
<echo>No non-ASCII characters in project.</echo>
</target>


</project>
2 changes: 1 addition & 1 deletion core/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<classpathentry kind="lib" path="lib/javax.inject.jar"/>
<classpathentry kind="lib" path="lib/aopalliance.jar"/>
<classpathentry kind="lib" path="lib-test/test-plugin.jar"/>
<classpathentry kind="lib" path="lib/annotation-detector-3.0.2-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.5.jar"/>
<classpathentry kind="lib" path="lib/annotation-detector-3.0.2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
59 changes: 2 additions & 57 deletions core/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<property name="build.dir" value="${basedir}/build"/> <!-- Build directory -->
<property name="build-test.dir" value="${basedir}/build/test"/> <!-- Build directory -->
<property name="lib.dir" value="${basedir}/lib"/> <!-- Library source directory -->
<property name="libtest.dir" value="${basedir}/lib-test"/> <!-- Library test source directory -->
<property name="libtest.dir" value="${basedir}/../lib-test"/> <!-- Library test source directory -->
<property name="libextra.dir" value="${basedir}/lib-extra"/> <!-- Library extra source directory -->
<property name="tmp.dir" value="${basedir}/tmp"/> <!-- Temporary directory -->
<property name="resources.dir" value="${basedir}/resources"/> <!-- Resources directory -->
Expand Down Expand Up @@ -84,61 +84,6 @@
</target>


<!-- CHECK -->
<target name="check" depends="checktodo,checkascii"/>

<!-- CHECK TODOs -->
<target name="todo" depends="checktodo"/>
<target name="checktodo">
<tempfile property="todo.file" prefix="checktodo-" destDir="${tmp.dir}"/>
<echo>Checking project for FIXMEs.</echo>
<concat destfile="${todo.file}">
<fileset dir="${src.dir}">
<include name="**/*.java"/>
</fileset>
<fileset dir="${src-test.dir}">
<include name="**/*.java"/>
</fileset>
<filterchain>
<linecontainsregexp>
<regexp pattern="(FIXME|TODO:.*CRITICAL)"/>
</linecontainsregexp>
</filterchain>
</concat>
<loadfile srcfile="${todo.file}" property="criticaltodos"/>
<delete file="${todo.file}"/>
<fail if="criticaltodos">CRITICAL TODOs exist in project:
${criticaltodos}</fail>
<echo>No critical TODOs in project.</echo>
</target>


<!-- CHECK ASCII -->
<target name="ascii" depends="checkascii"/>
<target name="checkascii">
<tempfile property="ascii.file" prefix="checkascii-" destDir="${tmp.dir}"/>
<echo>Checking project for non-ASCII characters.</echo>
<concat destfile="${ascii.file}">
<fileset dir="${src.dir}">
<include name="**/*.java"/>
</fileset>
<fileset dir="${src-test.dir}">
<include name="**/*.java"/>
</fileset>
<filterchain>
<linecontainsregexp>
<regexp pattern="\P{ASCII}"/>
</linecontainsregexp>
</filterchain>
</concat>
<loadfile srcfile="${ascii.file}" property="nonascii"/>
<delete file="${ascii.file}"/>
<fail if="nonascii">Non-ASCII characters exist in project:
${nonascii}</fail>
<echo>No non-ASCII characters in project.</echo>
</target>


<!-- Unit tests -->
<target name="unittest" description="Execute unit tests" depends="build">
<echo>Building unit tests</echo>
Expand All @@ -147,7 +92,7 @@ ${nonascii}</fail>

<echo>Running unit tests</echo>
<mkdir dir="${tmp.dir}/rawtestoutput"/>
<junit fork="yes" forkmode="once" printsummary="false" failureproperty="junit.failure">
<junit fork="yes" forkmode="once" printsummary="false" failureproperty="junit.failure" dir="${basedir}">
<classpath>
<path refid="test-classpath"/>
<path location="${basedir}"/>
Expand Down
Binary file removed core/lib/annotation-detector-3.0.2-SNAPSHOT.jar
Binary file not shown.
Binary file added core/lib/annotation-detector-3.0.2.jar
Binary file not shown.
Binary file added lib-ant/ant-contrib-1.0b3.jar
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion swing/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<classpathentry kind="lib" path="lib/jogl/gluegen-rt.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/OpenRocket Core"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/slf4j-api-1.7.5.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/annotation-detector-3.0.2-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/aopalliance.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/guice-3.0.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/guice-multibindings-3.0.jar"/>
Expand All @@ -21,5 +20,6 @@
<classpathentry kind="lib" path="lib/logback-core-1.0.12.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/resources"/>
<classpathentry kind="lib" path="resources"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/annotation-detector-3.0.2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
9 changes: 5 additions & 4 deletions swing/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<property name="build.dir" value="${basedir}/build"/> <!-- Build directory -->
<property name="build-test.dir" value="${basedir}/build/test"/> <!-- Build directory -->
<property name="lib.dir" value="${basedir}/lib"/> <!-- Library source directory -->
<property name="libtest.dir" value="${basedir}/lib-test"/> <!-- Library test source directory -->
<property name="libextra.dir" value="${basedir}/lib-extra"/> <!-- Library extra source directory -->
<property name="libtest.dir" value="${basedir}/../lib-test"/> <!-- Library test source directory -->
<property name="libant.dir" value="${basedir}/../lib-ant"/> <!-- Library ant source directory -->
<property name="tmp.dir" value="${basedir}/tmp"/> <!-- Temporary directory -->
<property name="resources.dir" value="${basedir}/resources"/> <!-- Resources directory -->
<property name="resources-src.dir" value="${basedir}/resources-src"/>
Expand Down Expand Up @@ -45,6 +45,7 @@
<pathelement location="${classes.dir}"/>
<pathelement location="${src-test.dir}"/>
<fileset dir="${libtest.dir}/" includes="*.jar"/>
<pathelement location="../core/build/test"/>
</path>

<path id="run-classpath">
Expand All @@ -56,7 +57,7 @@
<!-- Add Ant-contrib tasks so we can use for loop -->
<taskdef resource="net/sf/antcontrib/antlib.xml">
<classpath>
<pathelement location="${libextra.dir}/ant-contrib-1.0b3.jar"/>
<pathelement location="${libant.dir}/ant-contrib-1.0b3.jar"/>
</classpath>
</taskdef>

Expand Down Expand Up @@ -103,7 +104,7 @@
<zipfileset src="${lib.dir}/miglayout15-swing.jar"/>
<zipfileset src="${core.dir}/lib/opencsv-2.3.jar"/>
<zipfileset src="${lib.dir}/OrangeExtensions-1.2.jar"/>
<zipfileset src="${core.dir}/lib/annotation-detector-3.0.2-SNAPSHOT.jar"/>
<zipfileset src="${core.dir}/lib/annotation-detector-3.0.2.jar"/>
<zipfileset src="${core.dir}/lib/slf4j-api-1.7.5.jar"/>
<zipfileset src="${lib.dir}/logback-classic-1.0.12.jar"/>
<zipfileset src="${lib.dir}/logback-core-1.0.12.jar"/>
Expand Down
40 changes: 40 additions & 0 deletions swing/test/net/sf/openrocket/Estes_A8.rse
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<engine-database>
<engine-list>
<engine FDiv="10" FFix="1" FStep="-1." Isp="71.7" Itot="2.32" Type="single-use" auto-calc-cg="1" auto-calc-mass="1" avgThrust="3.178" burn-time="0.73" cgDiv="10" cgFix="1" cgStep="-1." code="A8" delays="3,5" dia="18." exitDia="0." initWt="16.35" len="70." mDiv="10" mFix="1" mStep="-1." massFrac="20.18" mfg="Estes" peakThrust="9.73" propWt="3.3" tDiv="10" tFix="1" tStep="-1." throatDia="0.">
<comments>Estes A8 RASP.ENG file made from NAR published data
File produced October 3, 2000
The total impulse, peak thrust, average thrust and burn time are
the same as the averaged static test data on the NAR web site in
the certification file. The curve drawn with these data points is as
close to the certification curve as can be with such a limited
number of points (32) allowed with wRASP up to v1.6.
</comments>
<data>
<eng-data cg="35." f="0." m="3.3" t="0."/>
<eng-data cg="35." f="0.512" m="3.28507" t="0.041"/>
<eng-data cg="35." f="2.115" m="3.20474" t="0.084"/>
<eng-data cg="35." f="4.358" m="3.0068" t="0.127"/>
<eng-data cg="35." f="6.794" m="2.6975" t="0.166"/>
<eng-data cg="35." f="8.588" m="2.41309" t="0.192"/>
<eng-data cg="35." f="9.294" m="2.23506" t="0.206"/>
<eng-data cg="35." f="9.73" m="1.96448" t="0.226"/>
<eng-data cg="35." f="8.845" m="1.83238" t="0.236"/>
<eng-data cg="35." f="7.179" m="1.70703" t="0.247"/>
<eng-data cg="35." f="5.063" m="1.58515" t="0.261"/>
<eng-data cg="35." f="3.717" m="1.48525" t="0.277"/>
<eng-data cg="35." f="3.205" m="1.3425" t="0.306"/>
<eng-data cg="35." f="2.884" m="1.14764" t="0.351"/>
<eng-data cg="35." f="2.499" m="0.94092" t="0.405"/>
<eng-data cg="35." f="2.371" m="0.726196" t="0.467"/>
<eng-data cg="35." f="2.307" m="0.509957" t="0.532"/>
<eng-data cg="35." f="2.371" m="0.320333" t="0.589"/>
<eng-data cg="35." f="2.371" m="0.175326" t="0.632"/>
<eng-data cg="35." f="2.243" m="0.109701" t="0.652"/>
<eng-data cg="35." f="1.794" m="0.0637665" t="0.668"/>
<eng-data cg="35." f="1.153" m="0.0302344" t="0.684"/>
<eng-data cg="35." f="0.448" m="0.00860204" t="0.703"/>
<eng-data cg="35." f="0." m="0." t="0.73"/>
</data>
</engine>
</engine-list>
</engine-database>

0 comments on commit d692288

Please sign in to comment.