Skip to content

Commit 6cf9ac9

Browse files
author
jdf
committed
Clean up after old derived resources
1 parent 3a81f1f commit 6cf9ac9

1 file changed

Lines changed: 41 additions & 26 deletions

File tree

‎app/build.xml‎

Lines changed: 41 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,38 @@
11
<?xml version="1.0"?>
22
<project name="Processing PDE" default="build">
33

4-
<property name="generated" value="${basedir}/generated/processing/app/antlr"/>
5-
<property name="grammars" value="${basedir}/grammars"/>
6-
<property name="antlrjar" value="${basedir}/lib/antlr.jar"/>
7-
4+
<property name="generated" value="${basedir}/generated/processing/app/antlr" />
5+
<property name="grammars" value="${basedir}/grammars" />
6+
<property name="antlrjar" value="${basedir}/lib/antlr.jar" />
7+
88
<classloader taskname="antlr">
99
<classpath path="lib/antlr.jar" />
1010
</classloader>
1111

1212
<target name="clean" description="Clean the build directories">
13+
14+
<!-- jdf sez: clean up after old layout of generated resources -->
15+
<delete failonerror="false">
16+
<fileset dir="${basedir}/src/antlr/java">
17+
<include name="*.java" />
18+
<include name="*.tokens" />
19+
<include name="*.txt" />
20+
<include name="*.g" />
21+
<include name="*.smap" />
22+
</fileset>
23+
</delete>
24+
<delete failonerror="false">
25+
<!-- jdf sez: don't name anything FooRecognizer or FooLexer in this package -->
26+
<fileset dir="${basedir}/src/processing/app/preproc">
27+
<include name="*Recognizer.java" />
28+
<include name="*Lexer.java" />
29+
<include name="*.tokens" />
30+
<include name="*.txt" />
31+
<include name="*.g" />
32+
<include name="*.smap" />
33+
</fileset>
34+
</delete>
35+
1336
<delete dir="bin" />
1437
<delete file="pde.jar" />
1538
<delete>
@@ -23,18 +46,11 @@
2346
</delete>
2447
</target>
2548

26-
<target name="preproc" description="Compile ANTLR grammar">
49+
<target name="preproc" depends="clean" description="Compile ANTLR grammar">
2750
<antlr target="${grammars}/java15.g" outputdirectory="${generated}">
2851
<classpath path="${antlrjar}" />
2952
</antlr>
30-
31-
<!-- antlr wants this file nearby -->
32-
<!-- <copy todir="src/processing/app/preproc" file="src/antlr/java/JavaTokenTypes.txt" />
33-
-->
34-
35-
<antlr target="${grammars}/pde.g"
36-
outputdirectory="${generated}"
37-
glib="${grammars}/java15.g">
53+
<antlr target="${grammars}/pde.g" outputdirectory="${generated}" glib="${grammars}/java15.g">
3854
<classpath path="${antlrjar}" />
3955
</antlr>
4056
</target>
@@ -43,7 +59,8 @@
4359
<condition property="core-built">
4460
<available file="../core/core.jar" />
4561
</condition>
46-
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../core/core.jar" />
62+
<fail unless="core-built"
63+
message="Please build the core library first and make sure it sits in ../core/core.jar" />
4764

4865
<mkdir dir="bin" />
4966

@@ -74,19 +91,17 @@
7491
<echo message="override ${env.JAVA_HOME}/lib/tools.jar" />
7592
<fail />
7693
-->
77-
<javac
78-
target="1.5"
79-
destdir="bin"
80-
excludes="**/tools/format/**"
81-
encoding="UTF-8"
82-
includeAntRuntime="false"
83-
classpath="../core/core.jar; ${env.JAVA_HOME}/lib/tools.jar; lib/ant.jar; lib/ant-launcher.jar; lib/antlr.jar; lib/apple.jar; lib/ecj.jar; lib/jna.jar"
84-
>
85-
<src path="src"/>
86-
<src path="generated"/>
94+
<javac target="1.5"
95+
destdir="bin"
96+
excludes="**/tools/format/**"
97+
encoding="UTF-8"
98+
includeAntRuntime="false"
99+
classpath="../core/core.jar; ${env.JAVA_HOME}/lib/tools.jar; lib/ant.jar; lib/ant-launcher.jar; lib/antlr.jar; lib/apple.jar; lib/ecj.jar; lib/jna.jar"
100+
>
101+
<src path="src" />
102+
<src path="generated" />
87103
</javac>
88-
<javac
89-
target="1.5"
104+
<javac target="1.5"
90105
srcdir="../android/tool/src"
91106
destdir="bin"
92107
encoding="UTF-8"

0 commit comments

Comments
 (0)