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.103 by jsr166, Sat Jan 19 21:35:40 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">
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>
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>
320 > <!--   </target> -->
321  
322  
323    <target name="dist-jar"
# Line 504 | Line 504
504    <!-- Various demos and test programs -->
505  
506  
507 <  <target name="loops" depends="init, configure-compiler"
507 >  <target name="loops" depends="configure-compiler"
508            description="Benchmark from Doug Lea's AQS paper">
509  
510      <mkdir dir="${build.loops.dir}"/>
# Line 682 | Line 682
682  
683  
684    <target name="jsr166xcompile"
685 <          depends="init, configure-compiler"
685 >          depends="configure-compiler"
686            description="Compiles jsr166x sources">
687  
688      <mkdir dir="${build.jsr166x.dir}"/>
# Line 784 | Line 784
784  
785  
786    <target name="jsr166ycompile"
787 <          depends="init, configure-compiler"
787 >          depends="configure-compiler"
788            description="Compiles jsr166y sources">
789  
790      <mkdir dir="${build.jsr166y.dir}"/>
791  
792 <    <javac srcdir="${jsr166ysrc.dir}"
793 <          destdir="${build.jsr166y.dir}"
794 <            debug="${build.debug}"
795 <       debuglevel="${build.debuglevel}"
796 <      deprecation="${build.deprecation}"
797 <           source="${build.sourcelevel}"
798 <             fork="true">
792 >    <javac srcdir="${topsrc.dir}"
793 >           destdir="${build.jsr166y.dir}"
794 >           debug="${build.debug}"
795 >           debuglevel="${build.debuglevel}"
796 >           deprecation="${build.deprecation}"
797 >           source="1.6"
798 >           classpath=""
799 >           bootclasspath="${bootclasspath6}"
800 >           includeAntRuntime="false"
801 >           includeJavaRuntime="false"
802 >           executable="${javac7}"
803 >           fork="true">
804  
805 <      <include name="**/*.java"/>
805 >      <include name="jsr166y/**/*.java"/>
806        <compilerarg line="${build.args}"/>
807        <compilerarg value="-XDignore.symbol.file=true"/>
808 <      <compilerarg value="${bootclasspath.args}"/>
804 <
805 < <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
806 <
808 >      <compilerarg value="-Xlint:all"/>
809      </javac>
808
810    </target>
811  
812  
812
813    <target name="jsr166yjar"
814            depends="jsr166ycompile"
815            description="Builds library jar from compiled sources">
# Line 888 | Line 888
888  
889  
890    <target name="extra166ycompile"
891 <          depends="init, configure-compiler, jsr166ycompile"
891 >          depends="configure-compiler, jsr166yjar"
892            description="Compiles extra166y sources">
893  
894      <mkdir dir="${build.extra166y.dir}"/>
895  
896 <    <javac srcdir="${extra166ysrc.dir}"
897 <          destdir="${build.extra166y.dir}"
898 <            debug="${build.debug}"
899 <            classpath="${jsr166yproduct.jar}"
900 <       debuglevel="${build.debuglevel}"
901 <      deprecation="${build.deprecation}"
902 <           source="${build.sourcelevel}"
903 <             fork="true">
896 >    <javac srcdir="${topsrc.dir}"
897 >           destdir="${build.extra166y.dir}"
898 >           debug="${build.debug}"
899 >           classpath=""
900 >           debuglevel="${build.debuglevel}"
901 >           deprecation="${build.deprecation}"
902 >           source="1.6"
903 >           bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}"
904 >           includeAntRuntime="false"
905 >           includeJavaRuntime="false"
906 >           executable="${javac7}"
907 >           fork="true">
908  
909 <      <include name="**/*.java"/>
909 >      <include name="extra166y/**/*.java"/>
910        <compilerarg line="${build.args}"/>
911        <compilerarg value="-XDignore.symbol.file=true"/>
912 <      <compilerarg value="${bootclasspath.args}"/>
909 <
910 < <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
912 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
913  
914      </javac>
915  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines