--- jsr166/build.xml	2003/05/30 21:27:52	1.38
+++ jsr166/build.xml	2003/08/01 19:34:05	1.47
@@ -39,6 +39,7 @@
   <property name="build.reports.dir"    location="${build.dir}/reports"/>
   <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
   <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
+  <property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/>
 
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
@@ -59,12 +60,20 @@
 
 
 
-  <!-- Files excluded from emulation and dist-docs -->
-  <patternset id="emulation.excludes">
+  <!-- Files excluded from dist-docs and emulation jar -->
+  <patternset id="unsafe.exclusion">
     <exclude name="java/util/Random.*"/>
     <exclude name="sun/misc/Unsafe.*"/>
   </patternset>
 
+  <!-- Files excludes from emulation jar -->
+  <patternset id="atomic.exclusion">
+    <exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
+    <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
+    <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
+    <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
+  </patternset>
+
 
 
   <!-- Main targets -->
@@ -124,8 +133,8 @@
 
 
   <target name="doccheck"
-          depends="filter-src"
-          description="Reports on javadoc style errors (not working yet)">
+          depends="filter-doccheck"
+          description="Reports on javadoc style errors">
 
     <delete dir="${build.doccheck.dir}"/>
     <mkdir dir="${build.doccheck.dir}"/>
@@ -133,7 +142,7 @@
     <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
          docletpath="${lib.dir}/doccheck.jar"
             destdir="${build.doccheck.dir}">
-      <packageset dir="${build.filter.src.dir}"/>
+      <packageset dir="${build.filter.doccheck.dir}"/>
     </javadoc>
 
   </target>
@@ -194,6 +203,25 @@
           depends="init, dist-clean, dist-jar, dist-docs"
           description="Puts all distributable products in single hierarchy"/>
 
+  <target name="release"
+          depends="dist"
+          description="Puts entire CVS tree, plus distribution productions, in a jar">
+
+<!--
+    #keep build dir? - dl
+    <delete dir="${build.dir}"/>
+-->
+    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
+
+    <jar basedir="${basedir}" destfile="${release.jar}">
+      <exclude name="${release.jar}"/>
+      <exclude name="user.properties"/>
+      <exclude name="etc/notes/**"/>
+      <exclude name="lib/gjc/2.1/**"/>
+      <exclude name="**/SyntaxTest.java"/>
+    </jar>
+
+  </target>
 
   <target name="clean"
           description="Removes all build products">
@@ -292,7 +320,8 @@
 
     <jar destfile="${product.jar}" duplicate="add">
       <fileset dir="${build.classes.dir}">
-        <patternset refid="emulation.excludes"/>
+        <patternset refid="atomic.exclusion"/>
+        <patternset refid="unsafe.exclusion"/>
       </fileset>
       <fileset dir="${build.emulation.dir}"/>
     </jar>
@@ -332,16 +361,10 @@
       </fileset>
     </copy>
 
-    <!-- Not needed now, used for doccheck filtering:
-    <property name="generic.declarations"
-             value="public interface E {} public interface T {} public interface K {} public interface V {}"
-    />
-    -->
-
     <copy todir="${build.filter.src.dir}">
       <fileset dir="${src.dir}">
         <exclude name="**/*.html"/>
-        <patternset refid="emulation.excludes"/>
+        <patternset refid="unsafe.exclusion"/>
       </fileset>
       <filterchain>
 
@@ -377,19 +400,42 @@
           <param name="pattern"     value="^//@"/>
           <param name="replacement" value=""/>
         </filterreader>
+      </filterchain>
+    </copy>
+
+  </target>
+
+
 
 
+  <target name="filter-doccheck"
+          depends="filter-src">
+
+    <mkdir dir="${build.filter.doccheck.dir}"/>
+
+    <copy todir="${build.filter.doccheck.dir}">
+      <fileset dir="${build.filter.src.dir}">
+        <include name="**/*.html"/>
+      </fileset>
+    </copy>
+
+    <property name="generic.declarations"
+             value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
+    />
+
+    <copy todir="${build.filter.doccheck.dir}">
+      <fileset dir="${build.filter.src.dir}">
+        <exclude name="**/*.html"/>
+      </fileset>
+      <filterchain>
         <!--
-         # The next two filters try to make the source look like
+         # These two filters try to make the source look like
          # something that doccheck can process. The first removes
          # -source 1.4 assertions and the second adds in a bunch
          # of single letter public nested marker interfaces so that
          # the generic type parameters are recognized.
-         #
-         # Currently commented out because doccheck doesn't work. :-(
          -->
 
-        <!--
         <filterreader classname="jsr166.ant.filters.ReplaceFilter"
                       classpath="${build.ant.dir}">
           <param name="matching"    value="^\s*assert[\s ].*$"/>
@@ -399,11 +445,10 @@
 
         <filterreader classname="jsr166.ant.filters.ReplaceFilter"
                       classpath="${build.ant.dir}">
-          <param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
+          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
           <param name="pattern"     value="$"/>
           <param name="replacement" value=" ${generic.declarations}"/>
         </filterreader>
-        -->
 
       </filterchain>
     </copy>
@@ -498,7 +543,7 @@
   <target name="configure-compiler">
 
     <property name="gjc.version"
-             value="2.0"/>
+             value="2.2"/>
 
     <condition property="novariance.arg" value="-novariance">
       <and>
@@ -543,6 +588,7 @@
     </path>
 
     <path id="compile.bootclasspath">
+      <pathelement location="${build.classes.dir}"/>
       <pathelement location="${collect.jar}"/>
       <pathelement location="${rt.jar}"/>
     </path>
@@ -658,4 +704,13 @@
   </target>
 
 
+  <target name="ng" depends="test">
+    <java classname="SuperfluousAbstract" fork="true">
+
+      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
+
+    </java>
+  </target>
+
+
 </project>