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

Diff of /jsr166/build.xml

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

revision 1.112 by jsr166, Sun Jan 20 03:44:54 2013 UTC revision 1.116 by jsr166, Sun Jan 20 07:24:52 2013 UTC
# Line 35  Line 35 
35    
36    
37    <!-- Compilation options -->    <!-- Compilation options -->
38    <property name="build.sourcelevel"    value="1.6"/>    <property name="build.sourcelevel"    value="6"/>
39    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
40    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
41    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
# Line 49  Line 49 
49    
50    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
53    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54    
55    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
# Line 57  Line 57 
57    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
58    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59    
60      <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
61      <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
62      <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63      <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
64    
65    <!-- JDK binary locations -->    <!-- JDK binary locations -->
66    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
67    
# Line 79  Line 84 
84    <defjdklocations v="8"/>    <defjdklocations v="8"/>
85    
86    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
87      <attribute name="jvm"/>      <attribute name="target"/>
88      <attribute name="tck.classes"/>      <attribute name="workdir"/>
89      <attribute name="product.jar" default="${product.jar}"/>      <attribute name="product.jar" default="${product.jar}"/>
90      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default=""/>
91      <sequential>      <sequential>
92      <java classname="JSR166TestCase"  
93            jvm="@{jvm}" fork="true">      <mkdir dir="@{workdir}/tck-classes"/>
94    
95        <javac srcdir="${tck.src.dir}"
96               destdir="@{workdir}/tck-classes"
97               debug="${build.debug}"
98               debuglevel="${build.debuglevel}"
99               deprecation="${build.deprecation}"
100               source="6"
101               classpath="${junit.jar}"
102               bootclasspath="@{product.jar}:${bootclasspath6}"
103               includeAntRuntime="false"
104               includeJavaRuntime="false"
105               executable="${javac@{target}}"
106               fork="true">
107    
108          <include name="**/*.java"/>
109          <compilerarg value="-XDignore.symbol.file=true"/>
110          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
111          <compilerarg line="${build.args}"/>
112        </javac>
113    
114        <java classname="JSR166TestCase" jvm="${java@{target}}" fork="true">
115          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
116          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
117          <classpath>          <classpath>
118            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
119            <pathelement location="@{tck.classes}"/>            <pathelement location="@{workdir}/tck-classes"/>
120          </classpath>          </classpath>
121      </java>      </java>
122    
123      </sequential>      </sequential>
124    </macrodef>    </macrodef>
125    
# Line 143  Line 170 
170    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Default jdk api doc location (latest stable release seems best) -->
171    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
172    
173      <!-- Define the "jtreg" task -->
174      <!-- See the docs in "jtreg -onlineHelp" -->
175      <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
176               classpath="${lib.dir}/jtreg.jar" />
177    
178    <!-- Test classpath -->    <!-- Test classpath -->
179    <path id="test.classpath">    <path id="test.classpath">
180      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
# Line 538  Line 570 
570    
571      </javac>      </javac>
572    
573      <jar destfile="${4jdk7product.jar}" index="true">    </target>
       <fileset dir="${build.4jdk7.classes.dir}"/>  
     </jar>  
   
     <mkdir dir="${build.4jdk7.tck.classes.dir}"/>  
   
     <javac srcdir="${tck.src.dir}"  
            destdir="${build.4jdk7.tck.classes.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            classpath="${junit.jar}"  
            bootclasspath="${4jdk7product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac7}"  
            fork="true">  
574    
575        <include name="**/*.java"/>    <target name="4jdk7-jar"
576        <compilerarg line="${build.args}"/>            depends="4jdk7compile"
577        <compilerarg value="-XDignore.symbol.file=true"/>            description="Builds library jar from compiled sources">
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
578    
579      </javac>      <jar destfile="${4jdk7product.jar}">
580          <fileset dir="${build.4jdk7.classes.dir}"/>
581        </jar>
582    
583    </target>    </target>
584    
585    
586    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
587            depends="4jdk7compile"            depends="4jdk7-jar"
588            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
589    
590      <run-tck-tests      <run-tck-tests
591        jvm="${java7}"        target="7"
592        tck.classes="${build.4jdk7.tck.classes.dir}"        workdir="${build.4jdk7.dir}"
593        product.jar="${4jdk7product.jar}"/>        product.jar="${4jdk7product.jar}"/>
594    </target>    </target>
595    
# Line 605  Line 622 
622      </junit>      </junit>
623    </target>    </target>
624    
625      <target name="4jdk7-test-jtreg"
626              depends="4jdk7compile"
627              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
628        <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
629        <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
630        <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
631        <mkdir dir="${build.4jdk7.dir}/JTreport"/>
632        <jtreg dir="${jtreg.src.dir}"
633               jdk="${jdk7.home}"
634               workDir="${build.4jdk7.dir}/JTwork"
635               reportDir="${build.4jdk7.dir}/JTreport">
636    
637          <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
638          <arg value="-agentvm"/>
639          <arg value="-v:nopass,fail"/>
640          <arg value="-vmoptions:-esa -ea"/>
641          <arg value="-automatic"/>
642          <arg value="-k:!ignore"/>
643        </jtreg>
644      </target>
645    
646    
647      <target name="4jdk7-test"
648              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
649              description="Runs tck and jtreg tests for jsr166-4jdk7">
650      </target>
651    
652    
653    <target name="4jdk7docs"    <target name="4jdk7docs"
654            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
# Line 662  Line 706 
706            depends="configure-compiler"            depends="configure-compiler"
707            description="Compiles jsr166x sources to build dir">            description="Compiles jsr166x sources to build dir">
708    
709      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
710    
711      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
712             destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
713             debug="${build.debug}"             debug="${build.debug}"
714             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
715             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 693  Line 737 
737            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
738    
739      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
740        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
741      </jar>      </jar>
742    
743    </target>    </target>
# Line 713  Line 757 
757               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
758               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
759               executable="${javadoc7}"               executable="${javadoc7}"
760               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true"/>
761    
762    </target>    </target>
763    
# Line 753  Line 797 
797            depends="configure-compiler"            depends="configure-compiler"
798            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
799    
800      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
801    
802      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
803             destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
804             debug="${build.debug}"             debug="${build.debug}"
805             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
806             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 781  Line 825 
825            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
826    
827      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
828        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
829      </jar>      </jar>
830    
831    </target>    </target>
# Line 801  Line 845 
845               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
846               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
847               executable="${javadoc7}"               executable="${javadoc7}"
848               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true"/>
849    
850    </target>    </target>
851    
# Line 841  Line 885 
885            depends="configure-compiler, jsr166yjar"            depends="configure-compiler, jsr166yjar"
886            description="Compiles extra166y sources">            description="Compiles extra166y sources">
887    
888      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
889    
890      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
891             destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
892             debug="${build.debug}"             debug="${build.debug}"
893             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
894             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 872  Line 916 
916            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
917    
918      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
919        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
920      </jar>      </jar>
921    
922    </target>    </target>
# Line 892  Line 936 
936               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
937               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
938               executable="${javadoc7}"               executable="${javadoc7}"
939               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true"/>
940    
941    </target>    </target>
942    
# Line 930  Line 974 
974            depends="configure-compiler"            depends="configure-compiler"
975            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
976    
977      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
978    
979      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
980             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
981             debug="${build.debug}"             debug="${build.debug}"
982             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
983             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 960  Line 1004 
1004            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1005    
1006      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1007        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1008      </jar>      </jar>
1009    
1010    </target>    </target>
Legend:
Removed from v.1.112  
changed lines
  Added in v.1.116
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27