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

Diff of /jsr166/build.xml

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

revision 1.77 by dl, Thu Jul 23 13:06:55 2009 UTC revision 1.95 by jsr166, Mon Jan 14 19:22:27 2013 UTC
# Line 21  Line 21 
21    
22    
23    <!-- Compilation options -->    <!-- Compilation options -->
24    <property name="build.sourcelevel"    value="1.5"/>    <property name="build.sourcelevel"    value="1.6"/>
25    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
26    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
27    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
28    
29    <!-- Build locations -->    <!-- Build locations -->
30    <property name="build.dir"            location="build"/>    <property name="build.dir"                   location="build"/>
31    <property name="build.classes.dir"    location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
32    <property name="build.testcases.dir"  location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
33    <property name="build.loops.dir"      location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
34    <property name="build.lib.dir"        location="${build.dir}/lib"/>    <property name="build.lib.dir"               location="${build.dir}/lib"/>
35    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>    <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
36    <property name="build.reports.dir"    location="${build.dir}/reports"/>    <property name="build.reports.dir"           location="${build.dir}/reports"/>
37    <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>  
38      <property name="build.jdk7.dir"              location="${build.dir}/jdk7"/>
39      <property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>
40      <property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>
41      <property name="build.jdk7.docs.dir"         location="${build.jdk7.dir}/docs"/>
42    
43      <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
44    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>    <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
45    <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>    <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
46    
47    <property name="build.jsr166y.dir"    location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
48    <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>    <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
49    <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>    <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
50    
51    <property name="build.extra166y.dir"    location="${build.dir}/extra166y"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
52    <property name="build.extra166ylib.dir"        location="${build.dir}/extra166ylib"/>    <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
53    <property name="build.extra166yjavadocs.dir"   location="${build.dir}/extra166yjavadocs"/>    <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
54    
55      <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
56      <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
57      <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
58    
59      <!-- JDK binary locations -->
60      <property name="jdks.home"  location="${user.home}/jdk"/>
61    
62      <macrodef name="defjdklocations">
63        <attribute name="v"/>
64        <sequential>
65        <property name="jdk@{v}.home"  location="${jdks.home}/jdk@{v}"/>
66        <property name="javac@{v}"     location="${jdk@{v}.home}/bin/javac"/>
67        <property name="javadoc@{v}"   location="${jdk@{v}.home}/bin/javadoc"/>
68        <property name="bootdir@{v}"   location="${jdk@{v}.home}/jre/lib"/>
69        <property name="bootclasspath@{v}"  
70         value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
71        </sequential>
72      </macrodef>
73    
74      <defjdklocations v="6"/>
75      <defjdklocations v="7"/>
76      <defjdklocations v="8"/>
77    
78    <!-- Source locations -->    <!-- Source locations -->
79    <property name="src.dir"              location="${basedir}/src/main"/>    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 55  Line 84 
84    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
85    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
86    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
87    <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>    <property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>
88    <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>    <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
89    <property name="extra166ysrc.dir"       location="${basedir}/src/extra166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
90      <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
91      <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
92      <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
93    
94    <!-- Distribution locations -->    <!-- Distribution locations -->
95    <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
96      <property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>
97    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
98    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
99    <property name="dist.extra166yjavadocs.dir"    location="${dist.dir}/extra166ydocs"/>    <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
100      <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
101    
102    <!-- Jar locations -->    <!-- Jar locations -->
103    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
104      <property name="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/>
105    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
106    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
107    <property name="extra166yproduct.jar"   location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
108      <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
109    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
110    
111    <!-- Bootclasspath argument -->    <!-- Bootclasspath argument -->
112    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
113    
114      <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
115      <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
116      <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
117      <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
118    
119      <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
120      <!-- The below does not yet exist as of 2012-11 -->
121      <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
122      <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
123    
124    <!-- Test classpath -->    <!-- Test classpath -->
125    <path id="test.classpath">    <path id="test.classpath">
126      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
# Line 89  Line 135 
135    
136    <!-- Main targets -->    <!-- Main targets -->
137    
138      <target name="dists"
139              depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
140              description="Builds all public jars and docs"/>
141    
142    <target name="compile"    <target name="compile"
143            depends="init, configure-compiler"            depends="init, configure-compiler"
# Line 105  Line 154 
154               fork="true">               fork="true">
155    
156        <include name="**/*.java"/>        <include name="**/*.java"/>
157        <compilerarg value="-XDignore.symbol.file"/>        <compilerarg value="-XDignore.symbol.file=true"/>
158    
159  <!--  <!--
160        <exclude name="java/lang/**"/>        <exclude name="java/lang/**"/>
# Line 145  Line 194 
194      <delete dir="${build.javadocs.dir}"/>      <delete dir="${build.javadocs.dir}"/>
195      <mkdir dir="${build.javadocs.dir}"/>      <mkdir dir="${build.javadocs.dir}"/>
196    
197      <javadoc destdir="${build.javadocs.dir}"      <!-- the packagenames="none" hack below prevents scanning the -->
198                  link="http://java.sun.com/javase/6/docs/api/"      <!-- sourcepath for packages -->
             overview="${src.dir}/intro.html"  
             sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"  
     >            
   
       <packageset dir="${src.dir}"/>  
199    
200        <javadoc destdir="${build.javadocs.dir}"
201                 packagenames="none"
202                 link="${jdkapidocs.url}"
203                 overview="${src.dir}/intro.html"
204                 sourcepath="${src.dir}:${jdksrc.dir}"
205                 additionalparam="-XDignore.symbol.file=true" >
206          <fileset dir="${src.dir}" defaultexcludes="yes">
207            <include name="**/*.java"/>
208          </fileset>
209      </javadoc>      </javadoc>
210    
211    </target>    </target>
# Line 164  Line 217 
217            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
218    
219    
   
220    <target name="release"    <target name="release"
221            depends="dist"            depends="dist"
222            description="Puts entire CVS tree, plus distribution productions, in a jar">            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 211  Line 263 
263      <delete dir="${dist.javadocs.dir}"/>      <delete dir="${dist.javadocs.dir}"/>
264      <mkdir dir="${dist.javadocs.dir}"/>      <mkdir dir="${dist.javadocs.dir}"/>
265    
266      <javadoc destdir="${dist.javadocs.dir}"      <!-- the packagenames="none" hack below prevents scanning the -->
267              link="http://java.sun.com/javase/6/docs/api/"      <!-- sourcepath for packages -->
             overview="${src.dir}/intro.html"  
268    
269              sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"      <javadoc destdir="${dist.javadocs.dir}"
270       >               packagenames="none"
271  <!--               link="${jdkapidocs.url}"
272        <packageset dir="${src.dir}" defaultexcludes="yes">               overview="${src.dir}/intro.html"
273        <include name="java/util/concurrent"/>               sourcepath="${src.dir}:${jdksrc.dir}"
274        <include name="java/util/concurrent/atomic"/>               additionalparam="-XDignore.symbol.file=true" >
275        <include name="java/util/concurrent/locks"/>        <fileset dir="${src.dir}" defaultexcludes="yes">
276        </packageset>          <include name="**/*.java"/>
 -->  
       <fileset dir="${topsrc.dir}" defaultexcludes="yes">  
       <include name="main/java/util/concurrent/*.java"/>  
       <include name="main/java/util/concurrent/atomic/*.java"/>  
       <include name="main/java/util/concurrent/locks/*.java"/>  
       <include name="main/java/util/*.java"/>  
 <!--  
       <include name="main/java/util/concurrent/*.html"/>  
       <include name="main/java/util/concurrent/atomic/*.html"/>  
       <include name="main/java/util/concurrent/locks/*.html"/>  
       <include name="main/java/util/*.html"/>  
 -->  
 <!--      <include name="jsr166x/*.java"/> -->  
277        </fileset>        </fileset>
278      </javadoc>      </javadoc>
279    
# Line 279  Line 317 
317    
318        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
319        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
320          <compilerarg value="-XDignore.symbol.file=true"/>
321    
322        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
323    
# Line 296  Line 335 
335    
336        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
337        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
338          <compilerarg value="-XDignore.symbol.file=true"/>
339    
340        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
341    
# Line 312  Line 352 
352    
353        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
354        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
355          <compilerarg value="-XDignore.symbol.file=true"/>
356    
357        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
358    
# Line 452  Line 493 
493    
494        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
495        <classpath refid="loops.classpath"/>        <classpath refid="loops.classpath"/>
496          <compilerarg value="-XDignore.symbol.file=true"/>
497    
498      </javac>      </javac>
499    
# Line 462  Line 504 
504    </target>    </target>
505    
506    
507      <!-- jdk7 -->
508    
509    
510      <target name="jdk7compile"
511              depends="configure-compiler"
512              description="Compiles src/jdk7 sources">
513    
514        <mkdir dir="${build.jdk7.classes.dir}"/>
515    
516        <javac srcdir="${jdk7src.dir}"
517               destdir="${build.jdk7.classes.dir}"
518               debug="${build.debug}"
519               debuglevel="${build.debuglevel}"
520               deprecation="${build.deprecation}"
521               source="1.6"
522               classpath=""
523               bootclasspath="${bootclasspath6}"
524               includeAntRuntime="false"
525               includeJavaRuntime="false"
526               executable="${javac6}"
527               fork="true">
528    
529          <include name="**/*.java"/>
530          <compilerarg line="${build.args}"/>
531          <compilerarg value="-XDignore.symbol.file=true"/>
532          <compilerarg value="-Xlint:all"/>
533    
534        </javac>
535    
536      </target>
537    
538    
539    
540      <target name="jdk7jar"
541              depends="jdk7compile"
542              description="Builds library jar from compiled sources">
543    
544        <mkdir dir="${build.jdk7.lib.dir}"/>
545    
546        <jar destfile="${jdk7product.jar}" index="true">
547          <fileset dir="${build.jdk7.classes.dir}"/>
548        </jar>
549    
550      </target>
551    
552    
553    
554      <target name="jdk7docs"
555              description="Builds javadocs with custom tags to build folder">
556    
557        <delete dir="${build.jdk7.docs.dir}"/>
558        <mkdir dir="${build.jdk7.docs.dir}"/>
559    
560        <javadoc destdir="${build.jdk7.docs.dir}"
561                 packagenames="none"
562                 link="${jdkapi7docs.url}"
563                 overview="${jdk7src.dir}/intro.html"
564                 sourcepath="${jdk7src.dir}"
565                 bootclasspath="${bootclasspath6}"
566                 classpath=""
567                 source="1.6"
568                 executable="${javadoc7}"
569                 additionalparam="-XDignore.symbol.file=true" >
570          <fileset dir="${jdk7src.dir}" defaultexcludes="yes">
571            <include name="**/*.java"/>
572          </fileset>
573        </javadoc>
574    
575      </target>
576    
577    
578      <target name="jdk7dist"
579              depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"
580              description="Puts all distributable products in single hierarchy"/>
581    
582    
583    
584      <target name="jdk7clean"
585              description="Removes all build products">
586    
587        <delete dir="${build.jdk7.dir}"/>
588    
589      </target>
590    
591    
592    
593      <target name="jdk7dist-clean"
594              description="Removes all build and distribution products">
595    
596      </target>
597    
598      <target name="jdk7dist-docs"
599              description="Builds javadocs without custom tags to dist folder">
600    
601        <delete dir="${dist.jdk7.docs.dir}"/>
602        <mkdir dir="${dist.jdk7.docs.dir}"/>
603    
604        <javadoc destdir="${dist.jdk7.docs.dir}"
605                 packagenames="none"
606                 link="${jdkapi7docs.url}"
607                 overview="${jdk7src.dir}/intro.html"
608                 sourcepath="${jdk7src.dir}"
609                 classpath=""
610                 executable="${javadoc7}"
611                 bootclasspath="${bootclasspath6}"
612                 source="1.6">
613          <arg value="-XDignore.symbol.file=true"/>
614          <fileset dir="${jdk7src.dir}" defaultexcludes="yes">
615            <include name="**/*.java"/>
616          </fileset>
617        </javadoc>
618    
619      </target>
620    
621      <target name="jdk7dist-jar"
622              depends="jdk7clean, jdk7jar">
623    
624        <copy file="${jdk7product.jar}" todir="${dist.dir}"/>
625    
626      </target>
627    
628    <!-- jsr166x -->    <!-- jsr166x -->
629    
630    
# Line 481  Line 644 
644    
645        <include name="**/*.java"/>        <include name="**/*.java"/>
646        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
647          <compilerarg value="-XDignore.symbol.file=true"/>
648    
649      </javac>      </javac>
650    
# Line 509  Line 673 
673      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${build.jsr166xjavadocs.dir}"/>
674    
675      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${build.jsr166xjavadocs.dir}"
676               link="http://java.sun.com/javase/6/docs/api/"               packagenames="jsr166x"
677                 link="${jdkapidocs.url}"
678              sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"               source="${build.sourcelevel}"
679                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
680      >               additionalparam="-XDignore.symbol.file=true" />
       <packageset dir="${topsrc.dir}" defaultexcludes="yes">  
       <include name="jsr166x"/>  
       </packageset>  
   
   
     </javadoc>  
681    
682    </target>    </target>
683    
# Line 554  Line 712 
712      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
713    
714      <javadoc destdir="${dist.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
715                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="jsr166x"
716                source="${build.sourcelevel}">               link="${jdkapidocs.url}"
717                 source="${build.sourcelevel}"
718        <packageset dir="${topsrc.dir}" defaultexcludes="yes">               sourcepath="${topsrc.dir}:${jdksrc.dir}"
719        <include name="jsr166x"/>               additionalparam="-XDignore.symbol.file=true" />
       </packageset>  
   
     </javadoc>  
720    
721    </target>    </target>
722    
# Line 591  Line 746 
746    
747        <include name="**/*.java"/>        <include name="**/*.java"/>
748        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
749          <compilerarg value="-XDignore.symbol.file=true"/>
750        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
751    
752  <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
# Line 622  Line 778 
778      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${build.jsr166yjavadocs.dir}"/>
779    
780      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${build.jsr166yjavadocs.dir}"
781                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="jsr166y"
782              sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"               link="${jdkapidocs.url}"
783                 source="${build.sourcelevel}"
784      >               sourcepath="${topsrc.dir}:${jdksrc.dir}"
785        <packageset dir="${topsrc.dir}" defaultexcludes="no">               additionalparam="-XDignore.symbol.file=true" />
       <include name="jsr166y"/>  
       </packageset>  
   
   
     </javadoc>  
786    
787    </target>    </target>
788    
# Line 664  Line 815 
815      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
816    
817      <javadoc destdir="${dist.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
818                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="jsr166y"
819                source="${build.sourcelevel}">               link="${jdkapidocs.url}"
820        <fileset dir="${topsrc.dir}" defaultexcludes="yes">               source="${build.sourcelevel}"
821        <include name="jsr166y/*.java"/>               sourcepath="${topsrc.dir}:${jdksrc.dir}"
822              </fileset>               additionalparam="-XDignore.symbol.file=true" />
     </javadoc>  
823    
824    </target>    </target>
825    
# Line 680  Line 830 
830    
831    </target>    </target>
832    
833    
834    <!-- extra166y -->    <!-- extra166y -->
835    
836    
# Line 700  Line 851 
851    
852        <include name="**/*.java"/>        <include name="**/*.java"/>
853        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
854          <compilerarg value="-XDignore.symbol.file=true"/>
855        <compilerarg value="${bootclasspath.args}"/>        <compilerarg value="${bootclasspath.args}"/>
856    
857  <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->  <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
# Line 731  Line 883 
883      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${build.extra166yjavadocs.dir}"/>
884    
885      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${build.extra166yjavadocs.dir}"
886                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="extra166y"
887              sourcepath="${extra166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"               link="${jdkapidocs.url}"
888                 source="${build.sourcelevel}"
889      >               sourcepath="${topsrc.dir}:${jdksrc.dir}"
890        <packageset dir="${topsrc.dir}" defaultexcludes="no">               additionalparam="-XDignore.symbol.file=true" />
       <include name="extra166y"/>  
       </packageset>  
   
   
     </javadoc>  
