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.246 by jsr166, Fri Jun 16 20:56:47 2017 UTC vs.
Revision 1.247 by jsr166, Fri Jun 16 21:30:00 2017 UTC

# Line 372 | Line 372
372    <!-- Main targets -->
373  
374    <property name="build.main.java.version" value="9"/>
375 <  <property name="build.main.javac" value="${javac9}"/>
375 >  <!-- Workaround "no nested properties in ant" -->
376 >  <macrodef name="define-build-main-properties">
377 >    <attribute name="v"/>
378 >    <sequential>
379 >      <property name="build.main.java"    value="${java@{v}}"/>
380 >      <property name="build.main.javac"   value="${javac@{v}}"/>
381 >      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
382 >    </sequential>
383 >  </macrodef>
384 >  <define-build-main-properties v="${build.main.java.version}"/>
385  
386    <target name="dists"
387            depends="dist, 4jdk8dist"
# Line 385 | Line 394
394            depends="configure-compiler"
395            description="Compiles src/main sources to build dir">
396  
388 –    <local name="modules"/>
389 –    <condition property="modules">
390 –      <and>
391 –        <available file="${jdk9.home}/jmods" type="dir"/>
392 –        <equals arg1="9" arg2="${build.main.java.version}"/>
393 –      </and>
394 –    </condition>
395 –
397      <local name="destdir"/>
398 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
398 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
398 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
399  
400      <mkdir dir="${destdir}"/>
401  
# Line 412 | Line 412
412             fork="true">
413  
414        <include name="**/*.java"/>
415 <      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
415 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
416        <compilerarg value="-Xprefer:source"/>
417        <compilerarg value="-XDignore.symbol.file=true"/>
418        <compilerarg value="-Xlint:all"/>
# Line 463 | Line 463
463               sourcepath="${src.dir}"
464               classpath=""
465               source="9"
466 <             executable="${javadoc9}">
466 >             executable="${build.main.javadoc}">
467        <fileset dir="${src.dir}" defaultexcludes="yes">
468          <include name="**/*.java"/>
469        </fileset>
# Line 680 | Line 680
680             includeAntRuntime="false"
681             includeJavaRuntime="false"
682             encoding="ASCII"
683 <           executable="${javac9}"
683 >           executable="${build.main.javac}"
684             fork="true">
685  
686        <include name="*.java"/>
# Line 1521 | Line 1521
1521      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1522           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1523      <junit printsummary="true" showoutput="true" haltonfailure="true"
1524 <           jvm="${java9}" fork="true">
1524 >           jvm="${build.main.java}" fork="true">
1525        <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1526        <formatter type="brief"/>
1527        <classpath>

Diff Legend

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