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.198 by jsr166, Thu Mar 24 20:44:47 2016 UTC vs.
Revision 1.199 by jsr166, Fri Mar 25 03:36:15 2016 UTC

# Line 27 | Line 27
27    (e.g. mercurial forest) or a symlink to same.
28  
29    Alternatively, define ant variables thus:
30 <  ant -Djdk$N.home=...
30 >  ant -Djdk$N.home=... -Djdk$N.src.home=...
31    for $N in 6 7 8 9 ...
32  
33    As of 2015-09, there is incomplete hacky support for jigsaw
34    Build for jigsaw using something like:
35 <  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist
35 >  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.home="$HOME/jdk/src/jigsaw" clean test dist
36    "docs" target is still broken.
37   ------------------------------------------------------------------------------
38    </description>
# Line 85 | Line 85
85    <macrodef name="defjdklocations">
86      <attribute name="v"/>
87      <sequential>
88 <    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
89 <    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
90 <    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
91 <    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
88 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
89 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
90 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
91 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
92 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
93      <local name="have.java.base"/>
94      <available property="have.java.base"
95 <      file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
96 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
95 >      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
96 >    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
97        if:set="have.java.base"/>
98 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
98 >    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
99        unless:set="have.java.base"/>
100      <local name="modules"/>
101      <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
# Line 427 | Line 428
428               link="${java9.api.url}"
429               overview="${src.dir}/intro.html"
430               access="${build.javadoc.access}"
431 <             sourcepath="${src.dir}:${jdk9src.dir}"
431 >             sourcepath="${src.dir}:${jdk9.src.dir}"
432               classpath=""
433               executable="${javadoc9}">
434        <fileset dir="${src.dir}" defaultexcludes="yes">
# Line 812 | Line 813
813               link="${java7.api.url}"
814               overview="${4jdk7src.dir}/intro.html"
815               access="${build.javadoc.access}"
816 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
816 >             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
817               classpath=""
818               executable="${javadoc7}">
819        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
# Line 906 | Line 907
907               packagenames="jsr166x.*"
908               link="${java.api.url}"
909               access="${build.javadoc.access}"
910 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
910 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
911               bootclasspath="${bootclasspath6}"
912               source="5"
913               executable="${javadoc7}">
# Line 998 | Line 999
999               packagenames="jsr166y.*"
1000               link="${java.api.url}"
1001               access="${build.javadoc.access}"
1002 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1002 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1003               bootclasspath="${bootclasspath6}"
1004               source="6"
1005               executable="${javadoc7}">
# Line 1091 | Line 1092
1092               packagenames="extra166y.*"
1093               link="${java.api.url}"
1094               access="${build.javadoc.access}"
1095 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1095 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1096               bootclasspath="${bootclasspath6}"
1097               source="6"
1098               executable="${javadoc7}">
# Line 1212 | Line 1213
1213               packagenames="jsr166e.*"
1214               link="${java.api.url}"
1215               access="${build.javadoc.access}"
1216 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1216 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1217               source="${build.jsr166e.java.version}"
1218               executable="${javadoc7}">
1219        <arg line="-Xdocrootparent ${java.docroot.url}"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines