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.191 by jsr166, Fri Nov 6 00:12:54 2015 UTC vs.
Revision 1.194 by jsr166, Wed Dec 16 02:29:06 2015 UTC

# Line 175 | Line 175
175    <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
176    <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
177    <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
178 <  <!-- The expected canonical location does not yet exist as of 2014-07 -->
178 >  <!-- The expected canonical location does not yet exist as of 2015-11 -->
179    <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
180    <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
181    <!-- Default jdk doc location (latest stable release seems best) -->
# Line 310 | Line 310
310      <delete dir="@{workdir}/JTwork"   quiet="true"/>
311      <delete dir="@{workdir}/JTreport" quiet="true"/>
312      <mkdir dir="@{workdir}/JTwork/scratch"/>
313 <    <mkdir dir="@{workdir}/JTreport"/>
313 >    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
314 >    <mkdir dir="@{workdir}/JTreport/html"/>
315 >    <mkdir dir="@{workdir}/JTreport/text"/>
316      <jtreg dir="${jtreg@{target}.src.dir}"
317             jdk="${jdk@{target}.home}"
318             workDir="@{workdir}/JTwork"
# Line 386 | Line 388
388        <compilerarg line="${build.args}"/>
389  
390      </javac>
391 +
392 +    <!-- We need jdk9's Contended annotation, but at compile time only -->
393 +    <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
394    </target>
395  
396  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines