/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.101 by jsr166, Sat Jan 19 17:30:36 2013 UTC revision 1.115 by jsr166, Sun Jan 20 06:11:07 2013 UTC
# Line 35  Line 35 
35    
36    
37    <!-- Compilation options -->    <!-- Compilation options -->
38    <property name="build.sourcelevel"    value="1.6"/>    <property name="build.sourcelevel"    value="6"/>
39    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
40    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
41    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
# Line 45  Line 45 
45    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
46    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
47    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
   <property name="build.lib.dir"               location="${build.dir}/lib"/>  
   <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>  
48    <property name="build.reports.dir"           location="${build.dir}/reports"/>    <property name="build.reports.dir"           location="${build.dir}/reports"/>
49    
50    <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51    <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52    <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
53    <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
   <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>  
54    
55    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <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"/>  
   
56    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
   <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>  
   <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>  
   
57    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
   <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>  
   <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>  
   
58    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59    <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>  
60    <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>    <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
61      <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
62      <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63      <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
64    
65    <!-- JDK binary locations -->    <!-- JDK binary locations -->
66    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 124  Line 115 
115    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
116    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
117    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
   <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>  
118    
119    <!-- Distribution locations -->    <!-- Distribution locations -->
120    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
121    <property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
122    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
123    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
124    <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
125    <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
126    
127    <!-- Jar locations -->    <!-- Jar locations -->
128    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
129    <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
130    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
131    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
132    <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
133    <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
134    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
135    
136    <!-- Bootclasspath argument -->    <!-- Bootclasspath argument -->
137    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
# Line 154  Line 144 
144    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
145    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2012-11 -->
146    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
147    
148      <!-- Default jdk api doc location (latest stable release seems best) -->
149    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
150    
151      <!-- Define the "jtreg" task -->
152      <!-- See the docs in "jtreg -onlineHelp" -->
153      <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
154               classpath="${lib.dir}/jtreg.jar" />
155    
156    <!-- Test classpath -->    <!-- Test classpath -->
157    <path id="test.classpath">    <path id="test.classpath">
158      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
# Line 177  Line 174 
174    <!-- Main targets -->    <!-- Main targets -->
175    
176    <target name="dists"    <target name="dists"
177            depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
178            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
179    
180    <target name="compile"    <target name="compile"
181            depends="configure-compiler"            depends="configure-compiler"
182            description="Compiles src/main sources to build folder">            description="Compiles src/main sources to build dir">
183    
184      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
185    
# Line 218  Line 215 
215            depends="compile"            depends="compile"
216            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
217    
     <mkdir dir="${build.lib.dir}"/>  
   
218      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
219        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
220      </jar>      </jar>
# Line 229  Line 224 
224    
225    
226    <target name="test"    <target name="test"
227            depends="init, configure-tests, report-tests"            depends="configure-tests, report-tests"
228            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
229    
230    
231    
232    <target name="docs"    <target name="docs"
233            description="Builds javadocs for src/main">            description="Builds javadocs for src/main to dist dir">
234    
235      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${dist.javadocs.dir}"/>
236      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${dist.javadocs.dir}"/>
# Line 263  Line 258 
258    
259    
260    <target name="dist"    <target name="dist"
261            depends="init, dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, docs"
262            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
263    
264    
# Line 291  Line 286 
286            description="Removes all build products">            description="Removes all build products">
287    
288      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
289    
290    </target>    </target>
291    
# Line 310  Line 303 
303    <!-- Internal targets -->    <!-- Internal targets -->
304    
305    
   <target name="init">  
   
     <!-- Version is kept in a separate file -->  
     <loadfile property="version" srcFile="version.properties"/>  
     <echo>Building JSR-166 version ${version}</echo>  
     <echo>java.home is ${java.home}</echo>  
   
   </target>  
   
   
306    <target name="dist-jar"    <target name="dist-jar"
307            depends="clean, jar">            depends="clean, jar">
308    
# Line 334  Line 317 
317      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
318    
319      <javac srcdir="${tck.src.dir}"      <javac srcdir="${tck.src.dir}"
320            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
321              debug="${build.debug}"             debug="${build.debug}"
322         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
323        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
324             source="${build.sourcelevel}"             source="6"
325               fork="true">             classpath="${junit.jar}"
326               bootclasspath="${product.jar}:${bootclasspath6}"
327               includeAntRuntime="false"
328               includeJavaRuntime="false"
329               executable="${javac8}"
330               fork="true">
331    
332        <compilerarg value="${bootclasspath.args}"/>        <include name="**/*.java"/>
333        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
334        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
335          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
       <classpath refid="test.classpath"/>  
336    
337      </javac>      </javac>
338    
339      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
340            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
341              debug="${build.debug}"             debug="${build.debug}"
342         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
343        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
344             source="${build.sourcelevel}"             source="6"
345               fork="true">             classpath=""
346               bootclasspath="${product.jar}:${bootclasspath6}"
347               includeAntRuntime="false"
348               includeJavaRuntime="false"
349               executable="${javac8}"
350               fork="true">
351    
352        <include name="jsr166/test/**"/>        <include name="jsr166/test/**/*.java"/>
353    
       <compilerarg value="${bootclasspath.args}"/>  
354        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
355        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
356          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
       <classpath refid="test.classpath"/>  
357    
358      </javac>      </javac>
359    
# Line 380  Line 370 
370        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
371        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
372    
       <classpath refid="test.classpath"/>  
   
373      </javac>      </javac>
374  -->  -->
375    
# Line 401  Line 389 
389            errorProperty="junit.failed"            errorProperty="junit.failed"
390          failureProperty="junit.failed"          failureProperty="junit.failed"
391                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
392                        jvm="${java8}"
393                     fork="true">                     fork="true">
394    
395        <jvmarg value="${bootclasspath.args}"/>        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
396        <jvmarg value="-server"/>        <jvmarg value="-server"/>
397        <jvmarg value="-showversion"/>        <jvmarg value="-showversion"/>
398    
# Line 504  Line 493 
493    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
494    
495    
496    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="configure-compiler"
497            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
498    
499      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
# Line 544  Line 533 
533             debug="${build.debug}"             debug="${build.debug}"
534             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
535             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
536             source="1.6"             source="6"
537             classpath=""             classpath=""
538             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
539             includeAntRuntime="false"             includeAntRuntime="false"
# Line 559  Line 548 
548    
549      </javac>      </javac>
550    
     <mkdir dir="${build.4jdk7.lib.dir}"/>  
   
551      <jar destfile="${4jdk7product.jar}" index="true">      <jar destfile="${4jdk7product.jar}" index="true">
552        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
553      </jar>      </jar>
# Line 572  Line 559 
559             debug="${build.debug}"             debug="${build.debug}"
560             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
561             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
562             source="1.6"             source="6"
563             classpath="${junit.jar}"             classpath="${junit.jar}"
564             bootclasspath="${4jdk7product.jar}:${bootclasspath6}"             bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
565             includeAntRuntime="false"             includeAntRuntime="false"
# Line 628  Line 615 
615      </junit>      </junit>
616    </target>    </target>
617    
618      <target name="4jdk7-test-jtreg"
619              depends="4jdk7compile"
620              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
621        <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
622        <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
623        <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
624        <mkdir dir="${build.4jdk7.dir}/JTreport"/>
625        <jtreg dir="${jtreg.src.dir}"
626               jdk="${jdk7.home}"
627               workDir="${build.4jdk7.dir}/JTwork"
628               reportDir="${build.4jdk7.dir}/JTreport">
629    
630          <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
631          <arg value="-agentvm"/>
632          <arg value="-v:nopass,fail"/>
633          <arg value="-vmoptions:-esa -ea"/>
634          <arg value="-automatic"/>
635          <arg value="-k:!ignore"/>
636        </jtreg>
637      </target>
638    
639    
640      <target name="4jdk7-test"
641              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
642              description="Runs tck and jtreg tests for jsr166-4jdk7">
643      </target>
644    
645    
646    <target name="4jdk7docs"    <target name="4jdk7docs"
647            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/jdk7 to dist dir">
648    
649      <delete dir="${build.4jdk7.docs.dir}"/>      <delete dir="${dist.4jdk7.docs.dir}"/>
650      <mkdir dir="${build.4jdk7.docs.dir}"/>      <mkdir dir="${dist.4jdk7.docs.dir}"/>
651    
652      <javadoc destdir="${build.4jdk7.docs.dir}"      <javadoc destdir="${dist.4jdk7.docs.dir}"
653               packagenames="none"               packagenames="none"
654               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
655               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
# Line 652  Line 666 
666    
667    
668    <target name="4jdk7dist"    <target name="4jdk7dist"
669            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
670            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
671    
672    
673    
674    <target name="4jdk7clean"    <target name="4jdk7clean"
675            description="Removes all build products">            description="Removes all 4jdk7 build products">
676    
677      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
678    
# Line 671  Line 685 
685    
686    </target>    </target>
687    
   <target name="4jdk7dist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.4jdk7.docs.dir}"/>  
     <mkdir dir="${dist.4jdk7.docs.dir}"/>  
   
     <javadoc destdir="${dist.4jdk7.docs.dir}"  
              packagenames="none"  
              link="${jdkapi7docs.url}"  
              overview="${4jdk7src.dir}/intro.html"  
              sourcepath="${4jdk7src.dir}:${jdk7src.dir}"  
              classpath=""  
              executable="${javadoc7}">  
       <arg value="-XDignore.symbol.file=true"/>  
       <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
   
   </target>  
   
688    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
689            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7compile">
690    
# Line 699  Line 692 
692    
693    </target>    </target>
694    
   <!-- jsr166x -->  
695    
696      <!-- jsr166x -->
697    
698    <target name="jsr166xcompile"    <target name="jsr166xcompile"
699            depends="init, configure-compiler"            depends="configure-compiler"
700            description="Compiles jsr166x sources">            description="Compiles jsr166x sources to build dir">
701    
702      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
703    
704      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${topsrc.dir}"
705            destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
706              debug="${build.debug}"             debug="${build.debug}"
707         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
708        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
709             source="${build.sourcelevel}"             classpath=""
710               fork="true">             source="5"
711               bootclasspath="${bootclasspath6}"
712               includeAntRuntime="false"
713               includeJavaRuntime="false"
714               executable="${javac7}"
715               fork="true">
716    
717        <include name="**/*.java"/>        <include name="jsr166x/**/*.java"/>
718        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
719        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
720          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
721    
722      </javac>      </javac>
723    
# Line 730  Line 729 
729            depends="jsr166xcompile"            depends="jsr166xcompile"
730            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
731    
732      <mkdir dir="${build.jsr166xlib.dir}"/>      <jar destfile="${jsr166x.jar}">
733          <fileset dir="${build.jsr166x.classes.dir}"/>
     <jar destfile="${jsr166xproduct.jar}">  
       <fileset dir="${build.jsr166x.dir}"/>  
734      </jar>      </jar>
735    
736    </target>    </target>
# Line 741  Line 738 
738    
739    
740    <target name="jsr166xdocs"    <target name="jsr166xdocs"
741            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
742    
743      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${dist.jsr166xjavadocs.dir}"/>
744      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
745    
746      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
747               packagenames="jsr166x"               packagenames="jsr166x.*"
748               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
749               source="${build.sourcelevel}"               source="5"
750               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
751               additionalparam="-XDignore.symbol.file=true" />               sourcepath="${topsrc.dir}:${jdk6src.dir}"
752                 executable="${javadoc7}"
753                 additionalparam="-XDignore.symbol.file=true"/>
754    
755    </target>    </target>
756    
757    
758    <target name="jsr166xdist"    <target name="jsr166xdist"
759            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
760            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
761    
762    
763    
764    <target name="jsr166xclean"    <target name="jsr166xclean"
765            description="Removes all build products">            description="Removes all jsr166x build products">
766    
767      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
768    
769    </target>    </target>
770    
# Line 778  Line 776 
776    </target>    </target>
777    
778    
   
   <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}"  
              packagenames="jsr166x"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
779    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
780            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
781    
782      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
783    
784    </target>    </target>
785    
# Line 805  Line 787 
787    
788    
789    <target name="jsr166ycompile"    <target name="jsr166ycompile"
790            depends="init, configure-compiler"            depends="configure-compiler"
791            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
792    
793      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
794    
795      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
796            destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
797              debug="${build.debug}"             debug="${build.debug}"
798         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
799        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
800             source="${build.sourcelevel}"             source="6"
801               fork="true">             classpath=""
802               bootclasspath="${bootclasspath6}"
803               includeAntRuntime="false"
804               includeJavaRuntime="false"
805               executable="${javac7}"
806               fork="true">
807    
808        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
809        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
810        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
811        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
   
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
   
812      </javac>      </javac>
   
813    </target>    </target>
814    
815    
   
816    <target name="jsr166yjar"    <target name="jsr166yjar"
817            depends="jsr166ycompile"            depends="jsr166ycompile"
818            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
819    
820      <mkdir dir="${build.jsr166ylib.dir}"/>      <jar destfile="${jsr166y.jar}" index="true">
821          <fileset dir="${build.jsr166y.classes.dir}"/>
     <jar destfile="${jsr166yproduct.jar}" index="true">  
       <fileset dir="${build.jsr166y.dir}"/>  
822      </jar>      </jar>
823    
824    </target>    </target>
# Line 846  Line 826 
826    
827    
828    <target name="jsr166ydocs"    <target name="jsr166ydocs"
829            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
830    
831      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${dist.jsr166yjavadocs.dir}"/>
832      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
833    
834      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
835               packagenames="jsr166y"               packagenames="jsr166y.*"
836               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
837               source="${build.sourcelevel}"               source="6"
838               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
839               additionalparam="-XDignore.symbol.file=true" />               sourcepath="${topsrc.dir}:${jdk6src.dir}"
840                 executable="${javadoc7}"
841                 additionalparam="-XDignore.symbol.file=true"/>
842    
843    </target>    </target>
844    
845    
846    <target name="jsr166ydist"    <target name="jsr166ydist"
847            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
848            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
849    
850    
851    
852    <target name="jsr166yclean"    <target name="jsr166yclean"
853            description="Removes all build products">            description="Removes all jsr166y build products">
854    
855      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
856    
857    </target>    </target>
858    
# Line 882  Line 863 
863    
864    </target>    </target>
865    
   <target name="jsr166ydist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.jsr166yjavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166yjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166yjavadocs.dir}"  
              packagenames="jsr166y"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
866    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
867            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
868    
869      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
870    
871    </target>    </target>
872    
# Line 909  Line 875 
875    
876    
877    <target name="extra166ycompile"    <target name="extra166ycompile"
878            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166yjar"
879            description="Compiles extra166y sources">            description="Compiles extra166y sources">
880    
881      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
882    
883      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
884            destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
885              debug="${build.debug}"             debug="${build.debug}"
886              classpath="${jsr166yproduct.jar}"             debuglevel="${build.debuglevel}"
887         debuglevel="${build.debuglevel}"             deprecation="${build.deprecation}"
888        deprecation="${build.deprecation}"             classpath=""
889             source="${build.sourcelevel}"             source="6"
890               fork="true">             bootclasspath="${jsr166y.jar}:${bootclasspath6}"
891               includeAntRuntime="false"
892               includeJavaRuntime="false"
893               executable="${javac7}"
894               fork="true">
895    
896        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
897        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
898        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
899        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
   
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
900    
901      </javac>      </javac>
902    
# Line 940  Line 908 
908            depends="extra166ycompile"            depends="extra166ycompile"
909            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
910    
911      <mkdir dir="${build.extra166ylib.dir}"/>      <jar destfile="${extra166y.jar}" index="true">
912          <fileset dir="${build.extra166y.classes.dir}"/>
     <jar destfile="${extra166yproduct.jar}" index="true">  
       <fileset dir="${build.extra166y.dir}"/>  
