hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Use plugin-classpath to simplify javacc-wrapper.xml

Browse Source 
javacc is on the antrun plugin's classpath.
The javacc jar file doesn't need to be copied
explicitly.
This commit is contained in:
Andreas Dangel 2024-10-13 12:03:17 +02:00
parent 0ea42b94e0
commit 867b142ee4
No known key found for this signature in database
GPG Key ID: 93450DF2DF9A3FA3
13 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
javacc-wrapper.xml
View File

@ -25,9 +25,9 @@
It also uses the following maven properties: It also uses the following maven properties:
- javacc.outputDirectory: Directory in which to root the generated package tree - javacc.outputDirectory: Directory in which to root the generated package tree
- javacc.jar: JAR of JavaCC in the local maven repository - plugin-classpath: The classpath of maven-antrun-plugin with javacc.jar dependency
Provided by maven via "<property name="plugin-classpath" refid="maven.plugin.classpath"/>"
- some properties of project.build - some properties of project.build
--> -->
<condition property="lang-name-camelcase" value="${lang-name}"> <condition property="lang-name-camelcase" value="${lang-name}">
@ -40,8 +40,6 @@
<property name="target-package-dir" value="${javacc.outputDirectory}/net/sourceforge/pmd/lang/${lang-id}/ast" /> <property name="target-package-dir" value="${javacc.outputDirectory}/net/sourceforge/pmd/lang/${lang-id}/ast" />
<property name="stamp-file" value="${project.build.directory}/last-generated-timestamp" /> <property name="stamp-file" value="${project.build.directory}/last-generated-timestamp" />
<property name="javacc-home.path" value="${project.build.directory}/lib/javacc" />
<property name="lang-ast-package" value="net.sourceforge.pmd.lang.${lang-id}.ast" /> <property name="lang-ast-package" value="net.sourceforge.pmd.lang.${lang-id}.ast" />
<property name="ast-api-package" value="net.sourceforge.pmd.lang.ast" /> <property name="ast-api-package" value="net.sourceforge.pmd.lang.ast" />
<property name="ast-impl-package" value="${ast-api-package}.impl.javacc" /> <property name="ast-impl-package" value="${ast-api-package}.impl.javacc" />
@ -84,7 +82,7 @@
<target name="alljavacc" <target name="alljavacc"
description="Generates JavaCC sources and cleans them up" description="Generates JavaCC sources and cleans them up"
depends="checkUpToDate,init,jjtree,jjtree-ersatz,javacc,adapt-generated,default-visitor,cleanup" /> depends="checkUpToDate,init,jjtree,jjtree-ersatz,javacc,adapt-generated,default-visitor" />
<target name="checkUpToDate" <target name="checkUpToDate"
description="Checks the input files are up to date"> description="Checks the input files are up to date">
@ -104,9 +102,6 @@
<target name="init" unless="javaccBuildNotRequired" description="Initialize build"> <target name="init" unless="javaccBuildNotRequired" description="Initialize build">
<mkdir dir="${javacc-home.path}" />
<copy file="${javacc.jar}" tofile="${javacc-home.path}/javacc.jar" />
<mkdir dir="${javacc.outputDirectory}" /> <mkdir dir="${javacc.outputDirectory}" />
<touch file="${stamp-file}" /> <touch file="${stamp-file}" />
<delete dir="${target-package-dir}" /> <delete dir="${target-package-dir}" />
@ -117,11 +112,6 @@
</condition> </condition>
</target> </target>
<target name="cleanup" unless="javaccBuildNotRequired">
<delete dir="${javacc-home.path}" />
</target>
<target name="jjtree" unless="jjtreeBuildNotRequired" description="Runs JJTree"> <target name="jjtree" unless="jjtreeBuildNotRequired" description="Runs JJTree">
<!-- <!--
@ -130,7 +120,7 @@
--> -->
<java fork="true" <java fork="true"
classname="jjtree" classname="jjtree"
classpath="${javacc-home.path}/javacc.jar"> classpath="${plugin-classpath}">
<sysproperty key="file.encoding" value="UTF-8" /> <sysproperty key="file.encoding" value="UTF-8" />
<arg value="-OUTPUT_DIRECTORY:${target-package-dir}" /> <arg value="-OUTPUT_DIRECTORY:${target-package-dir}" />
<arg value="-NODE_USES_PARSER:false" /> <arg value="-NODE_USES_PARSER:false" />
@ -148,7 +138,7 @@
<target name="javacc" depends="jjtree" unless="javaccBuildNotRequired"> <target name="javacc" depends="jjtree" unless="javaccBuildNotRequired">
<java fork="true" <java fork="true"
classname="javacc" classname="javacc"
classpath="${javacc-home.path}/javacc.jar"> classpath="${plugin-classpath}">
<sysproperty key="file.encoding" value="UTF-8" /> <sysproperty key="file.encoding" value="UTF-8" />
<arg value="-STATIC:false" /> <arg value="-STATIC:false" />
<arg value="-USER_CHAR_STREAM:true" /> <arg value="-USER_CHAR_STREAM:true" />

2
pmd-cpp/pom.xml
View File

@ -34,10 +34,10 @@
<configuration> <configuration>
<target> <target>
<ant antfile="${javacc.ant.wrapper}" target="alljavacc"> <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
<property name="plugin-classpath" refid="maven.plugin.classpath"/>
<property name="no-jjtree" value="true" /> <!-- This is a CPD module --> <property name="no-jjtree" value="true" /> <!-- This is a CPD module -->
<property name="lang-name" value="Cpp" /> <property name="lang-name" value="Cpp" />
<property name="lang-id" value="cpp" /> <property name="lang-id" value="cpp" />
<property name="javacc.jar" value="${javacc.jar}" />
</ant> </ant>
</target> </target>
</configuration> </configuration>

2
pmd-java/pom.xml
View File

@ -105,7 +105,7 @@
<configuration> <configuration>
<target> <target>
<ant antfile="${javacc.ant.wrapper}" target="alljavacc"> <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
<property name="javacc.jar" value="${javacc.jar}" /> <property name="plugin-classpath" refid="maven.plugin.classpath"/>
<property name="lang-name" value="Java" /> <property name="lang-name" value="Java" />
<property name="lang-id" value="java" /> <property name="lang-id" value="java" />
</ant> </ant>

2
pmd-javascript/pom.xml
View File

@ -47,10 +47,10 @@
<configuration> <configuration>
<target> <target>
<ant antfile="${javacc.ant.wrapper}" target="alljavacc"> <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
<property name="plugin-classpath" refid="maven.plugin.classpath"/>
<property name="no-jjtree" value="true" /> <!-- This is a CPD module --> <property name="no-jjtree" value="true" /> <!-- This is a CPD module -->
<property name="lang-name" value="Ecmascript5" /> <property name="lang-name" value="Ecmascript5" />
<property name="lang-id" value="ecmascript5" /> <property name="lang-id" value="ecmascript5" />
<property name="javacc.jar" value="${javacc.jar}" />
</ant> </ant>
</target> </target>
</configuration> </configuration>

2
pmd-jsp/pom.xml
View File

@ -40,7 +40,7 @@
<configuration> <configuration>
<target> <target>
<ant antfile="${javacc.ant.wrapper}" target="alljavacc"> <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
<property name="javacc.jar" value="${javacc.jar}" /> <property name="plugin-classpath" refid="maven.plugin.classpath"/>
<property name="lang-name" value="Jsp" /> <property name="lang-name" value="Jsp" />
<property name="lang-id" value="jsp" /> <property name="lang-id" value="jsp" />
</ant> </ant>

2
pmd-matlab/pom.xml
View File

@ -34,10 +34,10 @@
<configuration> <configuration>
<target> <target>
<ant antfile="${javacc.ant.wrapper}" target="alljavacc"> <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
<property name="plugin-classpath" refid="maven.plugin.classpath"/>
<property name="no-jjtree" value="true" /> <!-- This is a CPD module --> <property name="no-jjtree" value="true" /> <!-- This is a CPD module -->
<property name="lang-name" value="Matlab" /> <property name="lang-name" value="Matlab" />
<property name="lang-id" value="matlab" /> <property name="lang-id" value="matlab" />
<property name="javacc.jar" value="${javacc.jar}" />
</ant> </ant>
</target> </target>
</configuration> </configuration>

2
pmd-modelica/pom.xml
View File

@ -64,7 +64,7 @@
<configuration> <configuration>
<target> <target>
<ant antfile="${javacc.ant.wrapper}" target="alljavacc"> <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
<property name="javacc.jar" value="${javacc.jar}" /> <property name="plugin-classpath" refid="maven.plugin.classpath"/>
<property name="lang-name" value="Modelica" /> <property name="lang-name" value="Modelica" />
<property name="lang-id" value="modelica" /> <property name="lang-id" value="modelica" />
</ant> </ant>

