Skip to content

Commit

Permalink
Merge remote-tracking branch 'kampbell/develop' into cppcode
Browse files Browse the repository at this point in the history 
Conflicts:
	.gitignore
	build.xml
	src/main/resources/templates/cpp/Node.h.template
	src/main/resources/templates/cpp/SimpleNode.cc.template
	src/main/resources/templates/cpp/SimpleNode.h.template
	version.properties
  • Loading branch information
@zosrothko
zosrothko committed Jan 1, 2017
2 parents b042f50 + a98da9b commit a114c63
Show file tree
Hide file tree
Showing 45 changed files with 793 additions and 3,395 deletions.
4 changes: 3 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ target/
.gradle/
gradle/
junit/
TEST-*
**/out-dir/
*.*~
examples/JJTreeExamples/cpp/eg*/
*.asc
examples/JJTreeExamples/cpp/eg*/
104 changes: 56 additions & 48 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
<project name="javacc" default="jar" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-2.1.3.jar" />
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />


<property name="java-src" value="src/main/java" />
<property name="test-src" value="src/test/java" />
Expand All @@ -44,22 +44,23 @@ THE POSSIBILITY OF SUCH DAMAGE.
<property name="utils-generated-src" value="${generated-src}/org/javacc/utils" />
<property name="jjtree-generated-src" value="${generated-src}/org/javacc/jjtree" />
<property name="test-tmp" value="test.tmp" />

<property name="bootstrap-jar" value="bootstrap/javacc.jar" />
<property name="jjtree-bootstrap-class" value="org.javacc.jjtree.Main" />
<property name="javacc-bootstrap-class" value="org.javacc.parser.Main" />

<property name="target-folder" value="target" />

<property file="version.properties" />
<!-- property name="version" value="${version.major}.${version.minor}.${version.patch}-SNAPSHOT" / -->
<property name="version" value="${version.major}.${version.minor}.${version.patch}" />

<property name="javacc" value="${target-folder}/javacc.jar" />

<property name="javacc-jar" value="javacc-${version}.jar" />
<property name="javacc-sources-jar" value="javacc-${version}-sources.jar" />
<property name="javacc-javadoc-jar" value="javacc-${version}-javadoc.jar" />

<property name="javacc-path" value="${target-folder}/${javacc-jar}" />
<property name="javacc-sources-path" value="${target-folder}/${javacc-sources-jar}" />
<property name="javacc-javadoc-path" value="${target-folder}/${javacc-javadoc-jar}" />
Expand Down Expand Up @@ -132,7 +133,7 @@ THE POSSIBILITY OF SUCH DAMAGE.

<copy file="version.properties" todir="classes" />

<javac srcdir="${java-src}" destdir="classes" debug="true" classpath="">
<javac srcdir="${java-src}" destdir="classes" debug="true" classpath="" includeantruntime='false'>
<src path="${java-src}" />
<src path="${generated-src}" />
<src path="${resources-src}" />
Expand All @@ -147,8 +148,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
<!-- Be careful not to include the test files in the distribution. -->
<target name="jar-check">
<uptodate property="jar.uptodate" targetfile="${javacc-path}">
<srcfiles dir="classes" />
<srcfiles dir="${resources-src}" />
<srcfiles dir="src/main" />
</uptodate>
</target>

Expand All @@ -172,7 +172,6 @@ THE POSSIBILITY OF SUCH DAMAGE.

<delete file="${install-name}-distribution.zip" />
<zip destfile="${install-name}-distribution.zip">

<zipfileset prefix="javacc-${version}/${target-folder}" filemode="444" file="${javacc}" />
<zipfileset prefix="javacc-${version}/doc" filemode="444" dir="www/doc" />
<zipfileset prefix="javacc-${version}/examples" filemode="444" dir="examples/" />
Expand All @@ -190,8 +189,6 @@ THE POSSIBILITY OF SUCH DAMAGE.
<zip destfile="${install-name}-sources.jar">
<zipfileset prefix="javacc-${version}" filemode="444" file="./**" excludes=".svn,CVS,**/*.zip,**/*.tar.gz, deployment_pom/**, target/**, dist/**, temp/**" />
</zip>


</target>


Expand All @@ -207,7 +204,6 @@ THE POSSIBILITY OF SUCH DAMAGE.

<zip destfile="${install-name}-javadoc.jar" basedir="${target-folder}/javadoc">
</zip>

</target>

<target name="unittest" depends="jar" description="run JUnit unit test cases" unless="true">
Expand All @@ -218,7 +214,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
<pathelement location="lib/junit.jar" />
<pathelement location="target/javacc.jar" />
</path>

<delete dir="junit" />
<mkdir dir="junit" />
<javac srcdir="${test-src}" destdir="junit" classpathref="compile-test-classpath" includeantruntime='false'>
Expand All @@ -237,9 +233,9 @@ THE POSSIBILITY OF SUCH DAMAGE.
<fileset dir="junit">
<include name="**/*Test.*" />
</fileset>
<formatter type="failure"/>
<!-- I want to see something ... -->
<formatter type="plain" usefile="false"/>
<formatter type="failure" />
<!-- I want to see something ... -->
<formatter type="plain" usefile="false" />
</batchtest>
</junit>

Expand All @@ -262,7 +258,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
<arg line="-OUTPUT_DIRECTORY=${test-tmp}/CORBA-IDL examples/CORBA-IDL/IDL.jj" />
</java>

<javac srcdir="${test-tmp}/CORBA-IDL" />
<javac srcdir="${test-tmp}/CORBA-IDL" includeantruntime='false'/>

<copy todir="${test-tmp}/CORBA-IDL/">
<fileset dir="examples/CORBA-IDL">
Expand Down Expand Up @@ -296,24 +292,24 @@ THE POSSIBILITY OF SUCH DAMAGE.
<arg line="-OUTPUT_DIRECTORY=${test-tmp}/GUIParsing/ParserVersion examples/GUIParsing/ParserVersion/CalcInput.jj" />
</java>

<javac srcdir="${test-tmp}/GUIParsing/ParserVersion" />
<javac srcdir="${test-tmp}/GUIParsing/ParserVersion" includeantruntime='false'/>

<echo />

<!--
<copy todir="${test-tmp}/GUIParsing/TokenMgrVersion">
<fileset dir="examples/GUIParsing/TokenMgrVersion">
<include name="*.java" />
</fileset>
</copy>
<java failonerror="true" fork="true" classname="javacc" classpath="${javacc}">
<arg line="-OUTPUT_DIRECTORY=${test-tmp}/GUIParsing/TokenMgrVersion examples/GUIParsing/TokenMgrVersion/CalcInput.jj" />
</java>
<javac srcdir="${test-tmp}/GUIParsing/TokenMgrVersion" />
<echo />
<!--
<copy todir="${test-tmp}/GUIParsing/TokenMgrVersion">
<fileset dir="examples/GUIParsing/TokenMgrVersion">
<include name="*.java" />
</fileset>
</copy>
<java failonerror="true" fork="true" classname="javacc" classpath="${javacc}">
<arg line="-OUTPUT_DIRECTORY=${test-tmp}/GUIParsing/TokenMgrVersion examples/GUIParsing/TokenMgrVersion/CalcInput.jj" />
</java>
<javac srcdir="${test-tmp}/GUIParsing/TokenMgrVersion" includeantruntime='false'/>
<echo />
-->

<copy todir="${test-tmp}/Interpreter">
Expand All @@ -334,7 +330,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
<arg line="-OUTPUT_DIRECTORY=${test-tmp}/Interpreter ${test-tmp}/Interpreter/SPL.jj" />
</java>

<javac srcdir="${test-tmp}/Interpreter" />
<javac srcdir="${test-tmp}/Interpreter" includeantruntime='false'/>

<copy todir="${test-tmp}/Interpreter/">
<fileset dir="examples/Interpreter/">
Expand Down Expand Up @@ -388,7 +384,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
<arg line="-OUTPUT_DIRECTORY=${test-tmp}/java/JJTreeExamples.eg1 ${test-tmp}/java/JJTreeExamples.eg1/eg1.jj" />
</java>

<javac srcdir="${test-tmp}/java/JJTreeExamples.eg1" />
<javac srcdir="${test-tmp}/java/JJTreeExamples.eg1" includeantruntime='false'/>

<java failonerror="true" fork="true" classname="Eg1" classpath="${test-tmp}/java/JJTreeExamples.eg1/" inputstring="(a + b) * (c + 1);" outputproperty="jjtree.eg1.out">
</java>
Expand Down Expand Up @@ -419,7 +415,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
<arg line="-OUTPUT_DIRECTORY=${test-tmp}/java/JJTreeExamples.eg2 ${test-tmp}/java/JJTreeExamples.eg2/eg2.jj" />
</java>

<javac srcdir="${test-tmp}/java/JJTreeExamples.eg2" />
<javac srcdir="${test-tmp}/java/JJTreeExamples.eg2" includeantruntime='false'/>

<java failonerror="true" fork="true" classname="Eg2" classpath="${test-tmp}/java/JJTreeExamples.eg2/" inputstring="(a + b) * (c + 1);" outputproperty="jjtree.eg2.out">
</java>
Expand Down Expand Up @@ -449,7 +445,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
<arg line="-OUTPUT_DIRECTORY=${test-tmp}/java/JJTreeExamples.eg3 ${test-tmp}/java/JJTreeExamples.eg3/eg3.jj" />
</java>

<javac srcdir="${test-tmp}/java/JJTreeExamples.eg3" />
<javac srcdir="${test-tmp}/java/JJTreeExamples.eg3" includeantruntime='false'/>

<java failonerror="true" fork="true" classname="Eg3" classpath="${test-tmp}/java/JJTreeExamples.eg3/" inputstring="(a + b) * (c + 1);" outputproperty="jjtree.eg3.out">
</java>
Expand Down Expand Up @@ -478,7 +474,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
<arg line="-OUTPUT_DIRECTORY=${test-tmp}/java/JJTreeExamples.eg4 ${test-tmp}/java/JJTreeExamples.eg4/eg4.jj" />
</java>

<javac srcdir="${test-tmp}/java/JJTreeExamples.eg4" debug="true" />
<javac srcdir="${test-tmp}/java/JJTreeExamples.eg4" debug="true" includeantruntime='false'/>

<java failonerror="true" fork="true" classname="Eg4" classpath="${test-tmp}/java/JJTreeExamples.eg4/" inputstring="(a + b) * (c + 1);" outputproperty="jjtree.eg4.out">
</java>
Expand All @@ -497,7 +493,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
<arg line="-OUTPUT_DIRECTORY=${test-tmp}/JavaCCGrammar examples/JavaCCGrammar/JavaCC.jj" />
</java>

<javac srcdir="${test-tmp}/JavaCCGrammar" />
<javac srcdir="${test-tmp}/JavaCCGrammar" includeantruntime='false'/>

<echo />

Expand Down Expand Up @@ -556,7 +552,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
<arg line="-OUTPUT_DIRECTORY=${test-tmp}/MailProcessing examples/MailProcessing/Faq.jj" />
</java>

<javac srcdir="${test-tmp}/MailProcessing" />
<javac srcdir="${test-tmp}/MailProcessing" includeantruntime='false'/>

<echo />

Expand All @@ -578,7 +574,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
<arg line="-OUTPUT_DIRECTORY=${test-tmp}/Obfuscator examples/Obfuscator/MapFile.jj" />
</java>

<javac srcdir="${test-tmp}/Obfuscator" />
<javac srcdir="${test-tmp}/Obfuscator" includeantruntime='false'/>

<!-- TODO, test cases for SimpleExamples -->

Expand All @@ -598,7 +594,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
<arg line="-OUTPUT_DIRECTORY=${test-tmp}/Transformer ${test-tmp}/Transformer/ToyJava.jj" />
</java>

<javac srcdir="${test-tmp}/Transformer" />
<javac srcdir="${test-tmp}/Transformer" includeantruntime='false'/>

<echo />

Expand All @@ -615,21 +611,21 @@ THE POSSIBILITY OF SUCH DAMAGE.
<java failonerror="true" fork="true" classname="javacc" classpath="${javacc}">
<arg line="-OUTPUT_DIRECTORY=${test-tmp}/VTransformer ${test-tmp}/VTransformer/Java1.1.jj" />
</java>
<javac srcdir="${test-tmp}/VTransformer" />
<javac srcdir="${test-tmp}/VTransformer" includeantruntime='false'/>

<!-- 2014/05/09 - New tests to test that TOKEN_MANAGER_USES_PARSER has no effect if static is true -->
<java failonerror="true" fork="true" classname="javacc" classpath="${javacc}">
<arg line="-OUTPUT_DIRECTORY=${test-tmp}/TestTokenManagerUsesParser test/TestTokenManagerUsesParser/TestTokenManagerUsesParser.jj" />
</java>

<javac srcdir="${test-tmp}/TestTokenManagerUsesParser" />
<javac srcdir="${test-tmp}/TestTokenManagerUsesParser" includeantruntime='false'/>

<!-- 2014/05/09 - New tests to test that TOKEN_MANAGER_USES_PARSER works as expected if static is false -->
<java failonerror="true" fork="true" classname="javacc" classpath="${javacc}">
<arg line="-OUTPUT_DIRECTORY=${test-tmp}/TestTokenManagerUsesParser2 test/TestTokenManagerUsesParser2/TestTokenManagerUsesParser2.jj" />
</java>

<javac srcdir="${test-tmp}/TestTokenManagerUsesParser2" />
<javac srcdir="${test-tmp}/TestTokenManagerUsesParser2" includeantruntime='false'/>

</target>

Expand All @@ -639,21 +635,33 @@ THE POSSIBILITY OF SUCH DAMAGE.
<!-- there server id in the Maven settings.xml -->
<property name="ossrh-server-id" value="ossrh" />

<target name="echo">
<!-- replace file="foo.xml" token="$${version}" value="${version}"/ -->
<echo message="$${version} = ${version}"/>
</target>

<target name="deploy" depends="dist" description="deploy snapshot version to Maven snapshot repository">
<artifact:mvn>
<arg value="org.apache.maven.plugins:maven-deploy-plugin:2.6:deploy-file" />
<arg value="org.apache.maven.plugins:maven-deploy-plugin:2.8:deploy-file" />
<arg value="-Durl=${ossrh-snapshots-repository-url}" />
<arg value="-DrepositoryId=${ossrh-server-id}" />
<arg value="-DpomFile=pom.xml" />
<arg value="-Dfile=${javacc-path}" />
</artifact:mvn>
</target>

<target name="install" depends="jar" description="install version to Maven local repository">
<artifact:pom id="mypom" file="pom.xml" />
<artifact:install file="${javacc-path}">
<pom refid="mypom" />
</artifact:install>
</target>

<!-- before this, update project version (both build.xml and pom.xml) from SNAPSHOT to RELEASE -->
<target name="stage" depends="dist" description="deploy release version to Maven staging repository">
<!-- sign and deploy the main artifact -->
<artifact:mvn>
<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.5:sign-and-deploy-file" />
<arg value="-Durl=${ossrh-staging-repository-url}" />
<arg value="-DrepositoryId=${ossrh-server-id}" />
<arg value="-DpomFile=pom.xml" />
Expand All @@ -663,18 +671,18 @@ THE POSSIBILITY OF SUCH DAMAGE.

<!-- sign and deploy the sources artifact -->
<artifact:mvn>
<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.5:sign-and-deploy-file" />
<arg value="-Durl=${ossrh-staging-repository-url}" />
<arg value="-DrepositoryId=${ossrh-server-id}" />
<arg value="-DpomFile=pom.xml" />
<arg value="-Dfile=${javacc-javadoc-path}" />
<arg value="-Dfile=${javacc-source-path}" />
<arg value="-Dclassifier=sources" />
<arg value="-Pgpg" />
</artifact:mvn>

<!-- sign and deploy the javadoc artifact -->
<artifact:mvn>
<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.5:sign-and-deploy-file" />
<arg value="-Durl=${ossrh-staging-repository-url}" />
<arg value="-DrepositoryId=${ossrh-server-id}" />
<arg value="-DpomFile=pom.xml" />
Expand Down
8 changes: 4 additions & 4 deletions examples/JJTreeExamples/java/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<copy file="eg1.jjt" todir="eg1"/>
<jjtree target="eg1.jjt" outputdirectory="eg1" javacchome="${javacc.home}"/>
<javacc target="eg1/eg1.jj" outputdirectory="eg1" javacchome="${javacc.home}"/>
<javac deprecation="false" srcdir="eg1" destdir="eg1"/>
<javac deprecation="false" srcdir="eg1" destdir="eg1" includeantruntime='false'/>
<echo message="*******"/>
<echo message="******* Now cd into the eg1 directory and run 'java Eg1' ******"/>
<echo message="*******"/>
Expand All @@ -21,7 +21,7 @@
<copy file="ASTMyID.java" todir="eg2"/>
<jjtree target="eg2.jjt" outputdirectory="eg2" javacchome="${javacc.home}"/>
<javacc target="eg2/eg2.jj" outputdirectory="eg2" javacchome="${javacc.home}"/>
<javac deprecation="false" srcdir="eg2" destdir="eg2"/>
<javac deprecation="false" srcdir="eg2" destdir="eg2" includeantruntime='false'/>
<echo message="*******"/>
<echo message="******* Now cd into the eg2 directory and run 'java Eg2' ******"/>
<echo message="*******"/>
Expand All @@ -34,7 +34,7 @@
<copy file="ASTMyID.java" todir="eg3"/>
<jjtree target="eg3.jjt" outputdirectory="eg3" javacchome="${javacc.home}"/>
<javacc target="eg3/eg3.jj" outputdirectory="eg3" javacchome="${javacc.home}"/>
<javac deprecation="false" srcdir="eg3" destdir="eg3"/>
<javac deprecation="false" srcdir="eg3" destdir="eg3" includeantruntime='false'/>
<echo message="*******"/>
<echo message="******* Now cd into the eg3 directory and run 'java Eg3' ******"/>
<echo message="*******"/>
Expand All @@ -49,7 +49,7 @@
<copy file="Eg4DumpVisitor.java" todir="eg4"/>
<jjtree target="eg4.jjt" outputdirectory="eg4" javacchome="${javacc.home}"/>
<javacc target="eg4/eg4.jj" outputdirectory="eg4" javacchome="${javacc.home}"/>
<javac deprecation="false" srcdir="eg4" destdir="eg4"/>
<javac deprecation="false" srcdir="eg4" destdir="eg4" includeantruntime='false'/>
<echo message="*******"/>
<echo message="******* Now cd into the eg4 directory and run 'java Eg4' ******"/>
<echo message="*******"/>
Expand Down
3 changes: 1 addition & 2 deletions examples/JavaGrammars/1.5/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
</target>

<target name="compile" depends="generated-files">
<javac srcdir="."
destdir="." >
<javac srcdir="." destdir="." includeantruntime='false'>
</javac>
</target>

Expand Down
Loading

0 comments on commit a114c63

Please sign in to comment.