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

Diff of /jsr166/build.xml

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

revision 1.103 by jsr166, Sat Jan 19 21:35:40 2013 UTC revision 1.107 by jsr166, Sat Jan 19 23:40:04 2013 UTC
# Line 127  Line 127 
127    <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>    <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
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.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>    <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"/>
135    <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
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="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.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="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>
141    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>
142    <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>
143    <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.jar"/>
144    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
145    
146    <!-- Bootclasspath argument -->    <!-- Bootclasspath argument -->
147    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
# 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 310  Line 312 
312    <!-- Internal targets -->    <!-- Internal targets -->
313    
314    
 <!--   <target name="init"> -->  
   
     <!-- Version is kept in a separate file -->  
 <!--     <loadfile property="version" srcFile="version.properties"/> -->  
 <!--     <echo>Building JSR-166 version ${version}</echo> -->  
 <!--     <echo>java.home is ${java.home}</echo> -->  
   
 <!--   </target> -->  
   
   
315    <target name="dist-jar"    <target name="dist-jar"
316            depends="clean, jar">            depends="clean, jar">
317    
# Line 544  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 572  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 675 
675    
676    <target name="jsr166xcompile"    <target name="jsr166xcompile"
677            depends="configure-compiler"            depends="configure-compiler"
678            description="Compiles jsr166x sources">            description="Compiles jsr166x sources to build dir">
679    
680      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.dir}"/>
681    
682      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${topsrc.dir}"
683            destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.dir}"
684              debug="${build.debug}"             debug="${build.debug}"
685         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
686        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
687             source="${build.sourcelevel}"             classpath=""
688               fork="true">             source="5"
689               bootclasspath="${bootclasspath6}"
690               includeAntRuntime="false"
691               includeJavaRuntime="false"
692               executable="${javac7}"
693               fork="true">
694    
695        <include name="**/*.java"/>        <include name="jsr166x/**/*.java"/>
696        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
697        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
698          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
699    
700      </javac>      </javac>
701    
# Line 711  Line 709 
709    
710      <mkdir dir="${build.jsr166xlib.dir}"/>      <mkdir dir="${build.jsr166xlib.dir}"/>
711    
712      <jar destfile="${jsr166xproduct.jar}">      <jar destfile="${jsr166x.jar}">
713        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.dir}"/>
714      </jar>      </jar>
715    
# Line 726  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 765  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 776  Line 777 
777    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
778            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
779    
780      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
781    
782    </target>    </target>
783    
# Line 794  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 816  Line 817 
817    
818      <mkdir dir="${build.jsr166ylib.dir}"/>      <mkdir dir="${build.jsr166ylib.dir}"/>
819    
820      <jar destfile="${jsr166yproduct.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
821        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.dir}"/>
822      </jar>      </jar>
823    
# Line 831  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 868  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 879  Line 883 
883    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
884            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
885    
886      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
887    
888    </target>    </target>
889    
# Line 896  Line 900 
900      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
901             destdir="${build.extra166y.dir}"             destdir="${build.extra166y.dir}"
902             debug="${build.debug}"             debug="${build.debug}"
            classpath=""  
903             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
904             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
905             source="1.6"             classpath=""
906             bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}"             source="6"
907               bootclasspath="${jsr166y.jar}:${bootclasspath6}"
908             includeAntRuntime="false"             includeAntRuntime="false"
909             includeJavaRuntime="false"             includeJavaRuntime="false"
910             executable="${javac7}"             executable="${javac7}"
# Line 923  Line 927 
927    
928      <mkdir dir="${build.extra166ylib.dir}"/>      <mkdir dir="${build.extra166ylib.dir}"/>
929    
930      <jar destfile="${extra166yproduct.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
931        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.dir}"/>
932      </jar>      </jar>
933    
# Line 932  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 975  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 986  Line 993 
993    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
994            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
995    
996      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
997    
998    </target>    </target>
999    
# Line 1003  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 1027  Line 1034 
1034    
1035      <mkdir dir="${build.jsr166elib.dir}"/>      <mkdir dir="${build.jsr166elib.dir}"/>
1036    
1037      <jar destfile="${jsr166eproduct.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1038        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.dir}"/>
1039      </jar>      </jar>
1040    
# Line 1036  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 1084  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>
# Line 1095  Line 1100 
1100    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1101            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1102    
1103      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1104    
1105    </target>    </target>
1106    

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

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