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.196 by jsr166, Sat Jan 2 21:02:44 2016 UTC vs.
Revision 1.203 by jsr166, Sat Mar 26 16:49:22 2016 UTC

# Line 7 | Line 7
7  
8    Usage: ant [target]
9  
10 +  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
11 +  more details.
12 +
13    User-specific settings are read from user.properties.
14    See user.properties.sample for an explanation of some useful settings.
15  
# Line 27 | Line 30
30    (e.g. mercurial forest) or a symlink to same.
31  
32    Alternatively, define ant variables thus:
33 <  ant -Djdk$N.home=...
33 >  ant -Djdk$N.home=... -Djdk$N.src.home=...
34    for $N in 6 7 8 9 ...
35  
36 <  As of 2015-09, there is incomplete hacky support for jigsaw
37 <  Build for jigsaw using something like:
35 <  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist
36 <  "docs" target is still broken.
36 >  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37 >  target is currently broken.
38   ------------------------------------------------------------------------------
39    </description>
40  
# Line 69 | Line 70
70    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
71    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
72  
73 +  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
74 +  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
75 +  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
76 +  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
77 +
78    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
79    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
80    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
# Line 85 | Line 91
91    <macrodef name="defjdklocations">
92      <attribute name="v"/>
93      <sequential>
94 <    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
95 <    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
96 <    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
97 <    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
94 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
95 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
96 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
97 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
98 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
99      <local name="have.java.base"/>
100      <available property="have.java.base"
101 <      file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
102 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
101 >      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
102 >    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
103        if:set="have.java.base"/>
104 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
104 >    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
105        unless:set="have.java.base"/>
106      <local name="modules"/>
107      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
# Line 134 | Line 141
141    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
142    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
143    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
144 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
144 >  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
145    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
146    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
147    <property name="lib.dir"              location="${basedir}/lib"/>
148    <property name="dist.dir"             location="${basedir}/dist"/>
149    <property name="topsrc.dir"           location="${basedir}/src"/>
150    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
151 +  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
152    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
153    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
154    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
# Line 149 | Line 157
157    <!-- Javadoc locations -->
158    <property name="docs.dir"          location="${build.dir}/docs"/>
159    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
160 +  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
161    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
162    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
163    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
# Line 156 | Line 165
165  
166    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
167    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
168 +  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
169    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
170    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
171    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
# Line 164 | Line 174
174    <!-- Jar locations -->
175    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
176    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
177 +  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
178    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
179    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
180    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
# Line 175 | Line 186
186    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
187    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
188    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
189 <  <!-- The expected canonical location does not yet exist as of 2015-11 -->
189 >  <!-- The expected canonical location does not yet exist as of 2016-03 -->
190    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
191    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
192    <!-- Default jdk doc location (latest stable release seems best) -->
# Line 209 | Line 220
220      <attribute name="compile-target" default="@{target}"/>
221      <attribute name="workdir"/>
222      <attribute name="classes"/>
223 <    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
223 >    <!--
224 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
225 >    -->
226 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
227      <element name="javac-elements" optional="true"/>
228  
229      <sequential>
# Line 256 | Line 270
270          <syspropertyset id="system-properties-used-by-tck">
271            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
272            <propertyref prefix="jsr166."/>
273 +          <propertyref name="test.timeout.factor"/>
274          </syspropertyset>
275  
276          <classpath>
# Line 349 | Line 364
364    <property name="build.main.javac" value="${javac9}"/>
365  
366    <target name="dists"
367 <          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
367 >          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
368            description="Builds all public jars and docs"/>
369  
370    <target name="compile"
# Line 394 | Line 409
409      </javac>
410  
411      <!-- We need jdk9's Contended annotation, but at compile time only -->
412 <    <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
412 >    <!--
413 >        <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
414 >    -->
415    </target>
416  
417  
# Line 426 | Line 443
443               link="${java9.api.url}"
444               overview="${src.dir}/intro.html"
445               access="${build.javadoc.access}"
446 <             sourcepath="${src.dir}:${jdk9src.dir}"
446 >             sourcepath="${src.dir}:${jdk9.src.dir}"
447               classpath=""
448               executable="${javadoc9}">
449        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 444 | Line 461
461        <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
462        <arg value="-tag"/>
463        <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
464 + <!-- tags added in jdk9 -->
465 +      <arg value="-tag"/>
466 +      <arg value="revised:X"/>
467 +      <arg value="-tag"/>
468 +      <arg value="spec:X"/>
469      </javadoc>
470    </target>
471  
# Line 594 | Line 616
616    <!-- Various demos and test programs -->
617  
618  
619 <  <target name="loops" depends="configure-compiler"
620 <          description="Benchmark from Doug Lea's AQS paper">
619 >  <!-- description="Benchmark from Doug Lea's AQS paper" -->
620 >  <target name="loops" depends="configure-compiler">
621  
622      <mkdir dir="${build.loops.dir}"/>
623  
# Line 647 | Line 669
669    </target>
670  
671  
672 +  <!-- jsr166 4jdk8 -->
673 +
674 +  <target name="4jdk8compile"
675 +          depends="configure-compiler"
676 +          description="Compiles src/jdk8 sources, targeting jdk8">
677 +
678 +    <mkdir dir="${build.4jdk8.classes.dir}"/>
679 +
680 +    <javac srcdir="${4jdk8src.dir}"
681 +           destdir="${build.4jdk8.classes.dir}"
682 +           debug="${build.debug}"
683 +           debuglevel="${build.debuglevel}"
684 +           deprecation="${build.deprecation}"
685 +           source="8"
686 +           target="8"
687 +           classpath=""
688 +           bootclasspath="${bootclasspath8}"
689 +           includeAntRuntime="false"
690 +           includeJavaRuntime="false"
691 +           executable="${javac8}"
692 +           fork="true">
693 +
694 +      <include name="**/*.java"/>
695 +      <compilerarg value="-Xprefer:source"/>
696 +      <compilerarg value="-XDignore.symbol.file=true"/>
697 +      <compilerarg value="-Xlint:all"/>
698 +      <compilerarg value="-Werror"/>
699 +      <compilerarg line="${build.args}"/>
700 +
701 +    </javac>
702 +  </target>
703 +
704 +  <target name="4jdk8doclint"
705 +          depends="configure-compiler"
706 +          description="Finds doclint warnings">
707 +
708 +    <mkdir dir="${build.4jdk8.classes.dir}"/>
709 +
710 +    <javac srcdir="${4jdk8src.dir}"
711 +           destdir="${build.4jdk8.classes.dir}"
712 +           debug="${build.debug}"
713 +           debuglevel="${build.debuglevel}"
714 +           deprecation="${build.deprecation}"
715 +           source="8"
716 +           target="8"
717 +           classpath=""
718 +           bootclasspath="${bootclasspath8}"
719 +           includeAntRuntime="false"
720 +           includeJavaRuntime="false"
721 +           executable="${javac8}"
722 +           fork="true">
723 +
724 +      <include name="**/*.java"/>
725 +      <compilerarg value="-Xprefer:source"/>
726 +      <compilerarg value="-XDignore.symbol.file=true"/>
727 +      <compilerarg value="-Xlint:all"/>
728 +      <compilerarg value="-Xdoclint:all/protected"/>
729 +      <compilerarg line="${build.args}"/>
730 +
731 +    </javac>
732 +  </target>
733 +
734 +
735 +  <target name="4jdk8jar"
736 +          depends="4jdk8compile"
737 +          description="Builds library jar from compiled sources">
738 +
739 +    <jar destfile="${4jdk8product.jar}">
740 +      <fileset dir="${build.4jdk8.classes.dir}"/>
741 +      <manifest>
742 +        <attribute name="Built-By" value="${user.name}"/>
743 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
744 +      </manifest>
745 +    </jar>
746 +
747 +  </target>
748 +
749 +
750 +  <target name="4jdk8-tck"
751 +          depends="4jdk8jar"
752 +          description="Runs tck tests for jsr166-4jdk8 directly">
753 +
754 +    <run-tck-tests
755 +      target="8"
756 +      workdir="${build.4jdk8.dir}"
757 +      classes="${4jdk8product.jar}">
758 +      <javac-elements>
759 +        <!-- JDK9+ test classes -->
760 +        <exclude name="*9Test.java"/>
761 +        <exclude name="*10Test.java"/>
762 +      </javac-elements>
763 +    </run-tck-tests>
764 +  </target>
765 +
766 +
767 +  <target name="4jdk8-jtreg"
768 +          depends="4jdk8jar"
769 +          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
770 +    <run-jtreg-tests
771 +       target="8"
772 +       workdir="${build.4jdk8.dir}"
773 +       classes="${4jdk8product.jar}"/>
774 +  </target>
775 +
776 +
777 +  <target name="4jdk8-test"
778 +          depends="4jdk8-tck, 4jdk8-jtreg"
779 +          description="Runs tck and jtreg tests for jsr166-4jdk8">
780 +  </target>
781 +
782 +
783 +  <target name="4jdk8docs"
784 +          description="Builds javadocs for src/jdk8 to dist dir">
785 +
786 +    <delete dir="${4jdk8docs.dir}"/>
787 +    <mkdir dir="${4jdk8docs.dir}"/>
788 +
789 +    <javadoc destdir="${4jdk8docs.dir}"
790 +             packagenames="none"
791 +             link="${java8.api.url}"
792 +             overview="${4jdk8src.dir}/intro.html"
793 +             access="${build.javadoc.access}"
794 +             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
795 +             classpath=""
796 +             executable="${javadoc8}">
797 +      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
798 +        <include name="**/*.java"/>
799 +      </fileset>
800 +      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
801 +      <arg value="-XDignore.symbol.file=true"/>
802 +      <arg value="-tag"/>
803 +      <arg value="${javadoc.jls.option}"/>
804 +      <arg value="-tag"/>
805 +      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
806 +      <arg value="-tag"/>
807 +      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
808 +      <arg value="-tag"/>
809 +      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
810 +    </javadoc>
811 +  </target>
812 +
813 +
814 +  <target name="4jdk8dist"
815 +          depends="4jdk8dist-jar, 4jdk8dist-docs"
816 +          description="Puts all distributable products in single hierarchy"/>
817 +
818 +
819 +  <target name="4jdk8clean"
820 +          description="Removes all 4jdk8 build products">
821 +
822 +    <delete dir="${build.4jdk8.dir}"/>
823 +
824 +  </target>
825 +
826 +
827 +  <target name="4jdk8dist-jar"
828 +          depends="4jdk8clean, 4jdk8jar">
829 +    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
830 +  </target>
831 +
832 +
833 +  <target name="4jdk8dist-docs"
834 +          depends="4jdk8clean, 4jdk8docs">
835 +    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
836 +  </target>
837 +
838 +
839 +
840    <!-- jsr166 4jdk7 -->
841  
842    <target name="4jdk7compile"
# Line 751 | Line 941
941    </target>
942  
943  
944 +  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
945    <target name="4jdk7-tck-junit"
946 <          depends="4jdk7compile"
756 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
946 >          depends="4jdk7compile">
947  
948      <junit printsummary="true"
949             showoutput="true"
# Line 806 | Line 996
996               link="${java7.api.url}"
997               overview="${4jdk7src.dir}/intro.html"
998               access="${build.javadoc.access}"
999 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
999 >             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1000               classpath=""
1001               executable="${javadoc7}">
1002        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
# Line 900 | Line 1090
1090               packagenames="jsr166x.*"
1091               link="${java.api.url}"
1092               access="${build.javadoc.access}"
1093 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1093 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1094               bootclasspath="${bootclasspath6}"
1095               source="5"
1096               executable="${javadoc7}">
# Line 992 | Line 1182
1182               packagenames="jsr166y.*"
1183               link="${java.api.url}"
1184               access="${build.javadoc.access}"
1185 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1185 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1186               bootclasspath="${bootclasspath6}"
1187               source="6"
1188               executable="${javadoc7}">
# Line 1085 | Line 1275
1275               packagenames="extra166y.*"
1276               link="${java.api.url}"
1277               access="${build.javadoc.access}"
1278 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1278 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1279               bootclasspath="${bootclasspath6}"
1280               source="6"
1281               executable="${javadoc7}">
# Line 1206 | Line 1396
1396               packagenames="jsr166e.*"
1397               link="${java.api.url}"
1398               access="${build.javadoc.access}"
1399 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1399 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1400               source="${build.jsr166e.java.version}"
1401               executable="${javadoc7}">
1402        <arg line="-Xdocrootparent ${java.docroot.url}"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines