Index: .classpath
===================================================================
RCS file: /cvsroot/classpath/gjdoc/.classpath,v
retrieving revision 1.1
diff -u -r1.1 .classpath
--- .classpath	19 Dec 2005 18:41:42 -0000	1.1
+++ .classpath	19 Dec 2005 20:01:07 -0000
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="tmp/generated"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/usr/share/java/antlr.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="eclipse-bin"/>
 </classpath>
Index: .cvsignore
===================================================================
RCS file: /cvsroot/classpath/gjdoc/.cvsignore,v
retrieving revision 1.3
diff -u -r1.3 .cvsignore
--- .cvsignore	19 Dec 2005 18:41:42 -0000	1.3
+++ .cvsignore	19 Dec 2005 20:01:07 -0000
@@ -30,3 +30,4 @@
 *.lo
 dist
 tmp
+eclipse-bin
\ No newline at end of file
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/gjdoc/ChangeLog,v
retrieving revision 1.243
diff -u -r1.243 ChangeLog
--- ChangeLog	19 Dec 2005 18:41:42 -0000	1.243
+++ ChangeLog	19 Dec 2005 20:01:07 -0000
@@ -1,3 +1,12 @@
+2005-12-19  Andrew Overholt  <address@hidden>
+
+	* src/gnu/classpath/tools/gjdoc/expr/.cvsignore: Add antlr-generated 
+	files.
+	* .classpath: Change Eclipse output directory from bin to eclipse-bin.
+	* .cvsignore: Add eclipse-bin.
+	* .externalToolBuilders/GjdocAntlr.launch: Call generate-source upon 
+	project clean.  Make antlr-generated files go into src.
+
 2005-12-19  Tom Tromey  <address@hidden>
 
 	* .externalToolBuilders/GcjdocAntlr.launch: New file.
Index: .externalToolBuilders/GjdocAntlr.launch
===================================================================
RCS file: /cvsroot/classpath/gjdoc/.externalToolBuilders/GjdocAntlr.launch,v
retrieving revision 1.1
diff -u -r1.1 GjdocAntlr.launch
--- .externalToolBuilders/GjdocAntlr.launch	19 Dec 2005 18:41:42 -0000	1.1
+++ .externalToolBuilders/GjdocAntlr.launch	19 Dec 2005 20:01:07 -0000
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="generate-source,"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
 <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/gjdoc}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="generate-source,"/>
 <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="generate-source,"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES">
+<mapEntry key="generated" value="src"/>
+</mapAttribute>
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-1.4.2-ibm-1.4.2.0&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.ant.ui.classpathentry.antHome&quot;&gt;&#10;&lt;memento default=&quot;true&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
Index: src/gnu/classpath/tools/gjdoc/expr/.cvsignore
===================================================================
RCS file: /cvsroot/classpath/gjdoc/src/gnu/classpath/tools/gjdoc/expr/.cvsignore,v
retrieving revision 1.1
diff -u -r1.1 .cvsignore
--- src/gnu/classpath/tools/gjdoc/expr/.cvsignore	9 Feb 2005 09:48:20 -0000	1.1
+++ src/gnu/classpath/tools/gjdoc/expr/.cvsignore	19 Dec 2005 20:01:07 -0000
@@ -2,3 +2,7 @@
 .dirstamp
 .libs
 *.lo
+JavaLexer.java
+JavaRecognizer.java
+JavaTokenTypes.java
+JavaTokenTypes.txt