913      </jar>      </jar>
914    
915    </target>    </target>
# Line 951  Line 917 
917    
918    
919    <target name="extra166ydocs"    <target name="extra166ydocs"
920            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
921    
922      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${dist.extra166yjavadocs.dir}"/>
923      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
924    
925      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
926               packagenames="extra166y"               packagenames="extra166y.*"
927               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
928               source="${build.sourcelevel}"               source="6"
929               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
930               additionalparam="-XDignore.symbol.file=true" />               sourcepath="${topsrc.dir}:${jdk6src.dir}"
931                 executable="${javadoc7}"
932                 additionalparam="-XDignore.symbol.file=true"/>
933    
934    </target>    </target>
935    
936    
937    <target name="extra166ydist"    <target name="extra166ydist"
938            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
939            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
940    
941    
942    
943    <target name="extra166yclean"    <target name="extra166yclean"
944            description="Removes all build products">            description="Removes all extra166y build products">
945    
946      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
947    
948    </target>    </target>
949    
# Line 987  Line 954 
954    
955    </target>    </target>
956    
   <target name="extra166ydist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.extra166yjavadocs.dir}"/>  
     <mkdir dir="${dist.extra166yjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.extra166yjavadocs.dir}"  
              packagenames="extra166y"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
957    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
958            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
959    
960      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
961    
962    </target>    </target>
963    
# Line 1015  Line 967 
967            depends="configure-compiler"            depends="configure-compiler"
968            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
969    
970      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
971    
972      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
973             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
974             debug="${build.debug}"             debug="${build.debug}"
975             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
976             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
977             source="1.7"             source="7"
978             classpath=""             classpath=""
979             includeAntRuntime="false"             includeAntRuntime="false"
980             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1044  Line 996 
996            depends="jsr166ecompile"            depends="jsr166ecompile"
997            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
998    
999      <mkdir dir="${build.jsr166elib.dir}"/>      <jar destfile="${jsr166e.jar}" index="true">
1000          <fileset dir="${build.jsr166e.classes.dir}"/>
     <jar destfile="${jsr166eproduct.jar}" index="true">  
       <fileset dir="${build.jsr166e.dir}"/>  
1001      </jar>      </jar>
1002    
1003    </target>    </target>
# Line 1055  Line 1005 
1005    
1006    
1007    <target name="jsr166edocs"    <target name="jsr166edocs"
1008            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to build dir">
1009    
1010      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${dist.jsr166ejavadocs.dir}"/>
1011      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1012    
1013      <javadoc destdir="${build.jsr166ejavadocs.dir}"      <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1014               packagenames="jsr166e,jsr166e.extra"               packagenames="jsr166e.*"
1015               link="${jdkapi7docs.url}"               link="${jdkapidocs.url}"
1016               source="1.7"               source="7"
1017               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1018               executable="${javadoc7}"               executable="${javadoc7}"
1019               additionalparam="-XDignore.symbol.file=true" >               additionalparam="-XDignore.symbol.file=true" >
       <fileset dir="${topsrc.dir}" defaultexcludes="yes">  
         <include name="jsr166e/**/*.java"/>  
       </fileset>  
1020      </javadoc>      </javadoc>
1021    
1022    </target>    </target>
1023    
1024    
1025    <target name="jsr166edist"    <target name="jsr166edist"
1026            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1027            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1028    
1029    
1030    
1031    <target name="jsr166eclean"    <target name="jsr166eclean"
1032            description="Removes all build products">            description="Removes all jsr166e build products">
1033    
1034      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
1035    
1036    </target>    </target>
1037    
1038    
   
1039    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
1040            description="Removes all build and distribution products">            description="Removes all build and distribution products">
1041    
1042    </target>    </target>
1043    
   <target name="jsr166edist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.jsr166ejavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166ejavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166ejavadocs.dir}"  
              packagenames="jsr166e,jsr166e.extra"  
              link="${jdkapidocs.url}"  
              source="1.7"  
              sourcepath="${topsrc.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
1044    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1045            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1046    
1047      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1048    
1049    </target>    </target>
1050    

Legend:
Removed from v.1.101  
changed lines
  Added in v.1.115

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27