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

Diff of /jsr166/build.xml

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

revision 1.99 by jsr166, Sat Jan 19 01:37:44 2013 UTC revision 1.104 by jsr166, Sat Jan 19 21:40:04 2013 UTC
# Line 167  Line 167 
167      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
168    </path>    </path>
169    
170      <!-- Support @jls tag, used in jdk8+ javadoc -->
171      <!-- TODO: How do we get &trade to work? -->
172      <!-- TODO: Why isn't @jls a "standard" tag? -->
173      <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
174      <property name="javadoc.jls.cite" value="The Java Language Specification"/>
175      <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
176    
177    <!-- Main targets -->    <!-- Main targets -->
178    
# Line 175  Line 181 
181            description="Builds all public jars and docs"/>            description="Builds all public jars and docs"/>
182    
183    <target name="compile"    <target name="compile"
184            depends="init, configure-compiler"            depends="configure-compiler"
185            description="Compiles main sources to build folder">            description="Compiles src/main sources to build dir">
186    
187      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
188    
189      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
190            destdir="${build.classes.dir}"             destdir="${build.classes.dir}"
191              debug="${build.debug}"             debug="${build.debug}"
192         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
193        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
194             source="${build.sourcelevel}"             classpath=""
195               fork="true">             includeAntRuntime="false"
196               includeJavaRuntime="false"
197               executable="${javac8}"
198               fork="true">
199    
200        <include name="**/*.java"/>        <include name="**/*.java"/>
201          <compilerarg line="${build.args}"/>
202        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
203          <compilerarg value="-Xlint:all"/>
204    
205  <!--  <!--
206        <exclude name="java/lang/**"/>        <exclude name="java/lang/**"/>
# Line 218  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    
236    
237    <target name="docs"    <target name="docs"
238            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/main to dist dir">
239    
240      <delete dir="${build.javadocs.dir}"/>      <delete dir="${dist.javadocs.dir}"/>
241      <mkdir dir="${build.javadocs.dir}"/>      <mkdir dir="${dist.javadocs.dir}"/>
242    
243      <!-- the packagenames="none" hack below prevents scanning the -->      <!-- the packagenames="none" hack below prevents scanning the -->
244      <!-- sourcepath for packages -->      <!-- sourcepath for packages -->
245    
246      <javadoc destdir="${build.javadocs.dir}"      <javadoc destdir="${dist.javadocs.dir}"
247               packagenames="none"               packagenames="none"
248               link="${jdkapidocs.url}"               link="${jdkapi8docs.url}"
249               overview="${src.dir}/intro.html"               overview="${src.dir}/intro.html"
250               sourcepath="${src.dir}:${jdksrc.dir}"               sourcepath="${src.dir}:${jdk8src.dir}"
251               additionalparam="-XDignore.symbol.file=true" >               classpath=""
252                 executable="${javadoc8}">
253          <arg value="-XDignore.symbol.file=true"/>
254          <arg value="-tag"/>
255          <arg value="${javadoc.jls.option}"/>
256        <fileset dir="${src.dir}" defaultexcludes="yes">        <fileset dir="${src.dir}" defaultexcludes="yes">
257          <include name="**/*.java"/>          <include name="**/*.java"/>
258        </fileset>        </fileset>
# Line 248  Line 263 
263    
264    
265    <target name="dist"    <target name="dist"
266            depends="init, dist-clean, dist-jar, dist-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 292  Line 307 
307    
308    
309    
   <target name="dist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.javadocs.dir}"/>  
     <mkdir dir="${dist.javadocs.dir}"/>  
   
     <!-- the packagenames="none" hack below prevents scanning the -->  
     <!-- sourcepath for packages -->  
   
     <javadoc destdir="${dist.javadocs.dir}"  
              packagenames="none"  
              link="${jdkapidocs.url}"  
              overview="${src.dir}/intro.html"  
              sourcepath="${src.dir}:${jdksrc.dir}"  
              additionalparam="-XDignore.symbol.file=true" >  
       <fileset dir="${src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
   
   </target>  
   
   
   
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 513  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 639  Line 620 
620    
621    
622    <target name="4jdk7docs"    <target name="4jdk7docs"
623            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs for src/jdk7 to dist dir">
624    
625      <delete dir="${build.4jdk7.docs.dir}"/>      <delete dir="${dist.4jdk7.docs.dir}"/>
626      <mkdir dir="${build.4jdk7.docs.dir}"/>      <mkdir dir="${dist.4jdk7.docs.dir}"/>
627    
628      <javadoc destdir="${build.4jdk7.docs.dir}"      <javadoc destdir="${dist.4jdk7.docs.dir}"
629               packagenames="none"               packagenames="none"
630               link="${jdkapi7docs.url}"               link="${jdkapi7docs.url}"
631               overview="${4jdk7src.dir}/intro.html"               overview="${4jdk7src.dir}/intro.html"
# Line 661  Line 642 
642    
643    
644    <target name="4jdk7dist"    <target name="4jdk7dist"
645            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"            depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
646            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
647    
648    
# Line 680  Line 661 
661    
662    </target>    </target>
663    
   <target name="4jdk7dist-docs"  
           description="Builds javadocs without custom tags to dist folder">  
   
     <delete dir="${dist.4jdk7.docs.dir}"/>  
     <mkdir dir="${dist.4jdk7.docs.dir}"/>  
   
     <javadoc destdir="${dist.4jdk7.docs.dir}"  
              packagenames="none"  
              link="${jdkapi7docs.url}"  
              overview="${4jdk7src.dir}/intro.html"  
              sourcepath="${4jdk7src.dir}:${jdk7src.dir}"  
              classpath=""  
              executable="${javadoc7}">  
       <arg value="-XDignore.symbol.file=true"/>  
       <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">  
         <include name="**/*.java"/>  
       </fileset>  
     </javadoc>  
   
   </target>  
   
664    <target name="4jdk7dist-jar"    <target name="4jdk7dist-jar"
665            depends="4jdk7clean, 4jdk7compile">            depends="4jdk7clean, 4jdk7compile">
666    
# Line 712  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">
677    
678      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.dir}"/>
# Line 750  Line 710 
710    
711    
712    <target name="jsr166xdocs"    <target name="jsr166xdocs"
713            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
714    
715      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${build.jsr166xjavadocs.dir}"/>
716      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${build.jsr166xjavadocs.dir}"/>
# Line 789  Line 749 
749    
750    
751    <target name="jsr166xdist-docs"    <target name="jsr166xdist-docs"
752            description="Builds javadocs without custom tags to dist folder">            description="Builds javadocs to dist dir">
753    
754      <delete dir="${dist.jsr166xjavadocs.dir}"/>      <delete dir="${dist.jsr166xjavadocs.dir}"/>
755      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
# Line 814  Line 774 
774    
775    
776    <target name="jsr166ycompile"    <target name="jsr166ycompile"
777            depends="init, configure-compiler"            depends="configure-compiler"
778            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
779    
780      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.dir}"/>
781    
782      <javac srcdir="${jsr166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
783            destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.dir}"
784              debug="${build.debug}"             debug="${build.debug}"
785         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
786        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
787             source="${build.sourcelevel}"             source="1.6"
788               fork="true">             classpath=""
789               bootclasspath="${bootclasspath6}"
790               includeAntRuntime="false"
791               includeJavaRuntime="false"
792               executable="${javac7}"
793               fork="true">
794    
795        <include name="**/*.java"/>        <include name="jsr166y/**/*.java"/>
796        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
797        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
798        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all"/>
   
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
   
799      </javac>      </javac>
   
800    </target>    </target>
801    
802    
   
803    <target name="jsr166yjar"    <target name="jsr166yjar"
804            depends="jsr166ycompile"            depends="jsr166ycompile"
805            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
# Line 855  Line 815 
815    
816    
817    <target name="jsr166ydocs"    <target name="jsr166ydocs"
818            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs to dist dir">
819    
820      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${build.jsr166yjavadocs.dir}"/>
821      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${build.jsr166yjavadocs.dir}"/>
# Line 892  Line 852 
852    </target>    </target>
853    
854    <target name="jsr166ydist-docs"    <target name="jsr166ydist-docs"
855            description="Builds javadocs without custom tags to dist folder">            description="Builds javadocs to dist dir">
856    
857      <delete dir="${dist.jsr166yjavadocs.dir}"/>      <delete dir="${dist.jsr166yjavadocs.dir}"/>
858      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
# Line 918  Line 878 
878    
879    
880    <target name="extra166ycompile"    <target name="extra166ycompile"
881            depends="init, configure-compiler, jsr166ycompile"            depends="configure-compiler, jsr166yjar"
882            description="Compiles extra166y sources">            description="Compiles extra166y sources">
883    
884      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.dir}"/>
885    
886      <javac srcdir="${extra166ysrc.dir}"      <javac srcdir="${topsrc.dir}"
887            destdir="${build.extra166y.dir}"             destdir="${build.extra166y.dir}"
888              debug="${build.debug}"             debug="${build.debug}"
889              classpath="${jsr166yproduct.jar}"             classpath=""
890         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
891        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
892             source="${build.sourcelevel}"             source="1.6"
893               fork="true">             bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}"
894               includeAntRuntime="false"
895               includeJavaRuntime="false"
896               executable="${javac7}"
897               fork="true">
898    
899        <include name="**/*.java"/>        <include name="extra166y/**/*.java"/>
900        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
901        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
902        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
   
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  
903    
904      </javac>      </javac>
905    
# Line 960  Line 922 
922    
923    
924    <target name="extra166ydocs"    <target name="extra166ydocs"
925            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs with custom tags to build dir">
926    
927      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${build.extra166yjavadocs.dir}"/>
928      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${build.extra166yjavadocs.dir}"/>
# Line 997  Line 959 
959    </target>    </target>
960    
961    <target name="extra166ydist-docs"    <target name="extra166ydist-docs"
962            description="Builds javadocs without custom tags to dist folder">            description="Builds javadocs to dist dir">
963    
964      <delete dir="${dist.extra166yjavadocs.dir}"/>      <delete dir="${dist.extra166yjavadocs.dir}"/>
965      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
# Line 1064  Line 1026 
1026    
1027    
1028    <target name="jsr166edocs"    <target name="jsr166edocs"
1029            description="Builds javadocs with custom tags to build folder">            description="Builds javadocs with custom tags to build dir">
1030    
1031      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${build.jsr166ejavadocs.dir}"/>
1032      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${build.jsr166ejavadocs.dir}"/>
# Line 1106  Line 1068 
1068    </target>    </target>
1069    
1070    <target name="jsr166edist-docs"    <target name="jsr166edist-docs"
1071            description="Builds javadocs without custom tags to dist folder">            description="Builds javadocs to dist dir">
1072    
1073      <delete dir="${dist.jsr166ejavadocs.dir}"/>      <delete dir="${dist.jsr166ejavadocs.dir}"/>
1074      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
Legend:
Removed from v.1.99  
changed lines
  Added in v.1.104
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27