Skip to content

Commit ceefe81

Browse files
Gabor AngeliStanford NLP
Gabor Angeli
authored and
Stanford NLP
committed
Compile with new requirements system
1 parent 6717eaf commit ceefe81

File tree

1,936 files changed

+815666
-163106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,936 files changed

+815666
-163106
lines changed

‎build.xml

Lines changed: 144 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<property name="compile.debug" value="true"/>
1616
<property name="compile.deprecation" value="false"/>
1717
<property name="compile.optimize" value="true"/>
18-
<property name="compile.source" value="1.6" />
19-
<property name="compile.target" value="1.6" />
18+
<property name="compile.source" value="1.8" />
19+
<property name="compile.target" value="1.8" />
2020
<property name="compile.encoding" value="utf-8" />
2121

2222
<target name="classpath" description="Sets the classpath">
@@ -26,6 +26,10 @@
2626
<include name="*.jar"/>
2727
<exclude name="javanlp*"/>
2828
</fileset>
29+
<fileset dir="${basedir}/liblocal">
30+
<include name="*.jar"/>
31+
<exclude name="javanlp*"/>
32+
</fileset>
2933
</path>
3034
</target>
3135

@@ -34,6 +38,27 @@
3438
<delete dir="${build.path}"/>
3539
</target>
3640

41+
<target name="javacceverything" depends="classpath"
42+
description="javacc everything that can be javacced">
43+
<taskdef resource="net/sf/antcontrib/antlib.xml">
44+
<classpath>
45+
<pathelement location="${project.core}/lib/ant-contrib-1.0b3.jar"/>
46+
</classpath>
47+
</taskdef>
48+
49+
<echo message="${ant.project.name}" />
50+
<for param="javacc.target">
51+
<path>
52+
<fileset dir="${source.path}">
53+
<include name="**/*.jj"/>
54+
</fileset>
55+
</path>
56+
<sequential>
57+
<javacc target="@{javacc.target}" javacchome="${basedir}/lib" />
58+
</sequential>
59+
</for>
60+
</target>
61+
3762
<target name="flexeverything" depends="classpath"
3863
description="JFlex everything that can be JFlexed">
3964
<taskdef resource="net/sf/antcontrib/antlib.xml">
@@ -42,9 +67,9 @@
4267
</classpath>
4368
</taskdef>
4469

45-
<taskdef classname="JFlex.anttask.JFlexTask" name="jflex">
70+
<taskdef classname="jflex.anttask.JFlexTask" name="jflex">
4671
<classpath>
47-
<pathelement location="${project.core}/lib/JFlex.jar"/>
72+
<pathelement location="${project.core}/lib/jflex-1.5.1.jar"/>
4873
</classpath>
4974
</taskdef>
5075

@@ -80,15 +105,37 @@
80105
<!-- <compilerarg value="-Xmaxerrs"/>
81106
<compilerarg value="20"/> -->
82107
<compilerarg value="-Xlint:cast"/>
108+
<compilerarg value="-Xlint:classfile"/>
109+
<compilerarg value="-Xlint:divzero"/>
110+
<compilerarg value="-Xlint:empty"/>
83111
<compilerarg value="-Xlint:finally"/>
84112
<compilerarg value="-Xlint:path"/>
85-
<!-- <compilerarg value="-Xlint"/>
113+
<compilerarg value="-Xlint:try"/>
114+
<!--
115+
<compilerarg value="-Xlint:deprecation"/>
116+
<compilerarg value="-Xlint:dep-ann"/>
117+
<compilerarg value="-Xlint:fallthrough"/>
118+
<compilerarg value="-Xlint:options"/>
119+
<compilerarg value="-Xlint:overrides"/>
120+
<compilerarg value="-Xlint:processing"/>
121+
<compilerarg value="-Xlint:rawtypes"/>
122+
<compilerarg value="-Xlint:serial"/>
123+
<compilerarg value="-Xlint:static"/>
124+
<compilerarg value="-Xlint:unchecked"/>
125+
<compilerarg value="-Xlint:varargs"/>
126+
-->
127+
<!-- <compilerarg value="-Xlint:all"/>
86128
<compilerarg value="-Xmaxwarns"/>
87-
<compilerarg value="10000"/> -->
129+
<compilerarg value="10000"/> -->
88130
</javac>
131+
<copy todir="${build.path}/edu/stanford/nlp/pipeline/demo">
132+
<fileset dir="${source.path}/edu/stanford/nlp/pipeline/demo">
133+
<exclude name="**/*.java"/>
134+
</fileset>
135+
</copy>
89136
</target>
90137

91-
<target name="test" depends="classpath"
138+
<target name="test" depends="classpath,compile"
92139
description="Run core unit tests">
93140
<echo message="${ant.project.name}" />
94141
<junit fork="true" maxmemory="1g" printsummary="off" outputtoformatters="false" forkmode="perBatch" haltonfailure="true">
@@ -105,7 +152,7 @@
105152
</junit>
106153
</target>
107154

108-
<target name="itest" depends="classpath"
155+
<target name="itest" depends="classpath,compile"
109156
description="Run core integration tests">
110157
<echo message="${ant.project.name}" />
111158
<junit fork="yes" maxmemory="8g" printsummary="off" outputtoformatters="false" forkmode="perTest" haltonfailure="true">
@@ -123,7 +170,7 @@
123170
</junit>
124171
</target>
125172

126-
<target name="slowitest" depends="classpath"
173+
<target name="slowitest" depends="classpath,compile"
127174
description="Run really slow integration tests">
128175
<echo message="${ant.project.name}" />
129176
<junit fork="yes" maxmemory="8g" printsummary="off" outputtoformatters="false" forkmode="perTest" haltonfailure="true">
@@ -147,7 +194,7 @@
147194
description="Clean and re-compile." />
148195

149196
<!-- This file contains the .jsp build target -->
150-
<import file="../../commonbuildjsp.xml" />
197+
<import file="commonbuildjsp.xml" />
151198

152199
<!-- This runs the specified class, using a separate Java VM -->
153200
<!-- Specify class to run via "run.class," arg, i.e., -->
@@ -212,15 +259,15 @@
212259
<echo message="Building from ${source.path}/@{webapp.path}"/>
213260

214261
<!-- First, compile the .jsp into .java -->
215-
<jasper2
262+
<jasper2
216263
validateXml="false"
217264
uriroot="${source.path}/@{webapp.path}"
218265
webXmlFragment="${source.path}/@{webapp.path}/WEB-INF/generated.xml"
219266
addWebXmlMappings="true"
220267
outputDir="${build.path}/@{webapp.path}/WEB-INF/src" />
221-
268+
222269
<mkdir dir="${build.path}/@{webapp.path}/WEB-INF/classes"/>
223-
270+
224271
<!-- Then compile the .java into .class -->
225272
<javac destdir="${build.path}/@{webapp.path}/WEB-INF/classes"
226273
optimize="${compile.optimize}"
@@ -258,16 +305,16 @@
258305
<include name="javanlp-core.jar"/>
259306
</lib>
260307
<lib dir="${basedir}/lib">
261-
<include name="commons-lang-2.5.jar"/>
262-
<include name="xom-1.2.7.jar"/>
308+
<include name="commons-lang3-3.1.jar"/>
309+
<include name="xom-1.2.10.jar"/>
263310
<include name="joda-time.jar"/>
264-
<include name="jollyday.jar"/>
311+
<include name="jollyday-0.4.7.jar"/>
265312
</lib>
266313
<zipfileset prefix="WEB-INF/data"
267-
file="/u/nlp/data/pos-tagger/english/english-left3words-distsim.tagger"/>
314+
file="/u/nlp/data/pos-tagger/distrib/english-left3words-distsim.tagger"/>
268315
<zipfileset prefix="WEB-INF/data/rules"
269316
file="${source.path}/edu/stanford/nlp/time/rules/*"/>
270-
<zipfileset prefix="WEB-INF/classes/holidays"
317+
<zipfileset prefix="WEB-INF/data/holidays"
271318
file="${source.path}/edu/stanford/nlp/time/holidays/*"/>
272319
<zipfileset file="${data.path}/webapps/favicon.ico"/>
273320
<zipfileset file="${source.path}/edu/stanford/nlp/time/suservlet/header.jsp"/>
@@ -278,13 +325,59 @@
278325
<zipfileset file="${source.path}/edu/stanford/nlp/time/suservlet/prototype.js"/>
279326
</war>
280327
</target>
328+
329+
<target name="openie.war" depends="compile,jar"
330+
description="build the openie webapp">
331+
<war destfile="openie.war"
332+
webxml="${source.path}/edu/stanford/nlp/naturalli/demo/web.xml">
333+
<lib dir=".">
334+
<include name="javanlp-core.jar"/>
335+
</lib>
336+
<zipfileset prefix="WEB-INF/data"
337+
file="/u/nlp/data/pos-tagger/distrib/english-left3words-distsim.tagger"/>
338+
<zipfileset prefix="WEB-INF/data"
339+
file="${source.path}/edu/stanford/nlp/time/rules/*"/>
340+
<zipfileset prefix="WEB-INF/data"
341+
file="${source.path}/edu/stanford/nlp/time/holidays/*"/>
342+
<zipfileset prefix="WEB-INF/data"
343+
file="/u/nlp/data/ner/goodClassifiers/english.all.3class.distsim.crf.ser.gz"/>
344+
<zipfileset prefix="WEB-INF/data"
345+
file="/u/nlp/data/ner/goodClassifiers/english.conll.4class.distsim.crf.ser.gz"/>
346+
<zipfileset prefix="WEB-INF/data"
347+
file="/u/nlp/data/ner/goodClassifiers/english.muc.7class.distsim.crf.ser.gz"/>
348+
<zipfileset prefix="WEB-INF/data"
349+
file="/u/nlp/data/depparser/nn/distrib/english_SD.gz"/>
350+
<zipfileset prefix="WEB-INF/data"
351+
file="/u/nlp/data/lexparser/englishPCFG.ser.gz"/>
352+
<zipfileset prefix="WEB-INF/data"
353+
file="/home/gabor/workspace/naturalli/etc/clauseSplitterModel.ser.gz"/>
354+
<zipfileset prefix="WEB-INF/data"
355+
file="/home/gabor/workspace/naturalli/etc/pp.tab.gz"/>
356+
<zipfileset prefix="WEB-INF/data"
357+
file="/home/gabor/workspace/naturalli/etc/obj.tab.gz"/>
358+
<zipfileset prefix="WEB-INF/data"
359+
file="/home/gabor/workspace/naturalli/etc/privative.tab.gz"/>
360+
<zipfileset prefix="WEB-INF/data"
361+
file="/home/gabor/workspace/naturalli/etc/subj_obj_pp.tab.gz"/>
362+
<zipfileset prefix="WEB-INF/data"
363+
file="/home/gabor/workspace/naturalli/etc/subj_pp_obj.tab.gz"/>
364+
<zipfileset prefix="WEB-INF/data"
365+
file="/home/gabor/workspace/naturalli/etc/subj_pp_pp.tab.gz"/>
366+
<zipfileset prefix="WEB-INF/data"
367+
file="/home/gabor/workspace/naturalli/etc/subj_pp.tab.gz"/>
368+
</war>
369+
</target>
281370

282371
<target name="parser.war" depends="compile,jar"
283372
description="build the parser webapp">
284373
<buildjsp webapp.path="edu/stanford/nlp/parser/webapp"
285374
webapp.war="parser.war"
286375
webapp.jar="javanlp-core.jar">
287-
<webapp.lib/> <!-- don't need anything! -->
376+
<webapp.lib>
377+
<lib dir="/u/nlp/data/StanfordCoreNLPModels">
378+
<include name="stanford-spanish-corenlp-models-current.jar"/>
379+
</lib>
380+
</webapp.lib>
288381
<webapp.data>
289382
<zipfileset prefix="WEB-INF/data"
290383
file="/u/nlp/data/lexparser/englishPCFG.ser.gz"/>
@@ -296,6 +389,8 @@
296389
file="/u/nlp/data/gale/segtool/stanford-seg/classifiers-2010/05202008-ctb6.processed-chris6.lex.gz"/>
297390
<zipfileset prefix="WEB-INF/data/chinesesegmenter"
298391
dir="/u/nlp/data/gale/segtool/stanford-seg/releasedata"/>
392+
<zipfileset prefix="WEB-INF/data"
393+
file="/u/nlp/data/lexparser/spanishPCFG.ser.gz"/>
299394
<zipfileset file="${data.path}/webapps/favicon.ico"/>
300395
</webapp.data>
301396
</buildjsp>
@@ -312,7 +407,7 @@
312407
<include name="javanlp-core.jar"/>
313408
</lib>
314409
<lib dir="${basedir}/lib">
315-
<include name="commons-lang-2.5.jar"/>
410+
<include name="commons-lang3-3.1.jar"/>
316411
</lib>
317412
<zipfileset file="${source.path}/edu/stanford/nlp/ie/ner/webapp/ner.jsp"/>
318413
<zipfileset file="${source.path}/edu/stanford/nlp/ie/ner/webapp/header.jsp"/>
@@ -342,18 +437,16 @@
342437
<include name="javanlp-core.jar"/>
343438
</lib>
344439
<lib dir="${basedir}/lib">
345-
<include name="commons-lang-2.5.jar"/>
346-
<include name="xom-1.2.8.jar"/>
347-
<include name="xalan.jar"/>
348-
<include name="serializer.jar"/>
349-
<include name="xercesImpl.jar"/>
440+
<include name="commons-lang3-3.1.jar"/>
441+
<include name="xom-1.2.10.jar"/>
350442
<include name="xml-apis.jar"/>
351443
<include name="joda-time.jar"/>
352444
<include name="jollyday-0.4.7.jar"/>
353445
</lib>
354446
<!-- note for John: c:/Users/John Bauer/nlp/stanford-releases -->
355447
<lib dir="/u/nlp/data/StanfordCoreNLPModels">
356448
<include name="stanford-corenlp-models-current.jar"/>
449+
<include name="stanford-chinese-corenlp-models-current.jar"/>
357450
</lib>
358451
<classes dir="${source.path}/edu/stanford/nlp/pipeline">
359452
<include name="StanfordCoreNLP.properties"/>
@@ -367,5 +460,30 @@
367460
</war>
368461
</target>
369462

370-
</project>
463+
<property environment="env" />
464+
465+
<condition property="version1.7">
466+
<equals arg1="${ant.java.version}" arg2="1.7" />
467+
</condition>
468+
469+
<target name="tregex-osx" if="version1.7" depends="jar"
470+
description="Build an OS X app for TregexGUI">
471+
<fail unless="env.JAVA_HOME"
472+
message="Environment variable JAVA_HOME not set." />
473+
474+
<taskdef name="bundleapp"
475+
classname="com.oracle.appbundler.AppBundlerTask"
476+
classpath="lib/appbundler-1.0.jar" />
371477

478+
<bundleapp outputdirectory="."
479+
name="Stanford Tregex"
480+
displayname="Stanford Tregex"
481+
icon="doc/tregex/nlp-logo-6x6.icns"
482+
identifier="edu.stanford.nlp.trees.tregex.gui.TregexGUI"
483+
mainclassname="edu.stanford.nlp.trees.tregex.gui.TregexGUI">
484+
<runtime dir="${env.JAVA_HOME}" />
485+
<classpath file="javanlp-core.jar" />
486+
</bundleapp>
487+
</target>
488+
489+
</project>

‎data/README

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
README for data
22
---------------
3+
34
Small data files (test files, properties files, etc) can go here.
45

5-
Don't put large models here. That would cause svn to bloat too much.
6+
Don't put large models here. That would cause git to bloat too much.
7+
8+
Open source: Don't put here any file that is copyright or that we
9+
don't have the rights to rights to redistribute. The contents of this
10+
directory appear in our public github repository.
611

712
Contact: John Bauer ([email protected])
813
Last Modified: 2010-10-27

‎data/edu/stanford/nlp/classify/iris.gold

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
5 Iris-setosa Iris-setosa 0.995615365125735
2-
4.6 Iris-setosa Iris-setosa 0.9994804135630505
3-
5.1 Iris-setosa Iris-setosa 0.9937095680980086
4-
4.9 Iris-setosa Iris-setosa 0.9905109629700247
5-
5.4 Iris-setosa Iris-setosa 0.9982151488134486
6-
4.4 Iris-setosa Iris-setosa 0.9944214428148407
7-
5.3 Iris-setosa Iris-setosa 0.9984497925740373
8-
6.1 Iris-versicolor Iris-versicolor 0.8873152482428373
9-
6 Iris-versicolor Iris-versicolor 0.9424246013278404
10-
5.5 Iris-versicolor Iris-versicolor 0.9030026595536319
11-
6.5 Iris-versicolor Iris-versicolor 0.928816167001929
12-
6.8 Iris-versicolor Iris-versicolor 0.9569376555329442
13-
6.2 Iris-versicolor Iris-versicolor 0.9857141927233324
14-
6.7 Iris-virginica Iris-virginica 0.9698639532763317
15-
6.4 Iris-virginica Iris-virginica 0.8982390073296296
16-
5.7 Iris-virginica Iris-virginica 0.9920401400173403
17-
6.7 Iris-virginica Iris-virginica 0.968576539063806
18-
6.8 Iris-virginica Iris-virginica 0.9957320369272686
19-
7.7 Iris-virginica Iris-virginica 0.9900526044768513
20-
7.3 Iris-virginica Iris-virginica 0.9766204287594443
1+
5 Iris-setosa Iris-setosa 0.996 0.996
2+
4.6 Iris-setosa Iris-setosa 0.999 0.999
3+
5.1 Iris-setosa Iris-setosa 0.994 0.994
4+
4.9 Iris-setosa Iris-setosa 0.991 0.991
5+
5.4 Iris-setosa Iris-setosa 0.998 0.998
6+
4.4 Iris-setosa Iris-setosa 0.994 0.994
7+
5.3 Iris-setosa Iris-setosa 0.998 0.998
8+
6.1 Iris-versicolor Iris-versicolor 0.887 0.887
9+
6 Iris-versicolor Iris-versicolor 0.942 0.942
10+
5.5 Iris-versicolor Iris-versicolor 0.903 0.903
11+
6.5 Iris-versicolor Iris-versicolor 0.929 0.929
12+
6.8 Iris-versicolor Iris-versicolor 0.957 0.957
13+
6.2 Iris-versicolor Iris-versicolor 0.986 0.986
14+
6.7 Iris-virginica Iris-virginica 0.970 0.970
15+
6.4 Iris-virginica Iris-virginica 0.898 0.898
16+
5.7 Iris-virginica Iris-virginica 0.992 0.992
17+
6.7 Iris-virginica Iris-virginica 0.969 0.969
18+
6.8 Iris-virginica Iris-virginica 0.996 0.996
19+
7.7 Iris-virginica Iris-virginica 0.990 0.990
20+
7.3 Iris-virginica Iris-virginica 0.977 0.977

0 commit comments

Comments
 (0)