ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.102 by jsr166, Sat Jan 19 20:53:34 2013 UTC vs.
Revision 1.105 by jsr166, Sat Jan 19 21:54:53 2013 UTC

# Line 229 | Line 229
229  
230  
231    <target name="test"
232 <          depends="init, configure-tests, report-tests"
232 >          depends="configure-tests, report-tests"
233            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"
266 <          depends="init, dist-clean, dist-jar, docs"
266 >          depends="dist-clean, dist-jar, docs"
267            description="Puts all distributable products in single hierarchy"/>
268  
269  
# Line 310 | Line 310
310    <!-- Internal targets -->
311  
312  
313  <target name="init">
314
315    <!-- Version is kept in a separate file -->
316    <loadfile property="version" srcFile="version.properties"/>
317    <echo>Building JSR-166 version ${version}</echo>
318    <echo>java.home is ${java.home}</echo>
319
320  </target>
321
322
313    <target name="dist-jar"
314            depends="clean, jar">
315  
# Line 504 | Line 494
494    <!-- Various demos and test programs -->
495  
496  
497 <  <target name="loops" depends="init, configure-compiler"
497 >  <target name="loops" depends="configure-compiler"
498            description="Benchmark from Doug Lea's AQS paper">
499  
500      <mkdir dir="${build.loops.dir}"/>
# Line 682 | Line 672
672  
673  
674    <target name="jsr166xcompile"
675 <          depends="init, configure-compiler"
676 <          description="Compiles jsr166x sources">
675 >          depends="configure-compiler"
676 >          description="Compiles jsr166x sources to build dir">
677  
678      <mkdir dir="${build.jsr166x.dir}"/>
679  
680 <    <javac srcdir="${jsr166xsrc.dir}"
681 <          destdir="${build.jsr166x.dir}"
682 <            debug="${build.debug}"
683 <       debuglevel="${build.debuglevel}"
684 <      deprecation="${build.deprecation}"
685 <           source="${build.sourcelevel}"
686 <             fork="true">
680 >    <javac srcdir="${topsrc.dir}"
681 >           destdir="${build.jsr166x.dir}"
682 >           debug="${build.debug}"
683 >           debuglevel="${build.debuglevel}"
684 >           deprecation="${build.deprecation}"
685 >           classpath=""
686 >           source="1.5"
687 >           bootclasspath="${bootclasspath6}"
688 >           includeAntRuntime="false"
689 >           includeJavaRuntime="false"
690 >           executable="${javac7}"
691 >           fork="true">
692  
693 <      <include name="**/*.java"/>
693 >      <include name="jsr166x/**/*.java"/>
694        <compilerarg line="${build.args}"/>
695        <compilerarg value="-XDignore.symbol.file=true"/>
696 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
697  
698      </javac>
699  
# Line 784 | Line 780
780  
781  
782    <target name="jsr166ycompile"
783 <          depends="init, configure-compiler"
783 >          depends="configure-compiler"
784            description="Compiles jsr166y sources">
785  
786      <mkdir dir="${build.jsr166y.dir}"/>
787  
788 <    <javac srcdir="${jsr166ysrc.dir}"
789 <          destdir="${build.jsr166y.dir}"
790 <            debug="${build.debug}"
791 <       debuglevel="${build.debuglevel}"
792 <      deprecation="${build.deprecation}"
793 <           source="${build.sourcelevel}"
794 <             fork="true">
788 >    <javac srcdir="${topsrc.dir}"
789 >           destdir="${build.jsr166y.dir}"
790 >           debug="${build.debug}"
791 >           debuglevel="${build.debuglevel}"
792 >           deprecation="${build.deprecation}"
793 >           source="1.6"
794 >           classpath=""
795 >           bootclasspath="${bootclasspath6}"
796 >           includeAntRuntime="false"
797 >           includeJavaRuntime="false"
798 >           executable="${javac7}"
799 >           fork="true">
800  
801 <      <include name="**/*.java"/>
801 >      <include name="jsr166y/**/*.java"/>
802        <compilerarg line="${build.args}"/>
803        <compilerarg value="-XDignore.symbol.file=true"/>
804 <      <compilerarg value="${bootclasspath.args}"/>
804 <
805 < <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
806 <
804 >      <compilerarg value="-Xlint:all"/>
805      </javac>
808
806    </target>
807  
808  
812
809    <target name="jsr166yjar"
810            depends="jsr166ycompile"
811            description="Builds library jar from compiled sources">
# Line 888 | Line 884
884  
885  
886    <target name="extra166ycompile"
887 <          depends="init, configure-compiler, jsr166ycompile"
887 >          depends="configure-compiler, jsr166yjar"
888            description="Compiles extra166y sources">
889  
890      <mkdir dir="${build.extra166y.dir}"/>
891  
892 <    <javac srcdir="${extra166ysrc.dir}"
893 <          destdir="${build.extra166y.dir}"
894 <            debug="${build.debug}"
895 <            classpath="${jsr166yproduct.jar}"
896 <       debuglevel="${build.debuglevel}"
897 <      deprecation="${build.deprecation}"
898 <           source="${build.sourcelevel}"
899 <             fork="true">
892 >    <javac srcdir="${topsrc.dir}"
893 >           destdir="${build.extra166y.dir}"
894 >           debug="${build.debug}"
895 >           debuglevel="${build.debuglevel}"
896 >           deprecation="${build.deprecation}"
897 >           classpath=""
898 >           source="1.6"
899 >           bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}"
900 >           includeAntRuntime="false"
901 >           includeJavaRuntime="false"
902 >           executable="${javac7}"
903 >           fork="true">
904  
905 <      <include name="**/*.java"/>
905 >      <include name="extra166y/**/*.java"/>
906        <compilerarg line="${build.args}"/>
907        <compilerarg value="-XDignore.symbol.file=true"/>
908 <      <compilerarg value="${bootclasspath.args}"/>
909 <
910 < <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
908 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
909  
910      </javac>
911  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines