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.101 by jsr166, Sat Jan 19 17:30:36 2013 UTC vs.
Revision 1.104 by jsr166, Sat Jan 19 21:40:04 2013 UTC

# Line 182 | Line 182
182  
183    <target name="compile"
184            depends="configure-compiler"
185 <          description="Compiles src/main sources to build folder">
185 >          description="Compiles src/main sources to build dir">
186  
187      <mkdir dir="${build.classes.dir}"/>
188  
# 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  
236  
237    <target name="docs"
238 <          description="Builds javadocs for src/main">
238 >          description="Builds javadocs for src/main to dist dir">
239  
240      <delete dir="${dist.javadocs.dir}"/>
241      <mkdir dir="${dist.javadocs.dir}"/>
# 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 630 | Line 620
620  
621  
622    <target name="4jdk7docs"
623 <          description="Builds javadocs with custom tags to build folder">
623 >          description="Builds javadocs for src/jdk7 to dist dir">
624  
625 <    <delete dir="${build.4jdk7.docs.dir}"/>
626 <    <mkdir dir="${build.4jdk7.docs.dir}"/>
625 >    <delete dir="${dist.4jdk7.docs.dir}"/>
626 >    <mkdir dir="${dist.4jdk7.docs.dir}"/>
627  
628 <    <javadoc destdir="${build.4jdk7.docs.dir}"
628 >    <javadoc destdir="${dist.4jdk7.docs.dir}"
629               packagenames="none"
630               link="${jdkapi7docs.url}"
631               overview="${4jdk7src.dir}/intro.html"
# Line 652 | Line 642
642  
643  
644    <target name="4jdk7dist"
645 <          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"
645 >          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
646            description="Puts all distributable products in single hierarchy"/>
647  
648  
# Line 671 | Line 661
661  
662    </target>
663  
674  <target name="4jdk7dist-docs"
675          description="Builds javadocs without custom tags to dist folder">
676
677    <delete dir="${dist.4jdk7.docs.dir}"/>
678    <mkdir dir="${dist.4jdk7.docs.dir}"/>
679
680    <javadoc destdir="${dist.4jdk7.docs.dir}"
681             packagenames="none"
682             link="${jdkapi7docs.url}"
683             overview="${4jdk7src.dir}/intro.html"
684             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
685             classpath=""
686             executable="${javadoc7}">
687      <arg value="-XDignore.symbol.file=true"/>
688      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
689        <include name="**/*.java"/>
690      </fileset>
691    </javadoc>
692
693  </target>
694
664    <target name="4jdk7dist-jar"
665            depends="4jdk7clean, 4jdk7compile">
666  
# Line 703 | Line 672
672  
673  
674    <target name="jsr166xcompile"
675 <          depends="init, configure-compiler"
675 >          depends="configure-compiler"
676            description="Compiles jsr166x sources">
677  
678      <mkdir dir="${build.jsr166x.dir}"/>
# Line 741 | Line 710
710  
711  
712    <target name="jsr166xdocs"
713 <          description="Builds javadocs with custom tags to build folder">
713 >          description="Builds javadocs to dist dir">
714  
715      <delete dir="${build.jsr166xjavadocs.dir}"/>
716      <mkdir dir="${build.jsr166xjavadocs.dir}"/>
# Line 780 | Line 749
749  
750  
751    <target name="jsr166xdist-docs"
752 <          description="Builds javadocs without custom tags to dist folder">
752 >          description="Builds javadocs to dist dir">
753  
754      <delete dir="${dist.jsr166xjavadocs.dir}"/>
755      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
# Line 805 | Line 774
774  
775  
776    <target name="jsr166ycompile"
777 <          depends="init, configure-compiler"
777 >          depends="configure-compiler"
778            description="Compiles jsr166y sources">
779  
780      <mkdir dir="${build.jsr166y.dir}"/>
781  
782 <    <javac srcdir="${jsr166ysrc.dir}"
783 <          destdir="${build.jsr166y.dir}"
784 <            debug="${build.debug}"
785 <       debuglevel="${build.debuglevel}"
786 <      deprecation="${build.deprecation}"
787 <           source="${build.sourcelevel}"
788 <             fork="true">
782 >    <javac srcdir="${topsrc.dir}"
783 >           destdir="${build.jsr166y.dir}"
784 >           debug="${build.debug}"
785 >           debuglevel="${build.debuglevel}"
786 >           deprecation="${build.deprecation}"
787 >           source="1.6"
788 >           classpath=""
789 >           bootclasspath="${bootclasspath6}"
790 >           includeAntRuntime="false"
791 >           includeJavaRuntime="false"
792 >           executable="${javac7}"
793 >           fork="true">
794  
795 <      <include name="**/*.java"/>
795 >      <include name="jsr166y/**/*.java"/>
796        <compilerarg line="${build.args}"/>
797        <compilerarg value="-XDignore.symbol.file=true"/>
798 <      <compilerarg value="${bootclasspath.args}"/>
825 <
826 < <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
827 <
798 >      <compilerarg value="-Xlint:all"/>
799      </javac>
829
800    </target>
801  
802  
833
803    <target name="jsr166yjar"
804            depends="jsr166ycompile"
805            description="Builds library jar from compiled sources">
# Line 846 | Line 815
815  
816  
817    <target name="jsr166ydocs"
818 <          description="Builds javadocs with custom tags to build folder">
818 >          description="Builds javadocs to dist dir">
819  
820      <delete dir="${build.jsr166yjavadocs.dir}"/>
821      <mkdir dir="${build.jsr166yjavadocs.dir}"/>
# Line 883 | Line 852
852    </target>
853  
854    <target name="jsr166ydist-docs"
855 <          description="Builds javadocs without custom tags to dist folder">
855 >          description="Builds javadocs to dist dir">
856  
857      <delete dir="${dist.jsr166yjavadocs.dir}"/>
858      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
# Line 909 | Line 878
878  
879  
880    <target name="extra166ycompile"
881 <          depends="init, configure-compiler, jsr166ycompile"
881 >          depends="configure-compiler, jsr166yjar"
882            description="Compiles extra166y sources">
883  
884      <mkdir dir="${build.extra166y.dir}"/>
885  
886 <    <javac srcdir="${extra166ysrc.dir}"
887 <          destdir="${build.extra166y.dir}"
888 <            debug="${build.debug}"
889 <            classpath="${jsr166yproduct.jar}"
890 <       debuglevel="${build.debuglevel}"
891 <      deprecation="${build.deprecation}"
892 <           source="${build.sourcelevel}"
893 <             fork="true">
886 >    <javac srcdir="${topsrc.dir}"
887 >           destdir="${build.extra166y.dir}"
888 >           debug="${build.debug}"
889 >           classpath=""
890 >           debuglevel="${build.debuglevel}"
891 >           deprecation="${build.deprecation}"
892 >           source="1.6"
893 >           bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}"
894 >           includeAntRuntime="false"
895 >           includeJavaRuntime="false"
896 >           executable="${javac7}"
897 >           fork="true">
898  
899 <      <include name="**/*.java"/>
899 >      <include name="extra166y/**/*.java"/>
900        <compilerarg line="${build.args}"/>
901        <compilerarg value="-XDignore.symbol.file=true"/>
902 <      <compilerarg value="${bootclasspath.args}"/>
930 <
931 < <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
902 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
903  
904      </javac>
905  
# Line 951 | Line 922
922  
923  
924    <target name="extra166ydocs"
925 <          description="Builds javadocs with custom tags to build folder">
925 >          description="Builds javadocs with custom tags to build dir">
926  
927      <delete dir="${build.extra166yjavadocs.dir}"/>
928      <mkdir dir="${build.extra166yjavadocs.dir}"/>
# Line 988 | Line 959
959    </target>
960  
961    <target name="extra166ydist-docs"
962 <          description="Builds javadocs without custom tags to dist folder">
962 >          description="Builds javadocs to dist dir">
963  
964      <delete dir="${dist.extra166yjavadocs.dir}"/>
965      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
# Line 1055 | Line 1026
1026  
1027  
1028    <target name="jsr166edocs"
1029 <          description="Builds javadocs with custom tags to build folder">
1029 >          description="Builds javadocs with custom tags to build dir">
1030  
1031      <delete dir="${build.jsr166ejavadocs.dir}"/>
1032      <mkdir dir="${build.jsr166ejavadocs.dir}"/>
# Line 1097 | Line 1068
1068    </target>
1069  
1070    <target name="jsr166edist-docs"
1071 <          description="Builds javadocs without custom tags to dist folder">
1071 >          description="Builds javadocs to dist dir">
1072  
1073      <delete dir="${dist.jsr166ejavadocs.dir}"/>
1074      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines