Get the javadoc ant task working again... (addresses issue 98 on the google code issue tracker)

scarytom · scarytom · commit 613a3d2a96ce · 2012-05-19T23:00:46.000+01:00
diff --git a/.project b/.project
@@ -16,7 +16,7 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1336826596542</id>
+			<id>1337464735913</id>
 			<name></name>
 			<type>26</type>
 			<matcher>
@@ -25,12 +25,21 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1336826596556</id>
+			<id>1337464735918</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-projectRelativePath-matches-false-true-build/.*\.(jar|zip|tgz)</arguments>
+				<arguments>1.0-projectRelativePath-matches-false-true-build/.*\.((?!java).)*$</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1337464735922</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-projectRelativePath-matches-false-false-build/javadoc</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>
diff --git a/build.xml b/build.xml
@@ -166,9 +166,7 @@
 
     <target name="javadoc" depends="library">
         <mkdir dir="build/javadoc"/>
-        <javadoc destdir="build/javadoc" source="1.6" failonerror="yes"
-            overview="overview.html">
-            
+        <javadoc destdir="build/javadoc" source="1.6" failonerror="yes" overview="overview.html">
             <classpath>
                 <fileset dir="lib/integration">
                     <include name="*.jar"/>
@@ -178,7 +176,8 @@
             <packageset dir="hamcrest-core/src/main/java"/>
             <packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
             <packageset dir="hamcrest-integration/src/main/java"/>
-            <packageset dir="build/generated-code"/>
+            <packageset dir="build/temp/hamcrest-core/generated-code"/>
+            <packageset dir="build/temp/hamcrest-library/generated-code"/>
             
             <group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>
             <group title="Matcher Library" packages="org.hamcrest.*"/>
