From 349c4971b4b6505472cabea7c36676df244fce22 Mon Sep 17 00:00:00 2001
From: Christopher Manning <manning@cs.stanford.edu>
Date: Wed, 9 May 2018 20:21:59 -0700
Subject: [PATCH] Update and make more consistent the various distribution
 build files.

---
 doc/classify/build.xml  | 32 ++++++++++++++-----
 doc/corenlp/build.xml   | 63 +++++++++++++++++++++++++++++++++++--
 doc/lexparser/build.xml | 59 +++++++++++++++++-----------------
 doc/ner/build.xml       | 69 ++++++++++++++++++++--------------------
 doc/openie/build.xml    | 70 ++++++++++++++++++++++-------------------
 doc/segmenter/build.xml | 32 ++++++++++++++-----
 doc/tagger/build.xml    | 70 ++++++++++++++++++++++-------------------
 doc/tregex/build.xml    | 61 +++++++++++++++++------------------
 8 files changed, 280 insertions(+), 176 deletions(-)

diff --git a/doc/classify/build.xml b/doc/classify/build.xml
index c2940e8587..4057f23d7e 100644
--- a/doc/classify/build.xml
+++ b/doc/classify/build.xml
@@ -1,5 +1,7 @@
 <!-- build.xml file for ant for JavaNLP -->
 
+<!-- Before using this, unjar the sources' jar file into the src/ directory! -->
+
 <!-- A "project" describes a set of targets that may be requested
      when Ant is executed.  The "default" attribute defines the
      target which is executed if no specific target is requested,
@@ -105,6 +107,7 @@
       <classpath>
         <fileset dir="${basedir}">
           <include name="*.jar"/>
+          <exclude name="javanlp*"/>
         </fileset>
       </classpath>
       <!-- <compilerarg value="-Xlint"/> -->
@@ -137,14 +140,29 @@
     <mkdir          dir="${javadoc.home}"/>
     <javadoc sourcepath="${src.home}"
                 destdir="${javadoc.home}"
-              maxmemory="768m"
+              maxmemory="1g"
                  author="true"
-                 source="1.8"
-                Overview="${src.home}/edu/stanford/nlp/overview.html"
-                Doctitle="Stanford JavaNLP API Documentation"
-             Windowtitle="Stanford JavaNLP API"
-           packagenames="*">
-      <bottom><![CDATA[<font size="2"><a href=\"http://nlp.stanford.edu\">Stanford NLP Group</a></font>]]></bottom>
+                 source="${compile.source}"
+                overview="${src.home}/edu/stanford/nlp/overview.html"
+                doctitle="Stanford JavaNLP API Documentation"
+             windowtitle="Stanford JavaNLP API"
+             encoding="${compile.encoding}"
+	     docencoding="${compile.encoding}"
+	     charset="${compile.encoding}"
+            packagenames="*">
+      <!-- Allow @generated, @modifiable and @ordered tags -->
+      <tag name="generated" scope="all" description="Generated" />
+      <tag name="modifiable" scope="all" description="Modifiable" />
+      <tag name="ordered" scope="all" description="Ordered" />
+      <!-- Depends on lib and classes folders -->
+      <classpath>
+        <fileset dir="${basedir}">
+          <include name="*.jar"/>
+          <exclude name="javanlp*"/>
+        </fileset>
+        <pathelement path="${build.home}" />
+      </classpath>
+      <bottom><![CDATA[<font size="2"><a href="https://nlp.stanford.edu" target="_top">Stanford NLP Group</a></font>]]></bottom>
       <link href="https://docs.oracle.com/javase/8/docs/api/"/>
     </javadoc>
 
diff --git a/doc/corenlp/build.xml b/doc/corenlp/build.xml
index b29a3254a7..fe50ea40b7 100644
--- a/doc/corenlp/build.xml
+++ b/doc/corenlp/build.xml
@@ -14,7 +14,9 @@
 
   <property name="build.home"    value="${basedir}/classes"/>
   <property name="build.tests"    value="${basedir}/classes"/>
+  <property name="docs.home"     value="${basedir}/docs"/>
   <property name="src.home"      value="${basedir}/src"/>
+  <property name="javadoc.home"  value="${basedir}/javadoc"/>
 
 
 <!--  ==================== Compilation Control Options ==================== -->
@@ -38,10 +40,10 @@
 
   <property name="compile.debug"       value="true"/>
   <property name="compile.deprecation" value="false"/>
-  <property name="compile.encoding"    value="utf-8" />
   <property name="compile.optimize"    value="true"/>
   <property name="compile.source"      value="1.8" />
   <property name="compile.target"      value="1.8" />
+  <property name="compile.encoding"    value="utf-8" />
 
 
 
@@ -94,11 +96,12 @@
     <javac srcdir="${src.home}"
           destdir="${build.home}"
             debug="${compile.debug}"
-      deprecation="${compile.deprecation}"
          encoding="${compile.encoding}" 
+      deprecation="${compile.deprecation}"
          optimize="${compile.optimize}"
 	   source="${compile.source}"
-           target="${compile.target}">
+           target="${compile.target}"
+            includeantruntime="false">
       <compilerarg value="-Xmaxerrs"/>
       <compilerarg value="20"/>
       <classpath>
@@ -109,6 +112,60 @@
       </classpath>
       <!-- <compilerarg value="-Xlint"/> -->
     </javac>
+
+    <!-- Copy application resources -->
+<!--
+    <copy  todir="${build.home}/WEB-INF/classes">
+      <fileset dir="${src.home}" excludes="**/*.java"/>
+    </copy>
+-->
+
+  </target>
+
+
+<!-- ==================== Javadoc Target ================================== -->
+
+<!--
+
+  The "javadoc" target creates Javadoc API documentation for the Java
+  classes included in your application.  Normally, this is only required
+  when preparing a distribution release, but is available as a separate
+  target in case the developer wants to create Javadocs independently.
+
+-->
+
+  <target name="javadoc" depends="compile"
+   description="Create Javadoc API documentation">
+
+    <mkdir          dir="${javadoc.home}"/>
+    <javadoc sourcepath="${src.home}"
+                destdir="${javadoc.home}"
+              maxmemory="1g"
+                 author="true"
+                 source="${compile.source}"
+                overview="${src.home}/edu/stanford/nlp/overview.html"
+                doctitle="Stanford JavaNLP API Documentation"
+             windowtitle="Stanford JavaNLP API"
+             encoding="${compile.encoding}"
+	     docencoding="${compile.encoding}"
+	     charset="${compile.encoding}"
+            packagenames="*">
+      <!-- Allow @generated, @modifiable and @ordered tags -->
+      <tag name="generated" scope="all" description="Generated" />
+      <tag name="modifiable" scope="all" description="Modifiable" />
+      <tag name="ordered" scope="all" description="Ordered" />
+      <!-- Depends on lib and classes folders -->
+      <classpath>
+        <fileset dir="${basedir}">
+          <include name="*.jar"/>
+          <exclude name="stanford-corenlp*"/>
+        </fileset>
+        <pathelement path="${build.home}" />
+      </classpath>
+      <bottom><![CDATA[<font size="2"><a href="https://nlp.stanford.edu" target="_top">Stanford NLP Group</a></font>]]></bottom>
+      <link href="https://docs.oracle.com/javase/8/docs/api/"/>
+    </javadoc>
+
   </target>
 
 
diff --git a/doc/lexparser/build.xml b/doc/lexparser/build.xml
index 483bd985a6..d02aa642e1 100644
--- a/doc/lexparser/build.xml
+++ b/doc/lexparser/build.xml
@@ -74,27 +74,6 @@
   </target>
 
 
-<!-- ==================== Classpath Targets ==================================== -->
-
-<!--
-
-  Sets the classpath for this project properly. We now always use the
-  lib dir within javanlp.
-
--->
-
-  <target name="classpath" description="Sets the classpath">
-      <path id="compile.classpath">
-        <fileset dir="${basedir}">
-          <include name="*.jar"/>
-          <exclude name="stanford-parser*"/>
-        </fileset>
-      </path>
-  </target>
-
-
-
-
 
 <!-- ==================== Compile Target ================================== -->
 
@@ -107,7 +86,7 @@
 
 -->
 
-  <target name="compile" depends="prepare,classpath"
+  <target name="compile" depends="prepare"
    description="Compile Java sources">
 
     <!-- Compile Java classes as necessary -->
@@ -121,9 +100,14 @@
 	   source="${compile.source}"
            target="${compile.target}"
             includeantruntime="false">
-        <classpath refid="compile.classpath"/>
       <compilerarg value="-Xmaxerrs"/>
       <compilerarg value="20"/>
+      <classpath>
+        <fileset dir="${basedir}">
+          <include name="*.jar"/>
+          <exclude name="stanford-parser*"/>
+        </fileset>
+      </classpath>
       <!-- <compilerarg value="-Xlint"/> -->
     </javac>
 
@@ -154,14 +138,29 @@
     <mkdir          dir="${javadoc.home}"/>
     <javadoc sourcepath="${src.home}"
                 destdir="${javadoc.home}"
-              maxmemory="768m"
+              maxmemory="1g"
                  author="true"
-                 source="1.8"
-                Overview="${src.home}/edu/stanford/nlp/overview.html"
-                Doctitle="Stanford JavaNLP API Documentation"
-             Windowtitle="Stanford JavaNLP API"
-           packagenames="*">
-      <bottom><![CDATA[<font size="2"><a href=\"http://nlp.stanford.edu\">Stanford NLP Group</a></font>]]></bottom>
+                 source="${compile.source}"
+                overview="${src.home}/edu/stanford/nlp/overview.html"
+                doctitle="Stanford JavaNLP API Documentation"
+             windowtitle="Stanford JavaNLP API"
+             encoding="${compile.encoding}"
+	     docencoding="${compile.encoding}"
+	     charset="${compile.encoding}"
+            packagenames="*">
+      <!-- Allow @generated, @modifiable and @ordered tags -->
+      <tag name="generated" scope="all" description="Generated" />
+      <tag name="modifiable" scope="all" description="Modifiable" />
+      <tag name="ordered" scope="all" description="Ordered" />
+      <!-- Depends on lib and classes folders -->
+      <classpath>
+        <fileset dir="${basedir}">
+          <include name="*.jar"/>
+          <exclude name="stanford-parser*"/>
+        </fileset>
+        <pathelement path="${build.home}" />
+      </classpath>
+      <bottom><![CDATA[<font size="2"><a href="https://nlp.stanford.edu" target="_top">Stanford NLP Group</a></font>]]></bottom>
       <link href="https://docs.oracle.com/javase/8/docs/api/"/>
     </javadoc>
 
diff --git a/doc/ner/build.xml b/doc/ner/build.xml
index fb8e0711b2..a45bc1733e 100644
--- a/doc/ner/build.xml
+++ b/doc/ner/build.xml
@@ -1,5 +1,7 @@
 <!-- build.xml file for ant for JavaNLP -->
 
+<!-- Before using this, unjar the sources' jar file into the src/ directory! -->
+
 <!-- A "project" describes a set of targets that may be requested
      when Ant is executed.  The "default" attribute defines the
      target which is executed if no specific target is requested,
@@ -41,6 +43,7 @@
   <property name="compile.optimize"    value="true"/>
   <property name="compile.source"      value="1.8" />
   <property name="compile.target"      value="1.8" />
+  <property name="compile.encoding"      value="utf-8" />
 
 
 
@@ -55,7 +58,7 @@
 -->
 
   <target name="all" depends="clean,compile"
-    description="Clean build and dist directories, then compile"/>
+   description="Clean build and dist directories, then compile"/>
 
 
 
@@ -73,27 +76,6 @@
   </target>
 
 
-<!-- ==================== Classpath Targets ==================================== -->
-
-<!--
-
-  Sets the classpath for this project properly. We now always use the
-  lib dir within javanlp.
-
--->
-
-  <target name="classpath" description="Sets the classpath">
-      <path id="compile.classpath">
-        <fileset dir="${basedir}/lib">
-          <include name="*.jar"/>
-          <exclude name="javanlp*"/>
-        </fileset>
-      </path>
-  </target>
-
-
-
-
 
 <!-- ==================== Compile Target ================================== -->
 
@@ -106,7 +88,7 @@
 
 -->
 
-  <target name="compile" depends="prepare,classpath"
+  <target name="compile" depends="prepare"
    description="Compile Java sources">
 
     <!-- Compile Java classes as necessary -->
@@ -114,15 +96,20 @@
     <javac srcdir="${src.home}"
           destdir="${build.home}"
             debug="${compile.debug}"
-         encoding="utf-8"
+         encoding="${compile.encoding}"
       deprecation="${compile.deprecation}"
-includeantruntime="false"
          optimize="${compile.optimize}"
 	   source="${compile.source}"
-           target="${compile.target}">
-        <classpath refid="compile.classpath"/>
+           target="${compile.target}"
+            includeantruntime="false">
       <compilerarg value="-Xmaxerrs"/>
       <compilerarg value="20"/>
+      <classpath>
+        <fileset dir="${basedir}/lib">
+          <include name="*.jar"/>
+          <exclude name="javanlp*"/>
+        </fileset>
+      </classpath>
       <!-- <compilerarg value="-Xlint"/> -->
     </javac>
 
@@ -148,25 +135,37 @@ includeantruntime="false"
 -->
 
   <target name="javadoc" depends="compile"
-    description="Create Javadoc API documentation">
+   description="Create Javadoc API documentation">
+
     <mkdir          dir="${javadoc.home}"/>
     <javadoc sourcepath="${src.home}"
                 destdir="${javadoc.home}"
-              maxmemory="768m"
+              maxmemory="1g"
                  author="true"
                  source="${compile.source}"
-               Overview="${src.home}/edu/stanford/nlp/overview.html"
-               Doctitle="Stanford JavaNLP API Documentation"
-            Windowtitle="Stanford JavaNLP API"
-           packagenames="*">
-      <bottom><![CDATA[<FONT SIZE=2><A HREF=\"http://nlp.stanford.edu\">Stanford NLP Group</A></FONT>]]></bottom>
-      <link href="https://docs.oracle.com/javase/8/docs/api/"/>
+                overview="${src.home}/edu/stanford/nlp/overview.html"
+                doctitle="Stanford JavaNLP API Documentation"
+             windowtitle="Stanford JavaNLP API"
+             encoding="${compile.encoding}"
+	     docencoding="${compile.encoding}"
+	     charset="${compile.encoding}"
+            packagenames="*">
+      <!-- Allow @generated, @modifiable and @ordered tags -->
+      <tag name="generated" scope="all" description="Generated" />
+      <tag name="modifiable" scope="all" description="Modifiable" />
+      <tag name="ordered" scope="all" description="Ordered" />
+      <!-- Depends on lib and classes folders -->
       <classpath>
         <fileset dir="${basedir}/lib">
           <include name="*.jar"/>
+          <exclude name="javanlp*"/>
         </fileset>
+        <pathelement path="${build.home}" />
       </classpath>
+      <bottom><![CDATA[<font size="2"><a href="https://nlp.stanford.edu" target="_top">Stanford NLP Group</a></font>]]></bottom>
+      <link href="https://docs.oracle.com/javase/8/docs/api/"/>
     </javadoc>
+
   </target>
 
 
diff --git a/doc/openie/build.xml b/doc/openie/build.xml
index 2fd8146f4f..9e049733a9 100644
--- a/doc/openie/build.xml
+++ b/doc/openie/build.xml
@@ -1,5 +1,7 @@
 <!-- build.xml file for ant for JavaNLP -->
 
+<!-- Before using this, unjar the sources' jar file into the src/ directory! -->
+
 <!-- A "project" describes a set of targets that may be requested
      when Ant is executed.  The "default" attribute defines the
      target which is executed if no specific target is requested,
@@ -41,6 +43,9 @@
   <property name="compile.optimize"    value="true"/>
   <property name="compile.source"      value="1.8" />
   <property name="compile.target"      value="1.8" />
+  <property name="compile.encoding"      value="utf-8" />
+
+
 
 
 <!-- ==================== All Target ====================================== -->
@@ -71,27 +76,6 @@
   </target>
 
 
-<!-- ==================== Classpath Targets ==================================== -->
-
-<!--
-
-  Sets the classpath for this project properly. We now always use the
-  lib dir within javanlp.
-
--->
-
-  <target name="classpath" description="Sets the classpath">
-      <path id="compile.classpath">
-       <!-- <fileset dir="${basedir}/lib">
-          <include name="*.jar"/>
-          <exclude name="javanlp*"/>
-        </fileset> -->
-      </path>
-  </target>
-
-
-
-
 
 <!-- ==================== Compile Target ================================== -->
 
@@ -104,7 +88,7 @@
 
 -->
 
-  <target name="compile" depends="prepare,classpath"
+  <target name="compile" depends="prepare"
    description="Compile Java sources">
 
     <!-- Compile Java classes as necessary -->
@@ -112,15 +96,20 @@
     <javac srcdir="${src.home}"
           destdir="${build.home}"
             debug="${compile.debug}"
-         encoding="utf-8" 
+         encoding="${compile.encoding}"
       deprecation="${compile.deprecation}"
          optimize="${compile.optimize}"
 	   source="${compile.source}"
            target="${compile.target}"
-includeantruntime="false">
-        <classpath refid="compile.classpath"/>
+            includeantruntime="false">
       <compilerarg value="-Xmaxerrs"/>
       <compilerarg value="20"/>
+      <classpath>
+        <fileset dir="${basedir}/lib">
+          <include name="*.jar"/>
+          <exclude name="javanlp*"/>
+        </fileset>
+      </classpath>
       <!-- <compilerarg value="-Xlint"/> -->
     </javac>
 
@@ -133,6 +122,7 @@ includeantruntime="false">
 
   </target>
 
+
 <!-- ==================== Jar Target ================================== -->
 
 <!--
@@ -169,14 +159,30 @@ includeantruntime="false">
     <mkdir          dir="${javadoc.home}"/>
     <javadoc sourcepath="${src.home}"
                 destdir="${javadoc.home}"
-              maxmemory="768m"
+              maxmemory="1g"
                  author="true"
-                 source="1.8"
-                Doctitle="Stanford JavaNLP API Documentation"
-             Windowtitle="Stanford JavaNLP API"
-           packagenames="*">
-      <bottom><![CDATA[<FONT SIZE=2><A HREF=\"http://nlp.stanford.edu\">Stanford NLP Group</A></FONT>]]></bottom>
-      <link href="http://docs.oracle.com/javase/8/docs/api/"/>
+                 source="${compile.source}"
+                overview="${src.home}/edu/stanford/nlp/overview.html"
+                doctitle="Stanford JavaNLP API Documentation"
+             windowtitle="Stanford JavaNLP API"
+             encoding="${compile.encoding}"
+	     docencoding="${compile.encoding}"
+	     charset="${compile.encoding}"
+            packagenames="*">
+      <!-- Allow @generated, @modifiable and @ordered tags -->
+      <tag name="generated" scope="all" description="Generated" />
+      <tag name="modifiable" scope="all" description="Modifiable" />
+      <tag name="ordered" scope="all" description="Ordered" />
+      <!-- Depends on lib and classes folders -->
+      <classpath>
+        <fileset dir="${basedir}/lib">
+          <include name="*.jar"/>
+          <exclude name="javanlp*"/>
+        </fileset>
+        <pathelement path="${build.home}" />
+      </classpath>
+      <bottom><![CDATA[<font size="2"><a href="https://nlp.stanford.edu" target="_top">Stanford NLP Group</a></font>]]></bottom>
+      <link href="https://docs.oracle.com/javase/8/docs/api/"/>
     </javadoc>
 
   </target>
diff --git a/doc/segmenter/build.xml b/doc/segmenter/build.xml
index c2940e8587..4057f23d7e 100644
--- a/doc/segmenter/build.xml
+++ b/doc/segmenter/build.xml
@@ -1,5 +1,7 @@
 <!-- build.xml file for ant for JavaNLP -->
 
+<!-- Before using this, unjar the sources' jar file into the src/ directory! -->
+
 <!-- A "project" describes a set of targets that may be requested
      when Ant is executed.  The "default" attribute defines the
      target which is executed if no specific target is requested,
@@ -105,6 +107,7 @@
       <classpath>
         <fileset dir="${basedir}">
           <include name="*.jar"/>
+          <exclude name="javanlp*"/>
         </fileset>
       </classpath>
       <!-- <compilerarg value="-Xlint"/> -->
@@ -137,14 +140,29 @@
     <mkdir          dir="${javadoc.home}"/>
     <javadoc sourcepath="${src.home}"
                 destdir="${javadoc.home}"
-              maxmemory="768m"
+              maxmemory="1g"
                  author="true"
-                 source="1.8"
-                Overview="${src.home}/edu/stanford/nlp/overview.html"
-                Doctitle="Stanford JavaNLP API Documentation"
-             Windowtitle="Stanford JavaNLP API"
-           packagenames="*">
-      <bottom><![CDATA[<font size="2"><a href=\"http://nlp.stanford.edu\">Stanford NLP Group</a></font>]]></bottom>
+                 source="${compile.source}"
+                overview="${src.home}/edu/stanford/nlp/overview.html"
+                doctitle="Stanford JavaNLP API Documentation"
+             windowtitle="Stanford JavaNLP API"
+             encoding="${compile.encoding}"
+	     docencoding="${compile.encoding}"
+	     charset="${compile.encoding}"
+            packagenames="*">
+      <!-- Allow @generated, @modifiable and @ordered tags -->
+      <tag name="generated" scope="all" description="Generated" />
+      <tag name="modifiable" scope="all" description="Modifiable" />
+      <tag name="ordered" scope="all" description="Ordered" />
+      <!-- Depends on lib and classes folders -->
+      <classpath>
+        <fileset dir="${basedir}">
+          <include name="*.jar"/>
+          <exclude name="javanlp*"/>
+        </fileset>
+        <pathelement path="${build.home}" />
+      </classpath>
+      <bottom><![CDATA[<font size="2"><a href="https://nlp.stanford.edu" target="_top">Stanford NLP Group</a></font>]]></bottom>
       <link href="https://docs.oracle.com/javase/8/docs/api/"/>
     </javadoc>
 
diff --git a/doc/tagger/build.xml b/doc/tagger/build.xml
index d3d643ec52..d7e1b960c2 100644
--- a/doc/tagger/build.xml
+++ b/doc/tagger/build.xml
@@ -1,5 +1,7 @@
 <!-- build.xml file for ant for JavaNLP -->
 
+<!-- Before using this, unjar the sources' jar file into the src/ directory! -->
+
 <!-- A "project" describes a set of targets that may be requested
      when Ant is executed.  The "default" attribute defines the
      target which is executed if no specific target is requested,
@@ -41,6 +43,9 @@
   <property name="compile.optimize"    value="true"/>
   <property name="compile.source"      value="1.8" />
   <property name="compile.target"      value="1.8" />
+  <property name="compile.encoding"      value="utf-8" />
+
+
 
 
 <!-- ==================== All Target ====================================== -->
@@ -71,27 +76,6 @@
   </target>
 
 
-<!-- ==================== Classpath Targets ==================================== -->
-
-<!--
-
-  Sets the classpath for this project properly. We now always use the
-  lib dir within javanlp.
-
--->
-
-  <target name="classpath" description="Sets the classpath">
-      <path id="compile.classpath">
-        <!--fileset dir="${basedir}/lib">
-          <include name="*.jar"/>
-          <exclude name="javanlp*"/>
-        </fileset--> 
-      </path>
-  </target>
-
-
-
-
 
 <!-- ==================== Compile Target ================================== -->
 
@@ -104,7 +88,7 @@
 
 -->
 
-  <target name="compile" depends="prepare,classpath"
+  <target name="compile" depends="prepare"
    description="Compile Java sources">
 
     <!-- Compile Java classes as necessary -->
@@ -112,15 +96,20 @@
     <javac srcdir="${src.home}"
           destdir="${build.home}"
             debug="${compile.debug}"
-         encoding="utf-8" 
+         encoding="${compile.encoding}"
       deprecation="${compile.deprecation}"
          optimize="${compile.optimize}"
 	   source="${compile.source}"
            target="${compile.target}"
-includeantruntime="false">
-        <classpath refid="compile.classpath"/>
+            includeantruntime="false">
       <compilerarg value="-Xmaxerrs"/>
       <compilerarg value="20"/>
+      <classpath>
+        <fileset dir="${basedir}/lib">
+          <include name="*.jar"/>
+          <exclude name="javanlp*"/>
+        </fileset>
+      </classpath>
       <!-- <compilerarg value="-Xlint"/> -->
     </javac>
 
@@ -133,6 +122,7 @@ includeantruntime="false">
 
   </target>
 
+
 <!-- ==================== Jar Target ================================== -->
 
 <!--
@@ -169,14 +159,30 @@ includeantruntime="false">
     <mkdir          dir="${javadoc.home}"/>
     <javadoc sourcepath="${src.home}"
                 destdir="${javadoc.home}"
-              maxmemory="768m"
+              maxmemory="1g"
                  author="true"
-                 source="1.8"
-                Doctitle="Stanford JavaNLP API Documentation"
-             Windowtitle="Stanford JavaNLP API"
-           packagenames="*">
-      <bottom><![CDATA[<FONT SIZE=2><A HREF=\"http://nlp.stanford.edu\">Stanford NLP Group</A></FONT>]]></bottom>
-      <link href="http://docs.oracle.com/javase/8/docs/api/"/>
+                 source="${compile.source}"
+                overview="${src.home}/edu/stanford/nlp/overview.html"
+                doctitle="Stanford JavaNLP API Documentation"
+             windowtitle="Stanford JavaNLP API"
+             encoding="${compile.encoding}"
+	     docencoding="${compile.encoding}"
+	     charset="${compile.encoding}"
+            packagenames="*">
+      <!-- Allow @generated, @modifiable and @ordered tags -->
+      <tag name="generated" scope="all" description="Generated" />
+      <tag name="modifiable" scope="all" description="Modifiable" />
+      <tag name="ordered" scope="all" description="Ordered" />
+      <!-- Depends on lib and classes folders -->
+      <classpath>
+        <fileset dir="${basedir}/lib">
+          <include name="*.jar"/>
+          <exclude name="javanlp*"/>
+        </fileset>
+        <pathelement path="${build.home}" />
+      </classpath>
+      <bottom><![CDATA[<font size="2"><a href="https://nlp.stanford.edu" target="_top">Stanford NLP Group</a></font>]]></bottom>
+      <link href="https://docs.oracle.com/javase/8/docs/api/"/>
     </javadoc>
 
   </target>
diff --git a/doc/tregex/build.xml b/doc/tregex/build.xml
index dd25e78d21..a45bc1733e 100644
--- a/doc/tregex/build.xml
+++ b/doc/tregex/build.xml
@@ -1,5 +1,7 @@
 <!-- build.xml file for ant for JavaNLP -->
 
+<!-- Before using this, unjar the sources' jar file into the src/ directory! -->
+
 <!-- A "project" describes a set of targets that may be requested
      when Ant is executed.  The "default" attribute defines the
      target which is executed if no specific target is requested,
@@ -74,27 +76,6 @@
   </target>
 
 
-<!-- ==================== Classpath Targets ==================================== -->
-
-<!--
-
-  Sets the classpath for this project properly. We now always use the
-  lib dir within javanlp.
-
--->
-
-  <target name="classpath" description="Sets the classpath">
-      <path id="compile.classpath">
-        <fileset dir="${basedir}/lib">
-          <include name="*.jar"/>
-          <exclude name="javanlp*"/>
-        </fileset>
-      </path>
-  </target>
-
-
-
-
 
 <!-- ==================== Compile Target ================================== -->
 
@@ -107,7 +88,7 @@
 
 -->
 
-  <target name="compile" depends="prepare,classpath"
+  <target name="compile" depends="prepare"
    description="Compile Java sources">
 
     <!-- Compile Java classes as necessary -->
@@ -121,9 +102,14 @@
 	   source="${compile.source}"
            target="${compile.target}"
             includeantruntime="false">
-        <classpath refid="compile.classpath"/>
       <compilerarg value="-Xmaxerrs"/>
       <compilerarg value="20"/>
+      <classpath>
+        <fileset dir="${basedir}/lib">
+          <include name="*.jar"/>
+          <exclude name="javanlp*"/>
+        </fileset>
+      </classpath>
       <!-- <compilerarg value="-Xlint"/> -->
     </javac>
 
@@ -154,14 +140,29 @@
     <mkdir          dir="${javadoc.home}"/>
     <javadoc sourcepath="${src.home}"
                 destdir="${javadoc.home}"
-              maxmemory="768m"
+              maxmemory="1g"
                  author="true"
-                 source="1.8"
-                Overview="${src.home}/edu/stanford/nlp/overview.html"
-                Doctitle="Stanford JavaNLP API Documentation"
-             Windowtitle="Stanford JavaNLP API"
-           packagenames="*">
-      <bottom><![CDATA[<font size="2"><a href=\"http://nlp.stanford.edu\">Stanford NLP Group</a></font>]]></bottom>
+                 source="${compile.source}"
+                overview="${src.home}/edu/stanford/nlp/overview.html"
+                doctitle="Stanford JavaNLP API Documentation"
+             windowtitle="Stanford JavaNLP API"
+             encoding="${compile.encoding}"
+	     docencoding="${compile.encoding}"
+	     charset="${compile.encoding}"
+            packagenames="*">
+      <!-- Allow @generated, @modifiable and @ordered tags -->
+      <tag name="generated" scope="all" description="Generated" />
+      <tag name="modifiable" scope="all" description="Modifiable" />
+      <tag name="ordered" scope="all" description="Ordered" />
+      <!-- Depends on lib and classes folders -->
+      <classpath>
+        <fileset dir="${basedir}/lib">
+          <include name="*.jar"/>
+          <exclude name="javanlp*"/>
+        </fileset>
+        <pathelement path="${build.home}" />
+      </classpath>
+      <bottom><![CDATA[<font size="2"><a href="https://nlp.stanford.edu" target="_top">Stanford NLP Group</a></font>]]></bottom>
       <link href="https://docs.oracle.com/javase/8/docs/api/"/>
     </javadoc>