diff options
| author | denisanisimov <denis@vaadin.com> | 2014-01-13 09:44:52 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-01-15 08:37:14 +0000 |
| commit | d2874fde4b8c6afa24f0f6535e0d6fcabc489f51 (patch) | |
| tree | 46a090fb3334bca03386ded011a54950b6f20973 /theme-compiler/build.xml | |
| parent | 034197d5a98cbf59153c824ed6f93d495c523854 (diff) | |
| download | vaadin-framework-d2874fde4b8c6afa24f0f6535e0d6fcabc489f51.tar.gz vaadin-framework-d2874fde4b8c6afa24f0f6535e0d6fcabc489f51.zip | |
Theme Parser is deleted, build procedure now generates it (#13161).
Change-Id: I6e0f797b9eadf9fe796750e2764faf4434494e29
Diffstat (limited to 'theme-compiler/build.xml')
| -rw-r--r-- | theme-compiler/build.xml | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/theme-compiler/build.xml b/theme-compiler/build.xml index 03d0531a68..623d2e4ec7 100644 --- a/theme-compiler/build.xml +++ b/theme-compiler/build.xml @@ -23,7 +23,7 @@ <!--<property name="classes.exclude" value="com/vaadin/buildhelpers/**" /> --> - <target name="parser"> + <target name="parser" depends="-check-parser" unless="parser.exists"> <!-- Copy javacc-5.0.jar to ${result.dir}/javacc/javacc.jar as the javacc task requires the jar to be named javacc.jar --> <property name="javacc.home" location="${result.dir}/javacc" /> @@ -32,15 +32,29 @@ <mkdir dir="${generate.dir}" /> <!-- Generate new parser files in another directory, this ensure they are always generated --> - <copy file="${parser.src.dir}/Parser.jj" todir="${generate.dir}" /> - <javacc target="${generate.dir}/Parser.jj" javacchome="${javacc.home}"> - </javacc> + <copy todir="${generate.dir}"> + <fileset dir="${parser.src.dir}"> + <exclude name="**/*.java"/> + </fileset> + </copy> + <javacc target="${generate.dir}/ParserImpl.jj" javacchome="${javacc.home}" errorreporting="true"/> <!-- Add headers to the generated files and copy back to src --> <antcontrib:foreach target="prepend.generated.file.header" param="path"> <path> <fileset dir="${generate.dir}" includes="*.java" excludes="ParseException.java" /> </path> </antcontrib:foreach> + <copy todir="${parser.src.dir}"> + <fileset dir="${generate.dir}"> + <include name="*.jj"/> + <exclude name="ParserImpl.jj"/> + </fileset> + <globmapper from="*.jj" to="*.java"/> + </copy> + </target> + + <target name="-check-parser"> + <available file="${parser.src.dir}/ParserImpl.java" property="parser.exists"/> </target> <target name="prepend.generated.file.header"> |