ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.128 by jsr166, Wed Jan 23 07:05:10 2013 UTC vs.
Revision 1.137 by jsr166, Wed Feb 6 19:55:06 2013 UTC

# Line 22 | Line 22
22    $HOME/jdk/src/jdk8
23    where each of the above is a complete JDK source tree
24    (e.g. mercurial forest) or a symlink to same.
25 + As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
26   ------------------------------------------------------------------------------
27    </description>
28  
29 <  <target name="usage" description="Advises user to run with -projecthelp">
30 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
29 >  <target name="usage" description="Display main targets by running 'ant -projecthelp'">
30 >    <java classname="org.apache.tools.ant.Main">
31 >      <arg value="-projecthelp" />
32 >    </java>
33    </target>
34  
35  
# Line 39 | Line 42
42    <property name="build.debug"          value="true"/>
43    <property name="build.debuglevel"     value="source,lines,vars"/>
44    <property name="build.deprecation"    value="false"/>
45 +  <property name="build.javadoc.access" value="protected"/>
46  
47    <!-- Build locations -->
48    <property name="build.dir"                   location="build"/>
# Line 171 | Line 175
175      <attribute name="workdir"/>
176      <attribute name="classes"/>
177      <attribute name="jvmflags" default=""/>
178 +    <element name="javac-elements" optional="true"/>
179      <sequential>
180  
181      <mkdir dir="@{workdir}/tck-classes"/>
# Line 192 | Line 197
197        <compilerarg value="-XDignore.symbol.file=true"/>
198        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
199        <compilerarg line="${build.args}"/>
200 +      <javac-elements/>
201  
202      </javac>
203  
# Line 210 | Line 216
216      </sequential>
217    </macrodef>
218  
219 +  <macrodef name="run-jtreg-tests">
220 +    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
221 +    <attribute name="source" default="7"/>
222 +    <attribute name="target"/>
223 +    <attribute name="workdir"/>
224 +    <attribute name="classes"/>
225 +    <attribute name="jtregflags" default=""/>
226 +    <sequential>
227 +    <delete dir="@{workdir}/JTwork"   quiet="true"/>
228 +    <delete dir="@{workdir}/JTreport" quiet="true"/>
229 +    <mkdir dir="@{workdir}/JTwork/scratch"/>
230 +    <mkdir dir="@{workdir}/JTreport"/>
231 +    <jtreg dir="@{jtreg.src.dir}"
232 +           jdk="${jdk@{target}.home}"
233 +           workDir="@{workdir}/JTwork"
234 +           reportDir="@{workdir}/JTreport">
235 +
236 +      <arg value="-Xbootclasspath/p:@{classes}"/>
237 +      <arg value="-agentvm"/>
238 +      <arg value="-v:nopass,fail"/>
239 +      <arg value="-vmoptions:-esa -ea"/>
240 +      <arg value="-automatic"/>
241 +      <arg value="-k:!ignore"/>
242 +      <arg line="@{jtregflags}"/>
243 +    </jtreg>
244 +    </sequential>
245 +  </macrodef>
246 +
247    <!-- ALoops classpath -->
248    <path id="loops.classpath">
249      <pathelement location="${build.loops.dir}"/>
# Line 243 | Line 277
277             fork="true">
278  
279        <include name="**/*.java"/>
280 +      <compilerarg value="-Xprefer:source"/>
281        <compilerarg value="-XDignore.symbol.file=true"/>
282        <compilerarg value="-Xlint:all"/>
283        <compilerarg line="${build.args}"/>
# Line 279 | Line 314
314               packagenames="none"
315               link="${jdkapi8docs.url}"
316               overview="${src.dir}/intro.html"
317 +             access="${build.javadoc.access}"
318               sourcepath="${src.dir}:${jdk8src.dir}"
319               classpath=""
320               executable="${javadoc8}">
# Line 408 | Line 444
444  
445    </target>
446  
447 +  <target name="test-tck"
448 +          depends="jar"
449 +          description="Runs tck tests for main directly">
450 +
451 +    <run-tck-tests
452 +      target="8"
453 +      workdir="${build.dir}"
454 +      classes="${product.jar}"/>
455 +  </target>
456 +
457 +  <target name="test-jtreg"
458 +          depends="jar"
459 +          description="Runs jtreg tests for main using the jtreg ant task">
460 +    <run-jtreg-tests
461 +       target="8"
462 +       workdir="${build.dir}"
463 +       classes="${product.jar}"/>
464 +  </target>
465 +
466 +  <target name="test-ng"
467 +          depends="test-tck, test-jtreg"
468 +          description="Runs tck and jtreg tests for main">
469 +  </target>
470  
471    <target name="run-tests"
472            depends="compile-tests">
# Line 574 | Line 633
633             fork="true">
634  
635        <include name="**/*.java"/>
636 +      <compilerarg value="-Xprefer:source"/>
637        <compilerarg value="-XDignore.symbol.file=true"/>
638        <compilerarg value="-Xlint:all"/>
639        <compilerarg line="${build.args}"/>
# Line 600 | Line 660
660      <run-tck-tests
661        target="7"
662        workdir="${build.4jdk7.dir}"
663 <      classes="${4jdk7product.jar}"/>
663 >      classes="${4jdk7product.jar}">
664 >      <javac-elements>
665 >        <!-- JDK8+ test classes -->
666 >        <exclude name="*8Test.java"/>
667 >        <exclude name="CompletableFutureTest.java"/>
668 >        <exclude name="StampedLockTest.java"/>
669 >      </javac-elements>
670 >    </run-tck-tests>
671    </target>
672  
673  
# Line 633 | Line 700
700    </target>
701  
702    <target name="4jdk7-test-jtreg"
703 <          depends="4jdk7compile"
703 >          depends="4jdk7jar"
704            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
705 <    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
706 <    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
707 <    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
708 <    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
642 <    <jtreg dir="${jtreg.src.dir}"
643 <           jdk="${jdk7.home}"
644 <           workDir="${build.4jdk7.dir}/JTwork"
645 <           reportDir="${build.4jdk7.dir}/JTreport">
646 <
647 <      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
648 <      <arg value="-agentvm"/>
649 <      <arg value="-v:nopass,fail"/>
650 <      <arg value="-vmoptions:-esa -ea"/>
651 <      <arg value="-automatic"/>
652 <      <arg value="-k:!ignore"/>
653 <    </jtreg>
705 >    <run-jtreg-tests
706 >       target="7"
707 >       workdir="${build.4jdk7.dir}"
708 >       classes="${4jdk7product.jar}"/>
709    </target>
710  
711  
# Line 670 | Line 725
725               packagenames="none"
726               link="${jdkapi7docs.url}"
727               overview="${4jdk7src.dir}/intro.html"
728 +             access="${build.javadoc.access}"
729               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
730               classpath=""
731               executable="${javadoc7}">
# Line 761 | Line 817
817      <javadoc destdir="${jsr166xdocs.dir}"
818               packagenames="jsr166x.*"
819               link="${jdkapidocs.url}"
820 +             access="${build.javadoc.access}"
821               sourcepath="${topsrc.dir}:${jdk6src.dir}"
822               bootclasspath="${bootclasspath6}"
823               source="5"
# Line 851 | Line 908
908      <javadoc destdir="${jsr166ydocs.dir}"
909               packagenames="jsr166y.*"
910               link="${jdkapidocs.url}"
911 +             access="${build.javadoc.access}"
912               sourcepath="${topsrc.dir}:${jdk6src.dir}"
913               bootclasspath="${bootclasspath6}"
914               source="6"
# Line 941 | Line 999
999      <javadoc destdir="${extra166ydocs.dir}"
1000               packagenames="extra166y.*"
1001               link="${jdkapidocs.url}"
1002 +             access="${build.javadoc.access}"
1003               sourcepath="${topsrc.dir}:${jdk6src.dir}"
1004               bootclasspath="${bootclasspath6}"
1005               source="6"
# Line 1028 | Line 1087
1087      <javadoc destdir="${jsr166edocs.dir}"
1088               packagenames="jsr166e.*"
1089               link="${jdkapidocs.url}"
1090 +             access="${build.javadoc.access}"
1091               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1092               source="7"
1093               executable="${javadoc7}">
# Line 1076 | Line 1136
1136      <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1137    </target>
1138  
1139 +
1140 + <!-- Find buglets that can be detected by static build tools -->
1141 +
1142 +  <target name="lint">
1143 +    <antcall target="dists">
1144 +      <param name="build.javadoc.access" value="private"/>
1145 +    </antcall>
1146 +  </target>
1147 +
1148 +
1149   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines