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

Diff of /jsr166/build.xml

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

revision 1.102 by jsr166, Sat Jan 19 20:53:34 2013 UTC revision 1.106 by jsr166, Sat Jan 19 22:23:57 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 229  Line 229 
229    
230    
231    <target name="test"    <target name="test"
232            depends="init, configure-tests, report-tests"            depends="configure-tests, report-tests"
233            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
234    
235    
# Line 263  Line 263 
263    
264    
265    <target name="dist"    <target name="dist"
266            depends="init, dist-clean, dist-jar, docs"            depends="dist-clean, dist-jar, docs"
267            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
268    
269    
# Line 310  Line 310 
310    <!-- Internal targets -->    <!-- Internal targets -->
311    
312    
   <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>  
   
   
313    <target name="dist-jar"    <target name="dist-jar"
314            depends="clean, jar">            depends="clean, jar">
315    
# Line 504  Line 494 
494    <!-- Various demos and test programs -->    <!-- Various demos and test programs -->
495    
496    
497    <target name="loops" depends="init, configure-compiler"    <target name="loops" depends="configure-compiler"
498            description="Benchmark from Doug Lea's AQS paper">            description="Benchmark from Doug Lea's AQS paper">
499    
500      <mkdir dir="${build.loops.dir}"/>      <mkdir dir="${build.loops.dir}"/>
# Line 682  Line 672 
672    
673    
674    <target name="jsr166xcompile"    <target name="jsr166xcompile"
675            depends="init, configure-compiler"            depends="configure-compiler"
676            description="Compiles jsr166x sources">            description="Compiles jsr166x sources to build dir">
677    
678      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.dir}"/>
679    
680      <javac srcdir="${jsr166xsrc.dir}"      <javac srcdir="${topsrc.dir}"
681            destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.dir}"
682              debug="${build.debug}"             debug="${build.debug}"
683         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
684        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
685             source="${build.sourcelevel}"             classpath=""
686               fork="true">             source="1.5"
687               bootclasspath="${bootclasspath6}"
688               includeAntRuntime="false"
689               includeJavaRuntime="false"
690               executable="${javac7}"
691               fork="true">
692    
693        <include name="**/*.java"/>        <include name="jsr166x/**/*.java"/>
694        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
695        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
696          <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
697    
698      </javac>      </javac>
699    
# Line 711  Line 707 
707    
708      <mkdir dir="${build.jsr166xlib.dir}"/>      <mkdir dir="${build.jsr166xlib.dir}"/>
709    
710      <jar destfile="${jsr166xproduct.jar}">      <jar destfile="${jsr166x.jar}">
711        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.dir}"/>
712      </jar>      </jar>
713    
# Line 776  Line 772 
772    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
773            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
774    
775      <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
776    
777    </target>    </target>
778    
# Line 784  Line 780 
780    
781    
782    <target name="jsr166ycompile"    <target name="jsr166ycompile"
783            depends="init, configure-compiler"            depends="configure-compiler"
784            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
785    
786      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.dir}"/>
787    
788      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
789            destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.dir}"
790              debug="${build.debug}"             debug="${build.debug}"
791         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
792        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
793             source="${build.sourcelevel}"             source="1.6"
794               fork="true">             classpath=""
795               bootclasspath="${bootclasspath6}"
796               includeAntRuntime="false"
797               includeJavaRuntime="false"
798               executable="${javac7}"
799               fork="true">
800    
801        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
802        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
803        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
804        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
   
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
   
805      </javac>      </javac>
   
806    </target>    </target>
807    
808    
   
809    <target name="jsr166yjar"    <target name="jsr166yjar"
810            depends="jsr166ycompile"            depends="jsr166ycompile"
811            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
812    
813      <mkdir dir="${build.jsr166ylib.dir}"/>      <mkdir dir="${build.jsr166ylib.dir}"/>
814    
815      <jar destfile="${jsr166yproduct.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
816        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.dir}"/>
817      </jar>      </jar>
818    
# Line 879  Line 875 
875    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
876            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
877    
878      <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
879    
880    </target>    </target>
881    
# Line 888  Line 884 
884    
885    
886    <target name="extra166ycompile"    <target name="extra166ycompile"
887            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166yjar"
888            description="Compiles extra166y sources">            description="Compiles extra166y sources">
889    
890      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.dir}"/>
891    
892      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
893            destdir="${build.extra166y.dir}"             destdir="${build.extra166y.dir}"
894              debug="${build.debug}"             debug="${build.debug}"
895              classpath="${jsr166yproduct.jar}"             debuglevel="${build.debuglevel}"
896         debuglevel="${build.debuglevel}"             deprecation="${build.deprecation}"
897        deprecation="${build.deprecation}"             classpath=""
898             source="${build.sourcelevel}"             source="1.6"
899               fork="true">             bootclasspath="${jsr166y.jar}:${bootclasspath6}"
900               includeAntRuntime="false"
901               includeJavaRuntime="false"
902               executable="${javac7}"
903               fork="true">
904    
905        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
906        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
907        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
908        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
   
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
909    
910      </javac>      </javac>
911    
# Line 921  Line 919 
919    
920      <mkdir dir="${build.extra166ylib.dir}"/>      <mkdir dir="${build.extra166ylib.dir}"/>
921    
922      <jar destfile="${extra166yproduct.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
923        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.dir}"/>
924      </jar>      </jar>
925    
# Line 984  Line 982 
982    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
983            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
984    
985      <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>      <copy file="${extra166y.jar}" todir="${dist.dir}"/>
986    
987    </target>    </target>
988    
# Line 1025  Line 1023 
1023    
1024      <mkdir dir="${build.jsr166elib.dir}"/>      <mkdir dir="${build.jsr166elib.dir}"/>
1025    
1026      <jar destfile="${jsr166eproduct.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1027        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.dir}"/>
1028      </jar>      </jar>
1029    
# Line 1093  Line 1091 
1091    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1092            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1093    
1094      <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>      <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1095    
1096    </target>    </target>
1097    

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

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