891    
892    </target>    </target>
893    
# Line 773  Line 920 
920      <mkdir dir="${dist.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
921    
922      <javadoc destdir="${dist.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
923                  link="http://java.sun.com/javase/6/docs/api/"               packagenames="extra166y"
924                source="${build.sourcelevel}">               link="${jdkapidocs.url}"
925        <fileset dir="${topsrc.dir}" defaultexcludes="yes">               source="${build.sourcelevel}"
926        <include name="extra166y/*.java"/>               sourcepath="${topsrc.dir}:${jdksrc.dir}"
927              </fileset>               additionalparam="-XDignore.symbol.file=true" />
     </javadoc>  
928    
929    </target>    </target>
930    
# Line 789  Line 935 
935    
936    </target>    </target>
937    
938      <!-- jsr166e -->
939    
940      <target name="jsr166ecompile"
941              depends="configure-compiler"
942              description="Compiles jsr166e sources">
943    
944        <mkdir dir="${build.jsr166e.dir}"/>
945    
946        <javac srcdir="${topsrc.dir}"
947               destdir="${build.jsr166e.dir}"
948               debug="${build.debug}"
949               debuglevel="${build.debuglevel}"
950               deprecation="${build.deprecation}"
951               source="1.7"
952               classpath=""
953               includeAntRuntime="false"
954               includeJavaRuntime="false"
955               executable="${javac7}"
956               fork="true">
957    
958          <include name="jsr166e/**/*.java"/>
959          <compilerarg line="${build.args}"/>
960          <compilerarg value="-XDignore.symbol.file=true"/>
961          <compilerarg value="-Xlint:all"/>
962    
963        </javac>
964    
965      </target>
966    
967    
968    
969      <target name="jsr166ejar"
970              depends="jsr166ecompile"
971              description="Builds library jar from compiled sources">
972    
973        <mkdir dir="${build.jsr166elib.dir}"/>
974    
975        <jar destfile="${jsr166eproduct.jar}" index="true">
976          <fileset dir="${build.jsr166e.dir}"/>
977        </jar>
978    
979      </target>
980    
981    
982    
983      <target name="jsr166edocs"
984              description="Builds javadocs with custom tags to build folder">
985    
986        <delete dir="${build.jsr166ejavadocs.dir}"/>
987        <mkdir dir="${build.jsr166ejavadocs.dir}"/>
988    
989        <javadoc destdir="${build.jsr166ejavadocs.dir}"
990                 packagenames="jsr166e,jsr166e.extra"
991                 link="${jdkapidocs.url}"
992                 source="1.7"
993                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
994                 additionalparam="-XDignore.symbol.file=true" />
995    
996      </target>
997    
998    
999      <target name="jsr166edist"
1000              depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1001              description="Puts all distributable products in single hierarchy"/>
1002    
1003    
1004    
1005      <target name="jsr166eclean"
1006              description="Removes all build products">
1007    
1008        <delete dir="${build.jsr166e.dir}"/>
1009        <delete dir="${build.jsr166elib.dir}"/>
1010    
1011      </target>
1012    
1013    
1014    
1015      <target name="jsr166edist-clean"
1016              description="Removes all build and distribution products">
1017    
1018      </target>
1019    
1020      <target name="jsr166edist-docs"
1021              description="Builds javadocs without custom tags to dist folder">
1022    
1023        <delete dir="${dist.jsr166ejavadocs.dir}"/>
1024        <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1025    
1026        <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1027                 packagenames="jsr166e,jsr166e.extra"
1028                 link="${jdkapidocs.url}"
1029                 source="1.7"
1030                 sourcepath="${topsrc.dir}:${jdksrc.dir}"
1031                 additionalparam="-XDignore.symbol.file=true" />
1032    
1033      </target>
1034    
1035      <target name="jsr166edist-jar"
1036              depends="jsr166eclean, jsr166ejar">
1037    
1038        <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1039    
1040      </target>
1041    
1042  </project>  </project>
Legend:
Removed from v.1.77  
changed lines
  Added in v.1.95
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27