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

Diff of /jsr166/build.xml

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

revision 1.92 by jsr166, Mon Jan 14 07:08:06 2013 UTC revision 1.97 by jsr166, Tue Jan 15 01:15:02 2013 UTC
# Line 38  Line 38 
38    <property name="build.jdk7.dir"              location="${build.dir}/jdk7"/>    <property name="build.jdk7.dir"              location="${build.dir}/jdk7"/>
39    <property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>    <property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>
40    <property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>    <property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>
41      <property name="build.jdk7.tck.classes.dir"  location="${build.jdk7.dir}/tck/classes"/>
42    <property name="build.jdk7.docs.dir"         location="${build.jdk7.dir}/docs"/>    <property name="build.jdk7.docs.dir"         location="${build.jdk7.dir}/docs"/>
43    
44    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
# Line 58  Line 59 
59    
60    <!-- JDK binary locations -->    <!-- JDK binary locations -->
61    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
62    <property name="jdk6.home"  location="${jdks.home}/jdk1.6.0"/>  
63    <property name="jdk7.home"  location="${jdks.home}/jdk1.7.0"/>    <macrodef name="defjdklocations">
64    <property name="jdk8.home"  location="${jdks.home}/jdk1.8.0"/>      <attribute name="v"/>
65    <property name="javac6"     location="${jdk6.home}/bin/javac"/>      <sequential>
66    <property name="javac7"     location="${jdk7.home}/bin/javac"/>      <property name="jdk@{v}.home"  location="${jdks.home}/jdk@{v}"/>
67    <property name="javac8"     location="${jdk8.home}/bin/javac"/>      <property name="java@{v}"      location="${jdk@{v}.home}/bin/java"/>
68    <property name="javadoc6"   location="${jdk6.home}/bin/javadoc"/>      <property name="javac@{v}"     location="${jdk@{v}.home}/bin/javac"/>
69    <property name="javadoc7"   location="${jdk7.home}/bin/javadoc"/>      <property name="javadoc@{v}"   location="${jdk@{v}.home}/bin/javadoc"/>
70    <property name="javadoc8"   location="${jdk8.home}/bin/javadoc"/>      <property name="bootdir@{v}"   location="${jdk@{v}.home}/jre/lib"/>
71    <property name="bootdir6"   location="${jdk6.home}/jre/lib"/>      <property name="bootclasspath@{v}"
72    <property name="bootdir7"   location="${jdk7.home}/jre/lib"/>       value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
73    <property name="bootdir8"   location="${jdk8.home}/jre/lib"/>      </sequential>
74    <property name="bootclasspath6"   value="${bootdir6}/resources.jar:${bootdir6}/rt.jar:${bootdir6}/jsse.jar:${bootdir6}/jce.jar:${bootdir6}/:${bootdir6}/charsets.jar"/>    </macrodef>
75    <property name="bootclasspath7"   value="${bootdir7}/resources.jar:${bootdir7}/rt.jar:${bootdir7}/jsse.jar:${bootdir7}/jce.jar:${bootdir7}/:${bootdir7}/charsets.jar"/>  
76    <property name="bootclasspath8"   value="${bootdir8}/resources.jar:${bootdir8}/rt.jar:${bootdir8}/jsse.jar:${bootdir8}/jce.jar:${bootdir8}/:${bootdir8}/charsets.jar"/>    <defjdklocations v="6"/>
77      <defjdklocations v="7"/>
78      <defjdklocations v="8"/>
79    
80      <macrodef name="run-tck-tests">
81        <attribute name="jvm"/>
82        <attribute name="tck.classes"/>
83        <attribute name="product.jar" default="${product.jar}"/>
84        <attribute name="jvmflags" default=""/>
85        <sequential>
86        <java classname="JSR166TestCase"
87              jvm="@{jvm}" fork="true">
88            <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
89            <jvmarg line="@{jvmflags}"/>
90            <classpath>
91              <pathelement location="${junit.jar}"/>
92              <pathelement location="@{tck.classes}"/>
93            </classpath>
94        </java>
95        </sequential>
96      </macrodef>
97    
98    <!-- Source locations -->    <!-- Source locations -->
99    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 522  Line 543 
543             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
544             includeAntRuntime="false"             includeAntRuntime="false"
545             includeJavaRuntime="false"             includeJavaRuntime="false"
546             executable="${javac6}"             executable="${javac7}"
547             fork="true">             fork="true">
548    
549        <include name="**/*.java"/>        <include name="**/*.java"/>
# Line 532  Line 553 
553    
554      </javac>      </javac>
555    
   </target>  
   
   
   
   <target name="jdk7jar"  
           depends="jdk7compile"  
           description="Builds library jar from compiled sources">  
   
556      <mkdir dir="${build.jdk7.lib.dir}"/>      <mkdir dir="${build.jdk7.lib.dir}"/>
557    
558      <jar destfile="${jdk7product.jar}" index="true">      <jar destfile="${jdk7product.jar}" index="true">
559        <fileset dir="${build.jdk7.classes.dir}"/>        <fileset dir="${build.jdk7.classes.dir}"/>
560      </jar>      </jar>
561    
562        <mkdir dir="${build.jdk7.tck.classes.dir}"/>
563    
564        <javac srcdir="${tck.src.dir}"
565               destdir="${build.jdk7.tck.classes.dir}"
566               debug="${build.debug}"
567               debuglevel="${build.debuglevel}"
568               deprecation="${build.deprecation}"
569               source="1.6"
570               classpath="${junit.jar}"
571               bootclasspath="${jdk7product.jar}:${bootclasspath6}"
572               includeAntRuntime="false"
573               includeJavaRuntime="false"
574               executable="${javac7}"
575               fork="true">
576    
577          <include name="**/*.java"/>
578          <compilerarg line="${build.args}"/>
579          <compilerarg value="-XDignore.symbol.file=true"/>
580          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
581    
582        </javac>
583    
584      </target>
585    
586    
587      <target name="run-jdk7-tck-tests"
588              depends="jdk7compile"
589              description="Runs tck tests for jsr166-jdk7 directly">
590        <run-tck-tests
591          jvm="${java7}"
592          tck.classes="${build.jdk7.tck.classes.dir}"
593          product.jar="${jdk7product.jar}"/>
594    </target>    </target>
595    
596    
597      <target name="run-jdk7-tck-tests-via-junit-task"
598              depends="jdk7compile">
599    
600        <junit printsummary="true"
601               showoutput="true"
602               errorProperty="junit.failed"
603               failureProperty="junit.failed"
604               includeantruntime="true"
605               jvm="${java7}"
606               fork="true">
607    
608          <jvmarg value="-Xbootclasspath/p:${jdk7product.jar}"/>
609          <jvmarg value="-server"/>
610    
611          <classpath>
612            <pathelement location="${junit.jar}"/>
613            <pathelement location="${build.jdk7.tck.classes.dir}"/>
614          </classpath>
615    
616          <formatter type="brief"/>
617    
618          <test name="JSR166TestCase" haltonfailure="no">
619          </test>
620    
621        </junit>
622      </target>
623    
624    
625    <target name="jdk7docs"    <target name="jdk7docs"
626            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs with custom tags to build folder">
# Line 618  Line 690 
690    </target>    </target>
691    
692    <target name="jdk7dist-jar"    <target name="jdk7dist-jar"
693            depends="jdk7clean, jdk7jar">            depends="jdk7clean, jdk7compile">
694    
695      <copy file="${jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${jdk7product.jar}" todir="${dist.dir}"/>
696    
# Line 936  Line 1008 
1008    
1009    <!-- jsr166e -->    <!-- jsr166e -->
1010    
   
1011    <target name="jsr166ecompile"    <target name="jsr166ecompile"
1012            depends="init, configure-compiler"            depends="configure-compiler"
1013            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
1014    
1015      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.dir}"/>
1016    
1017      <javac srcdir="${jsr166esrc.dir}"      <javac srcdir="${topsrc.dir}"
1018            destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.dir}"
1019              debug="${build.debug}"             debug="${build.debug}"
1020         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1021        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1022             source="1.7"             source="1.7"
1023               fork="true">             classpath=""
1024               includeAntRuntime="false"
1025               includeJavaRuntime="false"
1026               executable="${javac7}"
1027               fork="true">
1028    
1029        <include name="**/*.java"/>        <include name="jsr166e/**/*.java"/>
1030        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1031        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1032        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
   
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
1033    
1034      </javac>      </javac>
1035    
# Line 986  Line 1059 
1059    
1060      <javadoc destdir="${build.jsr166ejavadocs.dir}"      <javadoc destdir="${build.jsr166ejavadocs.dir}"
1061               packagenames="jsr166e,jsr166e.extra"               packagenames="jsr166e,jsr166e.extra"
1062               link="${jdkapidocs.url}"               link="${jdkapi7docs.url}"
1063               source="1.7"               source="1.7"
1064               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}"
1065               additionalparam="-XDignore.symbol.file=true" />               executable="${javadoc7}"
1066                 additionalparam="-XDignore.symbol.file=true" >
1067          <fileset dir="${topsrc.dir}" defaultexcludes="yes">
1068            <include name="jsr166e/**/*.java"/>
1069          </fileset>
1070        </javadoc>
1071    
1072    </target>    </target>
1073    

Legend:
Removed from v.1.92  
changed lines
  Added in v.1.97

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27