Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating ccg2xml to use Python 3 #19

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Updating ccg2xml to use Python 3 #19

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1177c12
Allowing unicode as a valid string type for lex.py:input.
shoeffner Nov 18, 2018
fb64047
Removing ccg-editor.py in favor of the up-to-date ccg_editor.py
shoeffner Nov 18, 2018
d472650
Streamlining whitespace in ccg_editor and related build files.
shoeffner Nov 18, 2018
9ddc011
Removing trailing whitespace in lex.py.
shoeffner Nov 18, 2018
b5fd0b1
Converting ccg2xml to Python 3
shoeffner Nov 20, 2018
b03b7b9
Using self.next instead of self.__next__ for Tree navigation.
shoeffner Nov 20, 2018
d102857
Using ttk to make tkinter work on MacOS.
shoeffner Nov 21, 2018
bc3fce2
Fixes indentation errors from the 2to3 conversion.
shoeffner Nov 21, 2018
3330877
Call python3 explicitly in ccg2xml
shoeffner Nov 21, 2018
dea0132
Changing file attributes to remove executable permissions on files wh…
shoeffner Nov 21, 2018
323aadb
Removing list() calls around dictionary items.
shoeffner Jan 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
923 changes: 0 additions & 923 deletions bin/ccg-editor.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion bin/ccg2xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh

python "$OPENCCG_HOME/bin/ccg2xml.py" "$@"
python3 "$OPENCCG_HOME/bin/ccg2xml.py" "$@"
96 changes: 47 additions & 49 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<property name="build.dest" value="./output/classes"/>
<property name="build.gen" value="${top.dir}/output/gen"/>
<property name="build.javadocs" value="${docs.dir}/api"/>

<path id="build.classpath">
<pathelement location="${lib.dir}/ant-junit.jar"/>
<pathelement location="${lib.dir}/ant-launcher.jar"/>
Expand All @@ -57,7 +57,7 @@
<filter token="log" value="true"/>
<filter token="verbose" value="true"/>
</target>


<!-- =================================================================== -->
<!-- Help on usage -->
Expand All @@ -81,7 +81,7 @@
<echo message=""/>
<echo message=""/>
</target>


<!-- =================================================================== -->
<!-- Prepares the build directories -->
Expand All @@ -93,29 +93,28 @@
<mkdir dir="${build.gen}"/>
</target>


<!-- Runs JavaCC (parser generator) -->
<!-- =================================================================== -->
<target name="javacc"
depends="prepare"
description="generates parser using javacc">
<mkdir dir="${build.gen}/opennlp/ccgbank/parse"/>
<copy file="${src.dir}/opennlp/ccgbank/parse/SimpleNode.java"
todir="${build.gen}/opennlp/ccgbank/parse"/>
todir="${build.gen}/opennlp/ccgbank/parse"/>
<jjtree target="${src.dir}/opennlp/ccgbank/parse/CCGbankDerivation.jjt"
javacchome="${lib.dir}"
outputdirectory="${build.gen}/opennlp/ccgbank/parse"
/>
javacchome="${lib.dir}"
outputdirectory="${build.gen}/opennlp/ccgbank/parse" />
<javacc target="${build.gen}/opennlp/ccgbank/parse/CCGbankDerivation.jj"
outputdirectory="${build.gen}/opennlp/ccgbank/parse"
javacchome="${lib.dir}/"/>
outputdirectory="${build.gen}/opennlp/ccgbank/parse"
javacchome="${lib.dir}/" />
</target>


<!-- =================================================================== -->
<!-- Compiles the source directory -->
<!-- =================================================================== -->
<target name="compile"
<target name="compile"
depends="javacc"
description="compiles the source code">
<!-- compile generated JavaCC classes-->
Expand All @@ -125,37 +124,37 @@
deprecation="${deprecation}"
classpathref="build.classpath"
nowarn="true"
includeAntRuntime="false"
includeAntRuntime="false"
excludes="**/.backup.orig/**"
optimize="${optimize}"/>
optimize="${optimize}"/>
<javac srcdir="${src.dir}"
destdir="${build.dest}"
debug="${debug}"
deprecation="${deprecation}"
classpathref="build.classpath"
nowarn="true"
includeAntRuntime="false"
includeAntRuntime="false"
excludes="**/.backup.orig/**,srilmbridge/,kenlm/"
optimize="${optimize}">
</javac>
<subant antfile="${src.dir}/ccg2xml/build.xml" buildpath="${basedir}"/>
</target>


<!-- =================================================================== -->
<!-- Creates the jar file -->
<!-- =================================================================== -->
<target name="package"
<target name="package"
depends="compile"
description="generates the openccg.jar file (default)">
<jar jarfile="${lib.dir}/${name}.jar">
<fileset dir="${build.dest}">
<include name="**"/>
<exclude name="**/alignment/*Test*.class"/>
<exclude name="**/disjunctivizer/*Test*.class"/>
<exclude name="**/hylo/graph/*Test*.class"/>
<exclude name="**/util/*Test*.class"/>
</fileset>
<include name="**"/>
<exclude name="**/alignment/*Test*.class"/>
<exclude name="**/disjunctivizer/*Test*.class"/>
<exclude name="**/hylo/graph/*Test*.class"/>
<exclude name="**/util/*Test*.class"/>
</fileset>
<fileset dir="${src.dir}" includes="**/*.xsl"/>
<fileset dir="${src.dir}" includes="**/*.properties"/>
<!-- for grammardoc -->
Expand All @@ -164,7 +163,7 @@
</jar>
</target>


