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

Diff of /jsr166/build.xml

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

revision 1.98, Wed Jan 16 07:39:51 2013 UTC revision 1.99, Sat Jan 19 01:37:44 2013 UTC
# Line 16  Line 16 
16    $HOME/jdk/jdk6    $HOME/jdk/jdk6
17    $HOME/jdk/jdk7    $HOME/jdk/jdk7
18    $HOME/jdk/jdk8    $HOME/jdk/jdk8
19    where each of the above is a JDK or a symlink to same.    where each of the above is a JDK or a symlink to same, and
20      $HOME/jdk/src/jdk6
21      $HOME/jdk/src/jdk7
22      $HOME/jdk/src/jdk8
23      where each of the above is a complete JDK source tree
24      (e.g. mercurial forest) or a symlink to same.
25  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
26    </description>    </description>
27    
# Line 44  Line 49 
49    <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>    <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
50    <property name="build.reports.dir"           location="${build.dir}/reports"/>    <property name="build.reports.dir"           location="${build.dir}/reports"/>
51    
52    <property name="build.jdk7.dir"              location="${build.dir}/jdk7"/>    <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
53    <property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>    <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
54    <property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>    <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
55    <property name="build.jdk7.tck.classes.dir"  location="${build.jdk7.dir}/tck/classes"/>    <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
56    <property name="build.jdk7.docs.dir"         location="${build.jdk7.dir}/docs"/>    <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
57    
58    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
59    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
# Line 77  Line 82 
82      <property name="javac@{v}"     location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"     location="${jdk@{v}.home}/bin/javac"/>
83      <property name="javadoc@{v}"   location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"   location="${jdk@{v}.home}/bin/javadoc"/>
84      <property name="bootdir@{v}"   location="${jdk@{v}.home}/jre/lib"/>      <property name="bootdir@{v}"   location="${jdk@{v}.home}/jre/lib"/>
85        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
86      <property name="bootclasspath@{v}"      <property name="bootclasspath@{v}"
87       value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>       value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
88      </sequential>      </sequential>
# Line 113  Line 119 
119    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
120    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
121    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
122    <property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>    <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
123    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
124    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
125    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
# Line 122  Line 128 
128    
129    <!-- Distribution locations -->    <!-- Distribution locations -->
130    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
131    <property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>    <property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
132    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
133    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
134    <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
# Line 130  Line 136 
136    
137    <!-- Jar locations -->    <!-- Jar locations -->
138    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
139    <property name="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/>    <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
140    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
141    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
142    <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
# Line 533  Line 539 
539    </target>    </target>
540    
541    
542    <!-- jdk7 -->    <!-- jsr166 4jdk7 -->
543    
544    
545    <target name="jdk7compile"    <target name="4jdk7compile"
546            depends="configure-compiler"            depends="configure-compiler"
547            description="Compiles src/jdk7 sources">            description="Compiles src/jdk7 sources, targeting jdk7">
548    
549      <mkdir dir="${build.jdk7.classes.dir}"/>      <mkdir dir="${build.4jdk7.classes.dir}"/>
550    
551      <javac srcdir="${jdk7src.dir}"      <javac srcdir="${4jdk7src.dir}"
552             destdir="${build.jdk7.classes.dir}"             destdir="${build.4jdk7.classes.dir}"
553             debug="${build.debug}"             debug="${build.debug}"
554             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
555             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 562  Line 568 
568    
569      </javac>      </javac>
570    
571      <mkdir dir="${build.jdk7.lib.dir}"/>      <mkdir dir="${build.4jdk7.lib.dir}"/>
572    
573      <jar destfile="${jdk7product.jar}" index="true">      <jar destfile="${4jdk7product.jar}" index="true">
574        <fileset dir="${build.jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
575      </jar>      </jar>
576    
577      <mkdir dir="${build.jdk7.tck.classes.dir}"/>      <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
578    
579      <javac srcdir="${tck.src.dir}"      <javac srcdir="${tck.src.dir}"
580             destdir="${build.jdk7.tck.classes.dir}"             destdir="${build.4jdk7.tck.classes.dir}"
581             debug="${build.debug}"             debug="${build.debug}"
582             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
583             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
584             source="1.6"             source="1.6"
585             classpath="${junit.jar}"             classpath="${junit.jar}"
586             bootclasspath="${jdk7product.jar}:${bootclasspath6}"             bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
587             includeAntRuntime="false"             includeAntRuntime="false"
588             includeJavaRuntime="false"             includeJavaRuntime="false"
589             executable="${javac7}"             executable="${javac7}"
# Line 593  Line 599 
599    </target>    </target>
600    
601    
602    <target name="run-jdk7-tck-tests"    <target name="4jdk7-test-tck"
603            depends="jdk7compile"            depends="4jdk7compile"
604            description="Runs tck tests for jsr166-jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
605      <run-tck-tests      <run-tck-tests
606        jvm="${java7}"        jvm="${java7}"
607        tck.classes="${build.jdk7.tck.classes.dir}"        tck.classes="${build.4jdk7.tck.classes.dir}"
608        product.jar="${jdk7product.jar}"/>        product.jar="${4jdk7product.jar}"/>
609    </target>    </target>
610    
611    
612    <target name="run-jdk7-tck-tests-via-junit-task"    <target name="4jdk7-test-tck-junit"
613            depends="jdk7compile">            depends="4jdk7compile"
614              description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
615    
616      <junit printsummary="true"      <junit printsummary="true"
617             showoutput="true"             showoutput="true"
# Line 614  Line 621 
621             jvm="${java7}"             jvm="${java7}"
622             fork="true">             fork="true">
623    
624        <jvmarg value="-Xbootclasspath/p:${jdk7product.jar}"/>        <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
625        <jvmarg value="-server"/>        <jvmarg value="-server"/>
626    
627        <classpath>        <classpath>
628          <pathelement location="${junit.jar}"/>          <pathelement location="${junit.jar}"/>
629          <pathelement location="${build.jdk7.tck.classes.dir}"/>          <pathelement location="${build.4jdk7.tck.classes.dir}"/>
630        </classpath>        </classpath>
631    
632        <formatter type="brief"/>        <formatter type="brief"/>
# Line 631  Line 638 
638    </target>    </target>
639    
640    
641    <target name="jdk7docs"    <target name="4jdk7docs"
642            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs with custom tags to build folder">
643    
644      <delete dir="${build.jdk7.docs.dir}"/>      <delete dir="${build.4jdk7.docs.dir}"/>
645      <mkdir dir="${build.jdk7.docs.dir}"/>      <mkdir dir="${build.4jdk7.docs.dir}"/>
646    
647      <javadoc destdir="${build.jdk7.docs.dir}"      <javadoc destdir="${build.4jdk7.docs.dir}"
648               packagenames="none"               packagenames="none"
649               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
650               overview="${jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
651               sourcepath="${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
              bootclasspath="${bootclasspath6}"  
652               classpath=""               classpath=""
653               source="1.6"               executable="${javadoc7}">
654               executable="${javadoc7}"        <arg value="-XDignore.symbol.file=true"/>
655               additionalparam="-XDignore.symbol.file=true" >        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
       <fileset dir="${jdk7src.dir}" defaultexcludes="yes">  
656          <include name="**/*.java"/>          <include name="**/*.java"/>
657        </fileset>        </fileset>
658      </javadoc>      </javadoc>
# Line 655  Line 660 
660    </target>    </target>
661    
662    
663    <target name="jdk7dist"    <target name="4jdk7dist"
664            depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"
665            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
666    
667    
668    
669    <target name="jdk7clean"    <target name="4jdk7clean"
670            description="Removes all build products">            description="Removes all build products">
671    
672      <delete dir="${build.jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
673    
674    </target>    </target>
675    
676    
677    
678    <target name="jdk7dist-clean"    <target name="4jdk7dist-clean"
679            description="Removes all build and distribution products">            description="Removes all build and distribution products">
680    
681    </target>    </target>
682    
683    <target name="jdk7dist-docs"    <target name="4jdk7dist-docs"
684            description="Builds javadocs without custom tags to dist folder">            description="Builds javadocs without custom tags to dist folder">
685    
686      <delete dir="${dist.jdk7.docs.dir}"/>      <delete dir="${dist.4jdk7.docs.dir}"/>
687      <mkdir dir="${dist.jdk7.docs.dir}"/>      <mkdir dir="${dist.4jdk7.docs.dir}"/>
688    
689      <javadoc destdir="${dist.jdk7.docs.dir}"      <javadoc destdir="${dist.4jdk7.docs.dir}"
690               packagenames="none"               packagenames="none"
691               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
692               overview="${jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
693               sourcepath="${jdk7src.dir}"               sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
694               classpath=""               classpath=""
695               executable="${javadoc7}"               executable="${javadoc7}">
              bootclasspath="${bootclasspath6}"  
              source="1.6">  
696        <arg value="-XDignore.symbol.file=true"/>        <arg value="-XDignore.symbol.file=true"/>
697        <fileset dir="${jdk7src.dir}" defaultexcludes="yes">        <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
698          <include name="**/*.java"/>          <include name="**/*.java"/>
699        </fileset>        </fileset>
700      </javadoc>      </javadoc>
701    
702    </target>    </target>
703    
704    <target name="jdk7dist-jar"    <target name="4jdk7dist-jar"
705            depends="jdk7clean, jdk7compile">            depends="4jdk7clean, 4jdk7compile">
706    
707      <copy file="${jdk7product.jar}" todir="${dist.dir}"/>      <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
708    
709    </target>    </target>
710    
# Line 1070  Line 1073 
1073               packagenames="jsr166e,jsr166e.extra"               packagenames="jsr166e,jsr166e.extra"
1074               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
1075               source="1.7"               source="1.7"
1076               sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1077               executable="${javadoc7}"               executable="${javadoc7}"
1078               additionalparam="-XDignore.symbol.file=true" >               additionalparam="-XDignore.symbol.file=true" >
1079        <fileset dir="${topsrc.dir}" defaultexcludes="yes">        <fileset dir="${topsrc.dir}" defaultexcludes="yes">

Legend:
Removed from v.1.98  
changed lines
  Added in v.1.99

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8