2
pmd-objectivec/pom.xml
View File

@ -34,10 +34,10 @@
<configuration> <configuration>
<target> <target>
<ant antfile="${javacc.ant.wrapper}" target="alljavacc"> <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
<property name="plugin-classpath" refid="maven.plugin.classpath"/>
<property name="no-jjtree" value="true" /> <!-- This is a CPD module --> <property name="no-jjtree" value="true" /> <!-- This is a CPD module -->
<property name="lang-name" value="ObjectiveC" /> <property name="lang-name" value="ObjectiveC" />
<property name="lang-id" value="objectivec" /> <property name="lang-id" value="objectivec" />
<property name="javacc.jar" value="${javacc.jar}" />
</ant> </ant>
</target> </target>
</configuration> </configuration>

2
pmd-plsql/pom.xml
View File

@ -40,7 +40,7 @@
<configuration> <configuration>
<target> <target>
<ant antfile="${javacc.ant.wrapper}" target="alljavacc"> <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
<property name="javacc.jar" value="${javacc.jar}" /> <property name="plugin-classpath" refid="maven.plugin.classpath"/>
<property name="lang-name" value="PLSQL" /> <property name="lang-name" value="PLSQL" />
<property name="lang-name-camelcase" value="Plsql" /> <property name="lang-name-camelcase" value="Plsql" />
<property name="lang-id" value="plsql" /> <property name="lang-id" value="plsql" />

2
pmd-python/pom.xml
View File

@ -34,10 +34,10 @@
<configuration> <configuration>
<target> <target>
<ant antfile="${javacc.ant.wrapper}" target="alljavacc"> <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
<property name="plugin-classpath" refid="maven.plugin.classpath"/>
<property name="no-jjtree" value="true" /> <!-- This is a CPD module --> <property name="no-jjtree" value="true" /> <!-- This is a CPD module -->
<property name="lang-name" value="Python" /> <property name="lang-name" value="Python" />
<property name="lang-id" value="python" /> <property name="lang-id" value="python" />
<property name="javacc.jar" value="${javacc.jar}" />
</ant> </ant>
</target> </target>
</configuration> </configuration>

2
pmd-velocity/pom.xml
View File

@ -43,7 +43,7 @@
<configuration> <configuration>
<target> <target>
<ant antfile="${javacc.ant.wrapper}" target="alljavacc"> <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
<property name="javacc.jar" value="${javacc.jar}" /> <property name="plugin-classpath" refid="maven.plugin.classpath"/>
<property name="lang-name" value="Vtl" /> <property name="lang-name" value="Vtl" />
<property name="lang-id" value="velocity" /> <property name="lang-id" value="velocity" />
</ant> </ant>

2
pmd-visualforce/pom.xml
View File

@ -47,7 +47,7 @@
<configuration> <configuration>
<target> <target>
<ant antfile="${javacc.ant.wrapper}" target="alljavacc"> <ant antfile="${javacc.ant.wrapper}" target="alljavacc">
<property name="javacc.jar" value="${javacc.jar}" /> <property name="plugin-classpath" refid="maven.plugin.classpath"/>
<property name="lang-name" value="Vf" /> <property name="lang-name" value="Vf" />
<property name="lang-id" value="visualforce" /> <property name="lang-id" value="visualforce" />
</ant> </ant>

2
pom.xml
View File

@ -118,7 +118,7 @@
<pmd.build-tools.version>27</pmd.build-tools.version> <pmd.build-tools.version>27</pmd.build-tools.version>
<pmd-designer.version>7.2.0</pmd-designer.version> <pmd-designer.version>7.2.0</pmd-designer.version>
<javacc.jar>${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar</javacc.jar>
<javacc.outputDirectory>${project.build.directory}/generated-sources/javacc</javacc.outputDirectory> <javacc.outputDirectory>${project.build.directory}/generated-sources/javacc</javacc.outputDirectory>
<javacc.ant.wrapper>${project.basedir}/../javacc-wrapper.xml</javacc.ant.wrapper> <javacc.ant.wrapper>${project.basedir}/../javacc-wrapper.xml</javacc.ant.wrapper>