--- jsr166/build.xml	2004/03/24 20:32:33	1.64
+++ jsr166/build.xml	2005/05/20 16:29:57	1.72
@@ -31,6 +31,7 @@
   <property name="build.classes.dir"    location="${build.dir}/classes"/>
   <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
   <property name="build.j1.dir"         location="${build.dir}/j1"/>
+  <property name="build.loops.dir"      location="${build.dir}/loops"/>
   <property name="build.lib.dir"        location="${build.dir}/lib"/>
   <property name="build.ant.dir"        location="${build.dir}/ant"/>
   <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
@@ -39,25 +40,34 @@
   <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
   <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
   <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
+  <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
+  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
+  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
 
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
   <property name="test.src.dir"         location="${basedir}/src/test"/>
   <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
+  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
   <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
   <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
   <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
   <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
   <property name="lib.dir"              location="${basedir}/lib"/>
   <property name="dist.dir"             location="${basedir}/dist"/>
+  <property name="topsrc.dir"           location="${basedir}/src"/>
+  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
 
   <!-- Distribution locations -->
   <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
+  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
 
   <!-- Jar locations -->
   <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
+  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
   <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
-  
+  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
+
   <!-- Bootclasspath argument -->
   <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
 
@@ -67,10 +77,19 @@
     <pathelement location="${junit.jar}"/>
   </path>
 
-  <!-- Test classpath -->
+  <!-- ALoops classpath -->
+  <path id="loops.classpath">
+    <pathelement location="${build.loops.dir}"/>
+  </path>
+
+  <!-- J1 classpath -->
   <path id="j1.classpath">
+    <pathelement location="${build.classes.dir}"/>
     <pathelement location="${build.j1.dir}"/>
     <pathelement location="${junit.jar}"/>
+
+    <!-- Include dl.u.c for BoundedBuffer comparison -->
+    <pathelement location="${concurrent.jar}"/>
   </path>
 
 
@@ -91,6 +110,10 @@
            source="${build.sourcelevel}"
              fork="true">
 
+      <include name="**/*.java"/>
+<!--
+      <exclude name="java/lang/**"/>
+-->
       <compilerarg line="${build.args}"/>
 
     </javac>
@@ -126,12 +149,10 @@
     <mkdir dir="${build.javadocs.dir}"/>
 
     <javadoc destdir="${build.javadocs.dir}"
-                link="http://java.sun.com/j2se/1.4.1/docs/api"
+                link="http://java.sun.com/j2se/1.5.0/docs/api"
             overview="${src.dir}/intro.html"
-              source="${build.sourcelevel}">
-
-      <tag name="revised" description="Last revised:"/>
-      <tag name="spec"    description="Specified by:"/>
+            sourcepath="${src.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
+    >           
 
       <packageset dir="${src.dir}"/>
 
@@ -168,20 +189,20 @@
             classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
 
     <mkdir dir="${build.checkstyle.dir}"/>
-    
+
     <checkstyle config="etc/checkstyle/sun_checks.xml"
        failOnViolation="false">
-      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/> 
+      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
       <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
     </checkstyle>
-    
-    <style in="${build.checkstyle.dir}/checkstyle-report.xml" 
-          out="${build.checkstyle.dir}/checkstyle-report.html" 
+
+    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
+          out="${build.checkstyle.dir}/checkstyle-report.html"
         style="${stylesheet.dir}/checkstyle-frames.xsl"/>
 
   </target>
 
-  
+
 
   <target name="dist"
           depends="init, dist-clean, dist-jar, dist-docs"
@@ -236,12 +257,20 @@
     <mkdir dir="${dist.javadocs.dir}"/>
 
     <javadoc destdir="${dist.javadocs.dir}"
-                link="http://java.sun.com/j2se/1.4.2/docs/api"
+              link="http://java.sun.com/j2se/1.5.0/docs/api"
             overview="${src.dir}/intro.html"
-              source="${build.sourcelevel}">
-
-      <packageset dir="${src.dir}"/>
 
+            sourcepath="${src.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
+     >
+      <packageset dir="${src.dir}" defaultexcludes="yes">
+      <include name="java/util/concurrent"/>
+      <include name="java/util/concurrent/atomic"/>
+      <include name="java/util/concurrent/locks"/>
+      </packageset>
+      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
+      <include name="main/java/util/*.java"/>
+<!--      <include name="jsr166x/*.java"/> -->
+      </fileset>
     </javadoc>
 
   </target>
@@ -259,8 +288,8 @@
     <echo>java.home is ${java.home}</echo>
 
   </target>
-  
-  
+
+
   <target name="dist-jar"
           depends="clean, jar">
 
@@ -276,8 +305,7 @@
 
     <javac srcdir="${ant.src.dir}"
           destdir="${build.ant.dir}"
-           source="1.4"
-    />
+           source="1.4"/>
 
   </target>
 
@@ -396,7 +424,7 @@
 
       <compilerarg value="${bootclasspath.args}"/>
       <compilerarg line="${build.args}"/>
-      
+
       <classpath refid="test.classpath"/>
 
     </javac>
@@ -410,10 +438,10 @@
              fork="true">
 
       <include name="jsr166/test/**"/>
-      
+
       <compilerarg value="${bootclasspath.args}"/>
       <compilerarg line="${build.args}"/>
-      
+
       <classpath refid="test.classpath"/>
 
     </javac>
@@ -429,7 +457,7 @@
 
       <compilerarg value="${bootclasspath.args}"/>
       <compilerarg line="${build.args}"/>
-      
+
       <classpath refid="test.classpath"/>
 
     </javac>
@@ -456,7 +484,7 @@
       <jvmarg value="${bootclasspath.args}"/>
       <jvmarg value="-server"/>
       <jvmarg value="-showversion"/>
-      
+
       <classpath refid="test.classpath"/>
 
       <formatter type="xml"/>
@@ -466,14 +494,14 @@
           <include name="**/${testcase}Test.java"/>
         </fileset>
       </batchtest>
-      
+
       <batchtest todir="${build.reports.dir}" if="do.test.old">
         <fileset dir="${test.src.dir}">
           <include name="jsr166/test/**/${testcase}Test.java"/>
         </fileset>
       </batchtest>
 
-<!--      
+<!--
       <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
         <fileset dir="${jtreg.src.dir}">
           <include name="**/${testcase}Test.java"/>
@@ -540,9 +568,9 @@
     <available property="xalan.available"
                classname="org.apache.xalan.Version"/>
 
-               
+
     <!-- Ant 1.6beta and later don't need or want this check -->
-    <!--    
+    <!--
     <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
           unless="junit.available"/>
 
@@ -557,10 +585,10 @@
   <!-- Anthill targets -->
 
   <target name="anthill-build">
-  
+
     <!-- Override this in user.properties -->
     <property name="tiger.home" location="e:/j2sdk1.5.0"/>
-    
+
     <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
       <arg value="-Xmx256000000"/>
       <!-- classpath of new JVM -->
@@ -576,7 +604,7 @@
       <arg value="do-anthill-build"/>
     </exec>
   </target>
-  
+
   <target name="do-anthill-build"
           depends="jar, test, docs, dist-docs"/>
 
@@ -600,12 +628,15 @@
   </target>
 
 
-  <!-- Standalone sample program -->
-  
-  <target name="sample" depends="">
-  
+
+  <!-- Various demos and test programs -->
+
+
+  <target name="sample" depends="init, configure-compiler"
+          description="Standalone demo program">
+
     <mkdir dir="${build.testcases.dir}"/>
-    
+
     <javac srcdir="${test.src.dir}"
           destdir="${build.testcases.dir}"
             debug="${build.debug}"
@@ -613,62 +644,117 @@
       deprecation="${build.deprecation}"
            source="${build.sourcelevel}"
              fork="true">
-      
-      <!--
-      <compilerarg value="${bootclasspath.args}"/>
-      <compilerarg line="${build.args}"/>
-      
-      <classpath refid="test.classpath"/>
-      -->
-      
+
       <include name="jsr166/test/Sample.java"/>
-      
+
     </javac>
-    
+
     <copy todir="${build.testcases.dir}">
       <fileset dir="${test.src.dir}">
         <include name="**/*.properties"/>
       </fileset>
     </copy>
-  
-             
+
+
     <java classname="jsr166.test.Sample" fork="true">
-      <jvmarg value="${bootclasspath.args}"/>
-      <!-- <jvmarg value="-server"/> -->
-      <!-- <jvmarg value="-ea"/> -->
       <classpath refid="test.classpath"/>
+      <!-- <jvmarg value="-ea"/> -->
+      <!-- <jvmarg value="-server"/> -->
       <!-- <arg value="1000"/> -->
     </java>
   </target>
 
 
-  <!-- BoF demos -->
-  
-  <target name="j1" depends="jar">
-  
+  <target name="loops" depends="init, configure-compiler"
+          description="Benchmark from Doug Lea's AQS paper">
+
+    <mkdir dir="${build.loops.dir}"/>
+
+    <javac srcdir="${loops.src.dir}"
+          destdir="${build.loops.dir}"
+            debug="${build.debug}"
+       debuglevel="${build.debuglevel}"
+      deprecation="${build.deprecation}"
+           source="${build.sourcelevel}"
+             fork="true">
+
+      <compilerarg line="${build.args}"/>
+      <classpath refid="loops.classpath"/>
+
+    </javac>
+
+    <java classname="ALoops" fork="true">
+      <classpath refid="loops.classpath"/>
+    </java>
+
+  </target>
+
+
+  <target name="compile-j1" depends="init, configure-compiler, compile">
+
     <mkdir dir="${build.j1.dir}"/>
-    
+
     <javac srcdir="${j1.src.dir}"
           destdir="${build.j1.dir}"
             debug="${build.debug}"
        debuglevel="${build.debuglevel}"
       deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-             fork="true">
-             
-      <compilerarg value="${bootclasspath.args}"/>
+           source="${build.sourcelevel}" >
+
+      <include name="**/*.java"/>
+      <exclude name="**/dijkstra/**"/>
+
       <compilerarg line="${build.args}"/>
-      
       <classpath refid="j1.classpath"/>
-      
+
     </javac>
-    
-<!--
-    <java classname="MainClass" fork="true">
-      <jvmarg value="${bootclasspath.args}"/>
+
+  </target>
+
+
+  <target name="sw" depends="compile-j1"
+          description="Runs the SwingWorker demo">
+
+    <!--
+    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
       <classpath refid="j1.classpath"/>
     </java>
--->
+    -->
+
+    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
+
+    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
+      <arg value="${build.j1.dir}/SwingWorker.html"/>
+    </exec>
+
+  </target>
+
+  <target name="j1" depends="compile-j1"
+          description="Runs a standalone JavaOne program">
+
+    <java classname="${j1.test}" fork="true">
+      <classpath refid="j1.classpath"/>
+      <jvmarg value="-client"/>
+
+      <!-- TestPseudoRandom args -->
+      <arg value="2"/>
+      <arg value="25"/>
+      <arg value="100000"/>
+
+      <!-- WebCrawler args -->
+      <!--
+      <arg value="jsr166.webcrawler.WebCrawler3"/>
+      <arg value="http://www.priorartisans.com"/>
+      <arg value="25"/>
+      -->
+
+    </java>
+
+  </target>
+
+
+  <target name="test-j1" depends="compile-j1"
+          description="Runs testcases from the JavaOne source directories">
 
     <junit printsummary="true"
              showoutput="true"
@@ -677,11 +763,8 @@
                     dir="${build.j1.dir}"
                    fork="true">
 
-      <jvmarg value="${bootclasspath.args}"/>
-      <jvmarg value="-server"/>
-      
+      <!-- <jvmarg value="-server"/> -->
       <classpath refid="j1.classpath"/>
-
       <formatter type="xml"/>
 
       <batchtest todir="${build.j1.dir}">
@@ -692,12 +775,9 @@
 
     </junit>
 
-    <!-- Sets junit.report.format to frames if redirection is present,
-         otherwise sets it to noframes. -->
     <available property="junit.report.format"
                   value="frames"
-              classname="org.apache.xalan.lib.Redirect"
-    />
+              classname="org.apache.xalan.lib.Redirect"/>
     <property name="junit.report.format" value="noframes"/>
 
     <junitreport todir="${build.j1.dir}">
@@ -714,22 +794,22 @@
 
   </target>
 
-  
-  
+
+
   <!-- C++ and JNI definitions and demos -->
-  
+
   <target name="configure-cpp">
 
     <!-- Define tasks and types -->
-    
+
     <path id="cpptasks.path">
       <pathelement location="${lib.dir}/cpptasks.jar"/>
     </path>
     <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
     <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
-    
+
     <!-- Set platform property for JNI includes -->
-    
+
     <condition property="platform" value="linux">
       <os name="Linux"/>
     </condition>
@@ -739,33 +819,33 @@
     <condition property="platform" value="solaris">
       <os name="SunOS"/>
     </condition>
-    
+
   </target>
-  
-  
+
+
   <target name="cppdemo" depends="configure-cpp">
-  
+
     <mkdir dir="${build.dir}"/>
-    
+
     <cc multithreaded="true"
-                 name="g++" 
+                 name="g++"
                objdir="${build.dir}"
               outfile="${build.dir}/CppDemo">
       <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
       <libset libs="stdc++"/>
     </cc>
-    
+
     <exec executable="${build.dir}/CppDemo">
       <arg line="count in word frequency of word in command line count"/>
     </exec>
-    
+
   </target>
-  
-  
+
+
   <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
-  
+
     <mkdir dir="${build.testcases.dir}"/>
-    
+
     <javac srcdir="${test.src.dir}"
           destdir="${build.testcases.dir}"
             debug="${build.debug}"
@@ -778,18 +858,18 @@
       <classpath refid="test.classpath"/>
       <include name="JniDemo.java"/>
     </javac>
-    
+
     <javah destdir="${build.testcases.dir}"
       classpathref="test.classpath">
       <class name="JniDemo"/>
     </javah>
-    
+
     <cc multithreaded="true"
-                 name="g++" 
+                 name="g++"
                objdir="${build.dir}"
               outfile="${build.dir}/JniDemo"
               outtype="shared">
-              
+
       <compiler>
         <defineset>
           <define name="__int64" value="long long"/>
@@ -798,29 +878,29 @@
         <includepath location="${java.home}/../include/${platform}"/>
         <compilerarg value="-mno-cygwin"/>
       </compiler>
-      
+
       <linker>
         <linkerarg value="--add-stdcall-alias"/>
       </linker>
-      
+
       <includepath location="${build.testcases.dir}"/>
-      
+
       <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
-      
+
       <libset libs="stdc++"/>
-      
+
     </cc>
-    
+
     <!-- Necessary if windows, harmless if not -->
     <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
-    
+
     <java classname="JniDemo" fork="true">
       <!-- Watch out: path separator hardwired to semicolon here! -->
       <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
       <classpath refid="test.classpath"/>
       <arg line="count in word frequency of word in command line count"/>
     </java>
-    
+
   </target>
 
 
@@ -833,21 +913,21 @@
   <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
   <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
   <property name="pretiger.sourcelevel" value="1.4"/>
-  
-  <target name="defang" 
+
+  <target name="defang"
        depends="init"
    description="Generates pre-Tiger compatible source">
-   
+
     <delete dir="${pretiger.src.dir}"/>
     <mkdir dir="${pretiger.src.dir}"/>
-  
+
     <exec executable="perl">
       <arg file="etc/defang.pl"/>
       <!-- <arg value="-v"/> -->
       <arg value="-s"/> <arg file="${src.dir}"/>
       <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
     </exec>
-    
+
   </target>
 
   <target name="compile-pretiger"
@@ -870,16 +950,125 @@
     </javac>
 
   </target>
-  
+
   <target name="pretiger" depends="compile-pretiger">
 
     <mkdir dir="${build.lib.dir}"/>
-    
+
     <jar destfile="${pretiger.jar}">
       <fileset dir="${build.pretiger.dir}">
       </fileset>
     </jar>
-    
+
+  </target>
+
+  <!-- jsr166x -->
+
+
+  <target name="jsr166xcompile"
+          depends="init, configure-compiler"
+          description="Compiles jsr166x sources">
+
+    <mkdir dir="${build.jsr166x.dir}"/>
+
+    <javac srcdir="${jsr166xsrc.dir}"
+          destdir="${build.jsr166x.dir}"
+            debug="${build.debug}"
+       debuglevel="${build.debuglevel}"
+      deprecation="${build.deprecation}"
+           source="${build.sourcelevel}"
+             fork="true">
+
+      <include name="**/*.java"/>
+      <compilerarg line="${build.args}"/>
+
+    </javac>
+
+  </target>
+
+
+
+  <target name="jsr166xjar"
+          depends="jsr166xcompile"
+          description="Builds library jar from compiled sources">
+
+    <mkdir dir="${build.jsr166xlib.dir}"/>
+
+    <jar destfile="${jsr166xproduct.jar}">
+      <fileset dir="${build.jsr166x.dir}"/>
+    </jar>
+
+  </target>
+
+
+
+  <target name="jsr166xdocs"
+          description="Builds javadocs with custom tags to build folder">
+
+    <delete dir="${build.jsr166xjavadocs.dir}"/>
+    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
+
+    <javadoc destdir="${build.jsr166xjavadocs.dir}"
+                link="http://java.sun.com/j2se/1.5.0/docs/api/"
+            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
+
+    >
+      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
+      <include name="jsr166x"/>
+      </packageset>
+
+
+    </javadoc>
+
+  </target>
+
+
+  <target name="jsr166xdist"
+          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
+          description="Puts all distributable products in single hierarchy"/>
+
+
+
+  <target name="jsr166xclean"
+          description="Removes all build products">
+
+    <delete dir="${build.jsr166x.dir}"/>
+    <delete dir="${build.jsr166xlib.dir}"/>
+
+  </target>
+
+
+
+  <target name="jsr166xdist-clean"
+          description="Removes all build and distribution products">
+
+  </target>
+
+
+
+  <target name="jsr166xdist-docs"
+          description="Builds javadocs without custom tags to dist folder">
+
+    <delete dir="${dist.jsr166xjavadocs.dir}"/>
+    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
+
+    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
+                link="http://java.sun.com/j2se/1.5.0/docs/api/"
+              source="${build.sourcelevel}">
+
+      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
+      <include name="jsr166x"/>
+      </packageset>
+
+    </javadoc>
+
+  </target>
+
+  <target name="jsr166xdist-jar"
+          depends="jsr166xclean, jsr166xjar">
+
+    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
+
   </target>
 
 </project>