Merge remote-tracking branch 'upstream/13.09dev' into feature-motorfilter
This commit is contained in:
commit
fbc7cf69f5
172
build.xml
172
build.xml
@ -1,91 +1,121 @@
|
|||||||
<project name="OpenRocket" basedir="." default="jar">
|
<project name="OpenRocket" basedir="." default="jar">
|
||||||
|
|
||||||
<target name="clean">
|
<!-- CLEAN -->
|
||||||
|
|
||||||
|
<target name="clean" depends="clean-core, clean-swing">
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="clean-core">
|
||||||
<ant dir="core" target="clean"/>
|
<ant dir="core" target="clean"/>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="clean-swing">
|
||||||
<ant dir="swing" target="clean"/>
|
<ant dir="swing" target="clean"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="build">
|
|
||||||
|
<!-- BUILD -->
|
||||||
|
|
||||||
|
<target name="build" depends="build-core, build-swing">
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="build-core">
|
||||||
<ant dir="core" target="build"/>
|
<ant dir="core" target="build"/>
|
||||||
<ant dir="swing" target="build"/>
|
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="jar">
|
<target name="build-swing" depends="jar-core">
|
||||||
|
<ant dir="swing" target="build"/>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<!-- JAR -->
|
||||||
|
|
||||||
|
<target name="jar" depends="jar-core,jar-swing">
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="jar-core" depends="build-core">
|
||||||
<ant dir="core" target="jar"/>
|
<ant dir="core" target="jar"/>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="jar-swing" depends="build-swing">
|
||||||
<ant dir="swing" target="jar"/>
|
<ant dir="swing" target="jar"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
<!-- TEST -->
|
||||||
|
|
||||||
<target name="unittest" depends="jar">
|
<target name="unittest" depends="unittest-core, unittest-swing">
|
||||||
<ant dir="core" target="unittest"/>
|
|
||||||
<ant dir="swing" target="unittest"/>
|
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<!-- CHECK -->
|
<target name="unittest-core" depends="jar-core">
|
||||||
<target name="check" depends="checktodo,checkascii"/>
|
<ant dir="core" target="unittest" inheritAll="false" />
|
||||||
|
</target>
|
||||||
|
|
||||||
<!-- CHECK TODOs -->
|
<target name="unittest-swing" depends="jar-swing">
|
||||||
<target name="todo" depends="checktodo"/>
|
<ant dir="swing" target="unittest" inheritAll="false" />
|
||||||
<target name="checktodo">
|
</target>
|
||||||
<tempfile property="todo.file" prefix="checktodo-" destDir="${basedir}"/>
|
|
||||||
<echo>Checking project for FIXMEs.</echo>
|
<!-- CHECK -->
|
||||||
<concat destfile="${todo.file}">
|
<target name="check" depends="checktodo,checkascii"/>
|
||||||
<fileset dir="core/src">
|
|
||||||
<include name="**/*.java"/>
|
<!-- CHECK TODOs -->
|
||||||
</fileset>
|
<target name="todo" depends="checktodo"/>
|
||||||
<fileset dir="core/test">
|
<target name="checktodo">
|
||||||
<include name="**/*.java"/>
|
<tempfile property="todo.file" prefix="checktodo-" destDir="${basedir}"/>
|
||||||
</fileset>
|
<echo>Checking project for FIXMEs.</echo>
|
||||||
<fileset dir="swing/src">
|
<concat destfile="${todo.file}">
|
||||||
<include name="**/*.java"/>
|
<fileset dir="core/src">
|
||||||
</fileset>
|
<include name="**/*.java"/>
|
||||||
<fileset dir="swing/test">
|
</fileset>
|
||||||
<include name="**/*.java"/>
|
<fileset dir="core/test">
|
||||||
</fileset>
|
<include name="**/*.java"/>
|
||||||
<filterchain>
|
</fileset>
|
||||||
<linecontainsregexp>
|
<fileset dir="swing/src">
|
||||||
<regexp pattern="(FIXME|TODO:.*CRITICAL)"/>
|
<include name="**/*.java"/>
|
||||||
</linecontainsregexp>
|
</fileset>
|
||||||
</filterchain>
|
<fileset dir="swing/test">
|
||||||
</concat>
|
<include name="**/*.java"/>
|
||||||
<loadfile srcfile="${todo.file}" property="criticaltodos"/>
|
</fileset>
|
||||||
<delete file="${todo.file}"/>
|
<filterchain>
|
||||||
<fail if="criticaltodos">CRITICAL TODOs exist in project:
|
<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>
|
${criticaltodos}</fail>
|
||||||
<echo>No critical TODOs in project.</echo>
|
<echo>No critical TODOs in project.</echo>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
<!-- CHECK ASCII -->
|
||||||
<!-- CHECK ASCII -->
|
<target name="ascii" depends="checkascii"/>
|
||||||
<target name="ascii" depends="checkascii"/>
|
<target name="checkascii">
|
||||||
<target name="checkascii">
|
<tempfile property="ascii.file" prefix="checkascii-" destDir="${basedir}"/>
|
||||||
<tempfile property="ascii.file" prefix="checkascii-" destDir="${basedir}"/>
|
<echo>Checking project for non-ASCII characters.</echo>
|
||||||
<echo>Checking project for non-ASCII characters.</echo>
|
<concat destfile="${ascii.file}">
|
||||||
<concat destfile="${ascii.file}">
|
<fileset dir="core/src">
|
||||||
<fileset dir="core/src">
|
<include name="**/*.java"/>
|
||||||
<include name="**/*.java"/>
|
</fileset>
|
||||||
</fileset>
|
<fileset dir="core/test">
|
||||||
<fileset dir="core/test">
|
<include name="**/*.java"/>
|
||||||
<include name="**/*.java"/>
|
</fileset>
|
||||||
</fileset>
|
<fileset dir="swing/src">
|
||||||
<fileset dir="swing/src">
|
<include name="**/*.java"/>
|
||||||
<include name="**/*.java"/>
|
</fileset>
|
||||||
</fileset>
|
<fileset dir="swing/test">
|
||||||
<fileset dir="swing/test">
|
<include name="**/*.java"/>
|
||||||
<include name="**/*.java"/>
|
</fileset>
|
||||||
</fileset>
|
<filterchain>
|
||||||
<filterchain>
|
<linecontainsregexp>
|
||||||
<linecontainsregexp>
|
<regexp pattern="\P{ASCII}"/>
|
||||||
<regexp pattern="\P{ASCII}"/>
|
</linecontainsregexp>
|
||||||
</linecontainsregexp>
|
</filterchain>
|
||||||
</filterchain>
|
</concat>
|
||||||
</concat>
|
<loadfile srcfile="${ascii.file}" property="nonascii"/>
|
||||||
<loadfile srcfile="${ascii.file}" property="nonascii"/>
|
<delete file="${ascii.file}"/>
|
||||||
<delete file="${ascii.file}"/>
|
<fail if="nonascii">Non-ASCII characters exist in project:
|
||||||
<fail if="nonascii">Non-ASCII characters exist in project:
|
|
||||||
${nonascii}</fail>
|
${nonascii}</fail>
|
||||||
<echo>No non-ASCII characters in project.</echo>
|
<echo>No non-ASCII characters in project.</echo>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user