/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.246 by jsr166, Fri Jun 16 20:56:47 2017 UTC revision 1.248 by jsr166, Sat Jun 17 01:26:31 2017 UTC
# Line 372  Line 372 
372    <!-- Main targets -->    <!-- Main targets -->
373    
374    <property name="build.main.java.version" value="9"/>    <property name="build.main.java.version" value="9"/>
375    <property name="build.main.javac" value="${javac9}"/>    <!-- 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"    <target name="dists"
387            depends="dist, 4jdk8dist"            depends="dist, 4jdk8dist"
# Line 385  Line 394 
394            depends="configure-compiler"            depends="configure-compiler"
395            description="Compiles src/main sources to build dir">            description="Compiles src/main sources to build dir">
396    
     <local name="modules"/>  
     <condition property="modules">  
       <and>  
         <available file="${jdk9.home}/jmods" type="dir"/>  
         <equals arg1="9" arg2="${build.main.java.version}"/>  
       </and>  
     </condition>  
   
397      <local name="destdir"/>      <local name="destdir"/>
398      <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>      <property name="destdir" value="${build.classes.dir}/java.base"/>
     <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>  
399    
400      <mkdir dir="${destdir}"/>      <mkdir dir="${destdir}"/>
401    
# Line 412  Line 412 
412             fork="true">             fork="true">
413    
414        <include name="**/*.java"/>        <include name="**/*.java"/>
415        <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>        <compilerarg value="--patch-module=java.base=${src.dir}"/>
416        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
417        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
418        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
# Line 463  Line 463 
463               sourcepath="${src.dir}"               sourcepath="${src.dir}"
464               classpath=""               classpath=""
465               source="9"               source="9"
466               executable="${javadoc9}">               executable="${build.main.javadoc}">
467        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
468          <include name="**/*.java"/>          <include name="**/*.java"/>
469        </fileset>        </fileset>
# Line 597  Line 597 
597    
598  <!--   </target> -->  <!--   </target> -->
599    
600  <!--   <target name="test89" -->    <target name="test910"
601  <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->            description="Runs tck and jtreg tests for src/main for multiple java versions">
602    
603  <!--     <antcall target="clean"/> -->      <antcall target="clean"/>
604  <!--     <antcall target="test"> -->      <antcall target="test">
605  <!--       <param name="build.main.java.version" value="8"/> -->        <param name="build.main.java.version" value="9"/>
606  <!--       <param name="build.main.javac" value="${javac8}"/> -->      </antcall>
 <!--     </antcall> -->  
607    
608  <!--     <antcall target="clean"/> -->      <antcall target="clean"/>
609  <!--     <antcall target="test"> -->      <antcall target="test">
610  <!--       <param name="build.main.java.version" value="9"/> -->        <param name="build.main.java.version" value="10"/>
611  <!--       <param name="build.main.javac" value="${javac9}"/> -->      </antcall>
 <!--     </antcall> -->  
612    
613  <!--   </target> -->    </target>
614    
615    
616    
# Line 680  Line 678 
678             includeAntRuntime="false"             includeAntRuntime="false"
679             includeJavaRuntime="false"             includeJavaRuntime="false"
680             encoding="ASCII"             encoding="ASCII"
681             executable="${javac9}"             executable="${build.main.javac}"
682             fork="true">             fork="true">
683    
684        <include name="*.java"/>        <include name="*.java"/>
# Line 1521  Line 1519 
1519      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1520           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1521      <junit printsummary="true" showoutput="true" haltonfailure="true"      <junit printsummary="true" showoutput="true" haltonfailure="true"
1522             jvm="${java9}" fork="true">             jvm="${build.main.java}" fork="true">
1523        <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>        <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1524        <formatter type="brief"/>        <formatter type="brief"/>
1525        <classpath>        <classpath>
Legend:
Removed from v.1.246  
changed lines
  Added in v.1.248
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27