<!-- =================================================================== -->
<!-- Creates the release file -->
<!-- -->
Expand All @@ -174,17 +173,17 @@
<!-- =================================================================== -->
<target name="release" depends="document,package">
<subant antfile="${docs.dir}/build.xml" buildpath="${basedir}"
target="clean"/>
target="clean"/>
<antcall target="clean"/>
<tar tarfile="${name}-${version}.tar">
<tarfileset mode="755"
<tarfileset mode="755"
dir="../"
includes="${name}/bin/** ${name}/ccgbank/bin/**"/>
<tarfileset dir="../"
includes="${name}/**"
<tarfileset dir="../"
includes="${name}/**"
excludes="${name}/.* **/CVS **/bin/ **/.backup.orig/ ${name}/classes/** ${name}/output/** ${name}/src/srilmbridge/** ${name}/grammars/**/test/ ${name}/grammars/**/apml/"/>
</tar>
<gzip src="${name}-${version}.tar"
<gzip src="${name}-${version}.tar"
zipfile="../${name}-${version}.tgz" />
<delete file="${name}-${version}.tar" />
</target>
Expand All @@ -199,7 +198,7 @@
<!-- 3. cd cd /home/groups/o/op/openccg/htdocs -->
<!-- 4. put index.html -->
<!-- =================================================================== -->
<target name="homepage"
<target name="homepage"
depends="init,document"
description="generates the API documentation">
<tar tarfile="${name}-homepage.tar"
Expand All @@ -219,7 +218,7 @@
<mkdir dir="${build.javadocs}"/>
<javadoc packagenames="${packages}"
destdir="${build.javadocs}"
classpathref="build.classpath"
classpathref="build.classpath"
author="true"
version="true"
use="true"
Expand All @@ -228,15 +227,15 @@
windowtitle="${name}"
doctitle="The ${Name} API v${version}"
bottom="Copyright &#169; ${year} Jason Baldridge, Gann Bierner, Michael White and additional contributors. All Rights Reserved.">
<sourcepath>
<pathelement path="${src.dir}"/>
<pathelement path="${build.gen}"/>
</sourcepath>
<link href="http://docs.oracle.com/javase/6/docs/api/"/>
<link href="http://jgrapht.org/javadoc/"/>
<sourcepath>
<pathelement path="${src.dir}"/>
<pathelement path="${build.gen}"/>
</sourcepath>
<link href="http://docs.oracle.com/javase/6/docs/api/"/>
<link href="http://jgrapht.org/javadoc/"/>
<link href="http://www.jdom.org/docs/apidocs/"/>
</javadoc>
<subant antfile="${docs.dir}/build.xml" buildpath="${basedir}"/>
</javadoc>
<subant antfile="${docs.dir}/build.xml" buildpath="${basedir}"/>
</target>


Expand All @@ -245,17 +244,17 @@
<!-- =================================================================== -->
<target name="test" depends="compile">
<javac srcdir="${test.dir}" destdir="${build.dest}"
classpathref="build.classpath" debug="on" includeAntRuntime="false"/>
classpathref="build.classpath" debug="on" includeAntRuntime="false"/>

<junit haltonerror="true" fork="off" includeantruntime="false">
<classpath>
<pathelement location="${build.dest}"/>
<pathelement path="${java.class.path}"/>
<pathelement location="${lib.dir}/jdom.jar"/>
<pathelement location="${lib.dir}/jgrapht-jdk1.6.jar"/>
<pathelement location="${lib.dir}/junit-4.10.jar"/>
<pathelement location="${lib.dir}/serializer.jar"/>
<pathelement location="${lib.dir}/trove.jar"/>
<pathelement location="${lib.dir}/jdom.jar"/>
<pathelement location="${lib.dir}/jgrapht-jdk1.6.jar"/>
<pathelement location="${lib.dir}/junit-4.10.jar"/>
<pathelement location="${lib.dir}/serializer.jar"/>
<pathelement location="${lib.dir}/trove.jar"/>
</classpath>
<formatter type="plain" usefile="false" />
<batchtest>
Expand All @@ -270,21 +269,20 @@
<!-- =================================================================== -->
<!-- Cleans targets -->
<!-- =================================================================== -->
<target name="clean"
<target name="clean"
depends="init"
description="cleans up the directory">
<delete dir="${build.dir}"/>
<subant antfile="${src.dir}/ccg2xml/build.xml" buildpath="${basedir}"
target="clean"/>
target="clean"/>
<delete>
<fileset dir="${bin.dir}" includes="*.pyc"/>
</delete>
</target>

<target name="cleandocs" depends="init" description="cleans up the API docs directory, and extra pdf docs">
<delete dir="${build.javadocs}"/>
<subant antfile="${docs.dir}/build.xml" buildpath="${basedir}"
target="clean"/>
<subant antfile="${docs.dir}/build.xml" buildpath="${basedir}" target="clean"/>
</target>

</project>
Expand Down
Empty file modified src/ccg2xml/README
100755 → 100644
View file
Open in desktop
Empty file.
Loading