Skip to content

Commit 71e3e76

Browse files
soupwizardsoupwizard
committed
Swing build depends on core jar already being built, added that dependency.
1 parent 393850a commit 71e3e76

File tree

1 file changed

+100
-70
lines changed

1 file changed

+100
-70
lines changed

‎build.xml

+100-70
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,121 @@
11
<project name="OpenRocket" basedir="." default="jar">
22

3-
<target name="clean">
3+
<!-- CLEAN -->
4+
5+
<target name="clean" depends="clean-core, clean-swing">
6+
</target>
7+
8+
<target name="clean-core">
49
<ant dir="core" target="clean"/>
10+
</target>
11+
12+
<target name="clean-swing">
513
<ant dir="swing" target="clean"/>
614
</target>
715

8-
<target name="build">
16+
17+
<!-- BUILD -->
18+
19+
<target name="build" depends="build-core, build-swing">
20+
</target>
21+
22+
<target name="build-core">
923
<ant dir="core" target="build"/>
10-
<ant dir="swing" target="build"/>
1124
</target>
1225

13-
<target name="jar">
14-
<ant dir="core" target="jar"/>
15-
<ant dir="swing" target="jar"/>
26+
<target name="build-swing" depends="jar-core">
27+
<ant dir="swing" target="build"/>
1628
</target>
1729

30+
<!-- JAR -->
1831

19-
<target name="unittest" depends="jar">
20-
<ant dir="core" target="unittest"/>
21-
<ant dir="swing" target="unittest"/>
32+
<target name="jar" depends="jar-core,jar-swing">
2233
</target>
2334

24-
<!-- CHECK -->
25-
<target name="check" depends="checktodo,checkascii"/>
26-
27-
<!-- CHECK TODOs -->
28-
<target name="todo" depends="checktodo"/>
29-
<target name="checktodo">
30-
<tempfile property="todo.file" prefix="checktodo-" destDir="${basedir}"/>
31-
<echo>Checking project for FIXMEs.</echo>
32-
<concat destfile="${todo.file}">
33-
<fileset dir="core/src">
34-
<include name="**/*.java"/>
35-
</fileset>
36-
<fileset dir="core/test">
37-
<include name="**/*.java"/>
38-
</fileset>
39-
<fileset dir="swing/src">
40-
<include name="**/*.java"/>
41-
</fileset>
42-
<fileset dir="swing/test">
43-
<include name="**/*.java"/>
44-
</fileset>
45-
<filterchain>
46-
<linecontainsregexp>
47-
<regexp pattern="(FIXME|TODO:.*CRITICAL)"/>
48-
</linecontainsregexp>
49-
</filterchain>
50-
</concat>
51-
<loadfile srcfile="${todo.file}" property="criticaltodos"/>
52-
<delete file="${todo.file}"/>
53-
<fail if="criticaltodos">CRITICAL TODOs exist in project:
54-
${criticaltodos}</fail>
55-
<echo>No critical TODOs in project.</echo>
35+
<target name="jar-core" depends="build-core">
36+
<ant dir="core" target="jar"/>
5637
</target>
5738

39+
<target name="jar-swing" depends="build-swing">
40+
<ant dir="swing" target="jar"/>
41+
</target>
42+
43+
<!-- TEST -->
5844

59-
<!-- CHECK ASCII -->
60-
<target name="ascii" depends="checkascii"/>
61-
<target name="checkascii">
62-
<tempfile property="ascii.file" prefix="checkascii-" destDir="${basedir}"/>
63-
<echo>Checking project for non-ASCII characters.</echo>
64-
<concat destfile="${ascii.file}">
65-
<fileset dir="core/src">
66-
<include name="**/*.java"/>
67-
</fileset>
68-
<fileset dir="core/test">
69-
<include name="**/*.java"/>
70-
</fileset>
71-
<fileset dir="swing/src">
72-
<include name="**/*.java"/>
73-
</fileset>
74-
<fileset dir="swing/test">
75-
<include name="**/*.java"/>
76-
</fileset>
77-
<filterchain>
78-
<linecontainsregexp>
79-
<regexp pattern="\P{ASCII}"/>
80-
</linecontainsregexp>
81-
</filterchain>
82-
</concat>
83-
<loadfile srcfile="${ascii.file}" property="nonascii"/>
84-
<delete file="${ascii.file}"/>
85-
<fail if="nonascii">Non-ASCII characters exist in project:
86-
${nonascii}</fail>
87-
<echo>No non-ASCII characters in project.</echo>
45+
<target name="unittest" depends="unittest-core, unittest-swing">
8846
</target>
8947

48+
<target name="unittest-core" depends="jar-core">
49+
<ant dir="core" target="unittest" inheritAll="false" />
50+
</target>
9051

52+
<target name="unittest-swing" depends="jar-swing">
53+
<ant dir="swing" target="unittest" inheritAll="false" />
54+
</target>
55+
56+
<!-- CHECK -->
57+
<target name="check" depends="checktodo,checkascii"/>
58+
59+
<!-- CHECK TODOs -->
60+
<target name="todo" depends="checktodo"/>
61+
<target name="checktodo">
62+
<tempfile property="todo.file" prefix="checktodo-" destDir="${basedir}"/>
63+
<echo>Checking project for FIXMEs.</echo>
64+
<concat destfile="${todo.file}">
65+
<fileset dir="core/src">
66+
<include name="**/*.java"/>
67+
</fileset>
68+
<fileset dir="core/test">
69+
<include name="**/*.java"/>
70+
</fileset>
71+
<fileset dir="swing/src">
72+
<include name="**/*.java"/>
73+
</fileset>
74+
<fileset dir="swing/test">
75+
<include name="**/*.java"/>
76+
</fileset>
77+
<filterchain>
78+
<linecontainsregexp>
79+
<regexp pattern="(FIXME|TODO:.*CRITICAL)"/>
80+
</linecontainsregexp>
81+
</filterchain>
82+
</concat>
83+
<loadfile srcfile="${todo.file}" property="criticaltodos"/>
84+
<delete file="${todo.file}"/>
85+
<fail if="criticaltodos">CRITICAL TODOs exist in project:
86+
${criticaltodos}</fail>
87+
<echo>No critical TODOs in project.</echo>
88+
</target>
89+
90+
<!-- CHECK ASCII -->
91+
<target name="ascii" depends="checkascii"/>
92+
<target name="checkascii">
93+
<tempfile property="ascii.file" prefix="checkascii-" destDir="${basedir}"/>
94+
<echo>Checking project for non-ASCII characters.</echo>
95+
<concat destfile="${ascii.file}">
96+
<fileset dir="core/src">
97+
<include name="**/*.java"/>
98+
</fileset>
99+
<fileset dir="core/test">
100+
<include name="**/*.java"/>
101+
</fileset>
102+
<fileset dir="swing/src">
103+
<include name="**/*.java"/>
104+
</fileset>
105+
<fileset dir="swing/test">
106+
<include name="**/*.java"/>
107+
</fileset>
108+
<filterchain>
109+
<linecontainsregexp>
110+
<regexp pattern="\P{ASCII}"/>
111+
</linecontainsregexp>
112+
</filterchain>
113+
</concat>
114+
<loadfile srcfile="${ascii.file}" property="nonascii"/>
115+
<delete file="${ascii.file}"/>
116+
<fail if="nonascii">Non-ASCII characters exist in project:
117+
${nonascii}</fail>
118+
<echo>No non-ASCII characters in project.</echo>
119+
</target>
120+
91121
</project>

0 commit comments

Comments
 (0)