[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.106, Sat Jan 19 22:23:57 2013 UTC revision 1.107, Sat Jan 19 23:40:04 2013 UTC
# Line 154  Line 154 
154    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>    <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
155    <!-- The below does not yet exist as of 2012-11 -->    <!-- The below does not yet exist as of 2012-11 -->
156    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->    <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
157    
158      <!-- Default jdk api doc location (latest stable release seems best) -->
159    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
160    
161    <!-- Test classpath -->    <!-- Test classpath -->
# Line 177  Line 179 
179    <!-- Main targets -->    <!-- Main targets -->
180    
181    <target name="dists"    <target name="dists"
182            depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"            depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
183            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
184    
185    <target name="compile"    <target name="compile"
# Line 534  Line 536 
536             debug="${build.debug}"             debug="${build.debug}"
537             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
538             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
539             source="1.6"             source="6"
540             classpath=""             classpath=""
541             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
542             includeAntRuntime="false"             includeAntRuntime="false"
# Line 562  Line 564 
564             debug="${build.debug}"             debug="${build.debug}"
565             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
566             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
567             source="1.6"             source="6"
568             classpath="${junit.jar}"             classpath="${junit.jar}"
569             bootclasspath="${4jdk7product.jar}:${bootclasspath6}"             bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
570             includeAntRuntime="false"             includeAntRuntime="false"
# Line 683  Line 685 
685             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
686             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
687             classpath=""             classpath=""
688             source="1.5"             source="5"
689             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
690             includeAntRuntime="false"             includeAntRuntime="false"
691             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 722  Line 724 
724      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${build.jsr166xjavadocs.dir}"/>
725    
726      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${build.jsr166xjavadocs.dir}"
727               packagenames="jsr166x"               packagenames="jsr166x.*"
728               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
729               source="${build.sourcelevel}"               source="5"
730               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
731                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
732                 executable="${javadoc7}"
733               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true" />
734    
735    </target>    </target>
# Line 761  Line 765 
765      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
766    
767      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
768               packagenames="jsr166x"               packagenames="jsr166x.*"
769               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
770               source="${build.sourcelevel}"               source="${build.sourcelevel}"
771               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
772                 executable="${javadoc7}"
773               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true" />
774    
775    </target>    </target>
# Line 790  Line 795 
795             debug="${build.debug}"             debug="${build.debug}"
796             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
797             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
798             source="1.6"             source="6"
799             classpath=""             classpath=""
800             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
801             includeAntRuntime="false"             includeAntRuntime="false"
# Line 827  Line 832 
832      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${build.jsr166yjavadocs.dir}"/>
833    
834      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${build.jsr166yjavadocs.dir}"
835               packagenames="jsr166y"               packagenames="jsr166y.*"
836               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
837               source="${build.sourcelevel}"               source="6"
838               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
839                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
840                 executable="${javadoc7}"
841               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true" />
842    
843    </target>    </target>
# Line 864  Line 871 
871      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
872    
873      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
874               packagenames="jsr166y"               packagenames="jsr166y.*"
875               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
876               source="${build.sourcelevel}"               source="${build.sourcelevel}"
877               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
878                 executable="${javadoc7}"
879               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true" />
880    
881    </target>    </target>
# Line 895  Line 903 
903             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
904             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
905             classpath=""             classpath=""
906             source="1.6"             source="6"
907             bootclasspath="${jsr166y.jar}:${bootclasspath6}"             bootclasspath="${jsr166y.jar}:${bootclasspath6}"
908             includeAntRuntime="false"             includeAntRuntime="false"
909             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 928  Line 936 
936    
937    
938    <target name="extra166ydocs"    <target name="extra166ydocs"
939            description="Builds javadocs with custom tags to build dir">            description="Builds javadocs to build dir">
940    
941      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${build.extra166yjavadocs.dir}"/>
942      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${build.extra166yjavadocs.dir}"/>
943    
944      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${build.extra166yjavadocs.dir}"
945               packagenames="extra166y"               packagenames="extra166y.*"
946               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
947               source="${build.sourcelevel}"               source="6"
948               sourcepath="${topsrc.dir}:${jdksrc.dir}"               bootclasspath="${bootclasspath6}"
949                 sourcepath="${topsrc.dir}:${jdk6src.dir}"
950                 executable="${javadoc7}"
951               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true" />
952    
953    </target>    </target>
# Line 971  Line 981 
981      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
982    
983      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
984               packagenames="extra166y"               packagenames="extra166y.*"
985               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
986               source="${build.sourcelevel}"               source="${build.sourcelevel}"
987               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
988                 executable="${javadoc7}"
989               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true" />
990    
991    </target>    </target>
# Line 999  Line 1010 
1010             debug="${build.debug}"             debug="${build.debug}"
1011             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1012             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1013             source="1.7"             source="7"
1014             classpath=""             classpath=""
1015             includeAntRuntime="false"             includeAntRuntime="false"
1016             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1032  Line 1043 
1043    
1044    
1045    <target name="jsr166edocs"    <target name="jsr166edocs"
1046            description="Builds javadocs with custom tags to build dir">            description="Builds javadocs to build dir">
1047    
1048      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${build.jsr166ejavadocs.dir}"/>
1049      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${build.jsr166ejavadocs.dir}"/>
1050    
1051      <javadoc destdir="${build.jsr166ejavadocs.dir}"      <javadoc destdir="${build.jsr166ejavadocs.dir}"
1052               packagenames="jsr166e,jsr166e.extra"               packagenames="jsr166e.*"
1053               link="${jdkapi7docs.url}"               link="${jdkapidocs.url}"
1054               source="1.7"               source="7"
1055               sourcepath="${topsrc.dir}:${jdk7src.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1056               executable="${javadoc7}"               executable="${javadoc7}"
1057               additionalparam="-XDignore.symbol.file=true" >               additionalparam="-XDignore.symbol.file=true" >
       <fileset dir="${topsrc.dir}" defaultexcludes="yes">  
         <include name="jsr166e/**/*.java"/>  
       </fileset>  
1058      </javadoc>      </javadoc>
1059    
1060    </target>    </target>
# Line 1080  Line 1088 
1088      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1089    
1090      <javadoc destdir="${dist.jsr166ejavadocs.dir}"      <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1091               packagenames="jsr166e,jsr166e.extra"               packagenames="jsr166e.*"
1092               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1093               source="1.7"               source="7"
1094               sourcepath="${topsrc.dir}:${jdksrc.dir}"               sourcepath="${topsrc.dir}:${jdk7src.dir}"
1095                 executable="${javadoc7}"
1096               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true" />
1097    
1098    </target>    </target>

Legend:
Removed from v.1.106  
changed lines
  Added in v.1.107

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8