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.199 by jsr166, Fri Mar 25 03:36:15 2016 UTC vs.
Revision 1.200 by jsr166, Sat Mar 26 06:22:49 2016 UTC

# Line 69 | Line 69
69    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
70    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
71  
72 +  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
73 +  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
74 +  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
75 +  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
76 +
77    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
78    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
79    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
# Line 135 | Line 140
140    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
141    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
142    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
143 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
143 >  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
144    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
145    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
146    <property name="lib.dir"              location="${basedir}/lib"/>
147    <property name="dist.dir"             location="${basedir}/dist"/>
148    <property name="topsrc.dir"           location="${basedir}/src"/>
149    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
150 +  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
151    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
152    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
153    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
# Line 150 | Line 156
156    <!-- Javadoc locations -->
157    <property name="docs.dir"          location="${build.dir}/docs"/>
158    <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
159 +  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
160    <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
161    <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
162    <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
# Line 157 | Line 164
164  
165    <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
166    <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
167 +  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
168    <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
169    <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
170    <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
# Line 165 | Line 173
173    <!-- Jar locations -->
174    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
175    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
176 +  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
177    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
178    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
179    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
# Line 176 | Line 185
185    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
186    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
187    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
188 <  <!-- The expected canonical location does not yet exist as of 2015-11 -->
188 >  <!-- The expected canonical location does not yet exist as of 2016-03 -->
189    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
190    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
191    <!-- Default jdk doc location (latest stable release seems best) -->
# Line 351 | Line 360
360    <property name="build.main.javac" value="${javac9}"/>
361  
362    <target name="dists"
363 <          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
363 >          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
364            description="Builds all public jars and docs"/>
365  
366    <target name="compile"
# Line 654 | Line 663
663    </target>
664  
665  
666 +  <!-- jsr166 4jdk8 -->
667 +
668 +  <target name="4jdk8compile"
669 +          depends="configure-compiler"
670 +          description="Compiles src/jdk8 sources, targeting jdk8">
671 +
672 +    <mkdir dir="${build.4jdk8.classes.dir}"/>
673 +
674 +    <javac srcdir="${4jdk8src.dir}"
675 +           destdir="${build.4jdk8.classes.dir}"
676 +           debug="${build.debug}"
677 +           debuglevel="${build.debuglevel}"
678 +           deprecation="${build.deprecation}"
679 +           source="8"
680 +           target="8"
681 +           classpath=""
682 +           bootclasspath="${bootclasspath8}"
683 +           includeAntRuntime="false"
684 +           includeJavaRuntime="false"
685 +           executable="${javac8}"
686 +           fork="true">
687 +
688 +      <include name="**/*.java"/>
689 +      <compilerarg value="-Xprefer:source"/>
690 +      <compilerarg value="-XDignore.symbol.file=true"/>
691 +      <compilerarg value="-Xlint:all"/>
692 +      <compilerarg value="-Werror"/>
693 +      <compilerarg line="${build.args}"/>
694 +
695 +    </javac>
696 +  </target>
697 +
698 +  <target name="4jdk8doclint"
699 +          depends="configure-compiler"
700 +          description="Finds doclint warnings">
701 +
702 +    <mkdir dir="${build.4jdk8.classes.dir}"/>
703 +
704 +    <javac srcdir="${4jdk8src.dir}"
705 +           destdir="${build.4jdk8.classes.dir}"
706 +           debug="${build.debug}"
707 +           debuglevel="${build.debuglevel}"
708 +           deprecation="${build.deprecation}"
709 +           source="8"
710 +           target="8"
711 +           classpath=""
712 +           bootclasspath="${bootclasspath8}"
713 +           includeAntRuntime="false"
714 +           includeJavaRuntime="false"
715 +           executable="${javac8}"
716 +           fork="true">
717 +
718 +      <include name="**/*.java"/>
719 +      <compilerarg value="-Xprefer:source"/>
720 +      <compilerarg value="-XDignore.symbol.file=true"/>
721 +      <compilerarg value="-Xlint:all"/>
722 +      <compilerarg value="-Xdoclint:all/protected"/>
723 +      <compilerarg line="${build.args}"/>
724 +
725 +    </javac>
726 +  </target>
727 +
728 +
729 +  <target name="4jdk8jar"
730 +          depends="4jdk8compile"
731 +          description="Builds library jar from compiled sources">
732 +
733 +    <jar destfile="${4jdk8product.jar}">
734 +      <fileset dir="${build.4jdk8.classes.dir}"/>
735 +      <manifest>
736 +        <attribute name="Built-By" value="${user.name}"/>
737 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
738 +      </manifest>
739 +    </jar>
740 +
741 +  </target>
742 +
743 +
744 +  <target name="4jdk8-tck"
745 +          depends="4jdk8jar"
746 +          description="Runs tck tests for jsr166-4jdk8 directly">
747 +
748 +    <run-tck-tests
749 +      target="8"
750 +      workdir="${build.4jdk8.dir}"
751 +      classes="${4jdk8product.jar}">
752 +      <javac-elements>
753 +        <!-- JDK9+ test classes -->
754 +        <exclude name="*9Test.java"/>
755 +        <exclude name="*10Test.java"/>
756 +      </javac-elements>
757 +    </run-tck-tests>
758 +  </target>
759 +
760 +
761 +  <target name="4jdk8-jtreg"
762 +          depends="4jdk8jar"
763 +          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
764 +    <run-jtreg-tests
765 +       target="8"
766 +       workdir="${build.4jdk8.dir}"
767 +       classes="${4jdk8product.jar}"/>
768 +  </target>
769 +
770 +
771 +  <target name="4jdk8-test"
772 +          depends="4jdk8-tck, 4jdk8-jtreg"
773 +          description="Runs tck and jtreg tests for jsr166-4jdk8">
774 +  </target>
775 +
776 +
777 +  <target name="4jdk8docs"
778 +          description="Builds javadocs for src/jdk8 to dist dir">
779 +
780 +    <delete dir="${4jdk8docs.dir}"/>
781 +    <mkdir dir="${4jdk8docs.dir}"/>
782 +
783 +    <javadoc destdir="${4jdk8docs.dir}"
784 +             packagenames="none"
785 +             link="${java8.api.url}"
786 +             overview="${4jdk8src.dir}/intro.html"
787 +             access="${build.javadoc.access}"
788 +             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
789 +             classpath=""
790 +             executable="${javadoc8}">
791 +      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
792 +        <include name="**/*.java"/>
793 +      </fileset>
794 +      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
795 +      <arg value="-XDignore.symbol.file=true"/>
796 +      <arg value="-tag"/>
797 +      <arg value="${javadoc.jls.option}"/>
798 +      <arg value="-tag"/>
799 +      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
800 +      <arg value="-tag"/>
801 +      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
802 +      <arg value="-tag"/>
803 +      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
804 +    </javadoc>
805 +  </target>
806 +
807 +
808 +  <target name="4jdk8dist"
809 +          depends="4jdk8dist-jar, 4jdk8dist-docs"
810 +          description="Puts all distributable products in single hierarchy"/>
811 +
812 +
813 +  <target name="4jdk8clean"
814 +          description="Removes all 4jdk8 build products">
815 +
816 +    <delete dir="${build.4jdk8.dir}"/>
817 +
818 +  </target>
819 +
820 +
821 +  <target name="4jdk8dist-jar"
822 +          depends="4jdk8clean, 4jdk8jar">
823 +    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
824 +  </target>
825 +
826 +
827 +  <target name="4jdk8dist-docs"
828 +          depends="4jdk8clean, 4jdk8docs">
829 +    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
830 +  </target>
831 +
832 +
833 +
834    <!-- jsr166 4jdk7 -->
835  
836    <target name="4jdk7compile"

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines