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

Diff of /jsr166/build.xml

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

revision 1.113 by jsr166, Sun Jan 20 03:51:38 2013 UTC revision 1.115 by jsr166, Sun Jan 20 06:11:07 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 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 143  Line 148 
148    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Default jdk api doc location (latest stable release seems best) -->
149    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
150    
151      <!-- Define the "jtreg" task -->
152      <!-- See the docs in "jtreg -onlineHelp" -->
153      <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
154               classpath="${lib.dir}/jtreg.jar" />
155    
156    <!-- Test classpath -->    <!-- Test classpath -->
157    <path id="test.classpath">    <path id="test.classpath">
158      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
# Line 605  Line 615 
615      </junit>      </junit>
616    </target>    </target>
617    
618      <target name="4jdk7-test-jtreg"
619              depends="4jdk7compile"
620              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
621        <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
622        <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
623        <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
624        <mkdir dir="${build.4jdk7.dir}/JTreport"/>
625        <jtreg dir="${jtreg.src.dir}"
626               jdk="${jdk7.home}"
627               workDir="${build.4jdk7.dir}/JTwork"
628               reportDir="${build.4jdk7.dir}/JTreport">
629    
630          <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
631          <arg value="-agentvm"/>
632          <arg value="-v:nopass,fail"/>
633          <arg value="-vmoptions:-esa -ea"/>
634          <arg value="-automatic"/>
635          <arg value="-k:!ignore"/>
636        </jtreg>
637      </target>
638    
639    
640      <target name="4jdk7-test"
641              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
642              description="Runs tck and jtreg tests for jsr166-4jdk7">
643      </target>
644    
645    
646    <target name="4jdk7docs"    <target name="4jdk7docs"
647            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
# Line 662  Line 699 
699            depends="configure-compiler"            depends="configure-compiler"
700            description="Compiles jsr166x sources to build dir">            description="Compiles jsr166x sources to build dir">
701    
702      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
703    
704      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
705             destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
706             debug="${build.debug}"             debug="${build.debug}"
707             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
708             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 693  Line 730 
730            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
731    
732      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
733        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
734      </jar>      </jar>
735    
736    </target>    </target>
# Line 713  Line 750 
750               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
751               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
752               executable="${javadoc7}"               executable="${javadoc7}"
753               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true"/>
754    
755    </target>    </target>
756    
# Line 753  Line 790 
790            depends="configure-compiler"            depends="configure-compiler"
791            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
792    
793      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
794    
795      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
796             destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
797             debug="${build.debug}"             debug="${build.debug}"
798             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
799             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 781  Line 818 
818            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
819    
820      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
821        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
822      </jar>      </jar>
823    
824    </target>    </target>
# Line 801  Line 838 
838               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
839               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
840               executable="${javadoc7}"               executable="${javadoc7}"
841               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true"/>
842    
843    </target>    </target>
844    
# Line 841  Line 878 
878            depends="configure-compiler, jsr166yjar"            depends="configure-compiler, jsr166yjar"
879            description="Compiles extra166y sources">            description="Compiles extra166y sources">
880    
881      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
882    
883      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
884             destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
885             debug="${build.debug}"             debug="${build.debug}"
886             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
887             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 872  Line 909 
909            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
910    
911      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
912        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
913      </jar>      </jar>
914    
915    </target>    </target>
# Line 892  Line 929 
929               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
930               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
931               executable="${javadoc7}"               executable="${javadoc7}"
932               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true"/>
933    
934    </target>    </target>
935    
# Line 930  Line 967 
967            depends="configure-compiler"            depends="configure-compiler"
968            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
969    
970      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
971    
972      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
973             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
974             debug="${build.debug}"             debug="${build.debug}"
975             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
976             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 960  Line 997 
997            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
998    
999      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1000        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1001      </jar>      </jar>
1002    
1003    </target>    </target>

Legend:
Removed from v.1.113  
changed lines
  Added in v.1.115

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