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

Diff of /jsr166/build.xml

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

revision 1.107 by jsr166, Sat Jan 19 23:40:04 2013 UTC revision 1.116 by jsr166, Sun Jan 20 07:24:52 2013 UTC
# Line 35  Line 35 
35    
36    
37    <!-- Compilation options -->    <!-- Compilation options -->
38    <property name="build.sourcelevel"    value="1.6"/>    <property name="build.sourcelevel"    value="6"/>
39    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
40    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
41    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
# Line 45  Line 45 
45    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
46    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
47    <property name="build.loops.dir"             location="${build.dir}/loops"/>    <property name="build.loops.dir"             location="${build.dir}/loops"/>
   <property name="build.lib.dir"               location="${build.dir}/lib"/>  
   <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>  
48    <property name="build.reports.dir"           location="${build.dir}/reports"/>    <property name="build.reports.dir"           location="${build.dir}/reports"/>
49    
50    <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51    <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52    <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>    <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
53    <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
   <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>  
54    
55    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
   <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>  
   <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>  
   
56    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>    <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
   <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>  
   <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>  
   
57    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>    <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
   <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>  
   <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>  
   
58    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>    <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59    <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>  
60    <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>    <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
61      <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
62      <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63      <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
64    
65    <!-- JDK binary locations -->    <!-- JDK binary locations -->
66    <property name="jdks.home"  location="${user.home}/jdk"/>    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 93  Line 84 
84    <defjdklocations v="8"/>    <defjdklocations v="8"/>
85    
86    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
87      <attribute name="jvm"/>      <attribute name="target"/>
88      <attribute name="tck.classes"/>      <attribute name="workdir"/>
89      <attribute name="product.jar" default="${product.jar}"/>      <attribute name="product.jar" default="${product.jar}"/>
90      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default=""/>
91      <sequential>      <sequential>
92      <java classname="JSR166TestCase"  
93            jvm="@{jvm}" fork="true">      <mkdir dir="@{workdir}/tck-classes"/>
94    
95        <javac srcdir="${tck.src.dir}"
96               destdir="@{workdir}/tck-classes"
97               debug="${build.debug}"
98               debuglevel="${build.debuglevel}"
99               deprecation="${build.deprecation}"
100               source="6"
101               classpath="${junit.jar}"
102               bootclasspath="@{product.jar}:${bootclasspath6}"
103               includeAntRuntime="false"
104               includeJavaRuntime="false"
105               executable="${javac@{target}}"
106               fork="true">
107    
108          <include name="**/*.java"/>
109          <compilerarg value="-XDignore.symbol.file=true"/>
110          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
111          <compilerarg line="${build.args}"/>
112        </javac>
113    
114        <java classname="JSR166TestCase" jvm="${java@{target}}" fork="true">
115          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>          <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
116          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
117          <classpath>          <classpath>
118            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
119            <pathelement location="@{tck.classes}"/>            <pathelement location="@{workdir}/tck-classes"/>
120          </classpath>          </classpath>
121      </java>      </java>
122    
123      </sequential>      </sequential>
124    </macrodef>    </macrodef>
125    
# Line 124  Line 137 
137    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>    <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
138    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>    <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
139    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>    <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
   <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>  
140    
141    <!-- Distribution locations -->    <!-- Distribution locations -->
142    <property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>    <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
143    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>    <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
144    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>    <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
145    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>    <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
146    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>    <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
147    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>    <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
148    
149    <!-- Jar locations -->    <!-- Jar locations -->
150    <property name="product.jar"      location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
151    <property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>    <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
152    <property name="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>    <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
153    <property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>    <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
154    <property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>    <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
155    <property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.jar"/>    <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
156    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
157    
158    <!-- Bootclasspath argument -->    <!-- Bootclasspath argument -->
# Line 158  Line 170 
170    <!-- Default jdk api doc location (latest stable release seems best) -->    <!-- Default jdk api doc location (latest stable release seems best) -->
171    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
172    
173      <!-- Define the "jtreg" task -->
174      <!-- See the docs in "jtreg -onlineHelp" -->
175      <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
176               classpath="${lib.dir}/jtreg.jar" />
177    
178    <!-- Test classpath -->    <!-- Test classpath -->
179    <path id="test.classpath">    <path id="test.classpath">
180      <pathelement location="${build.testcases.dir}"/>      <pathelement location="${build.testcases.dir}"/>
# Line 220  Line 237 
237            depends="compile"            depends="compile"
238            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
239    
     <mkdir dir="${build.lib.dir}"/>  
   
240      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
241        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
242      </jar>      </jar>
# Line 293  Line 308 
308            description="Removes all build products">            description="Removes all build products">
309    
310      <delete dir="${build.dir}"/>      <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>  
     <delete dir="${build.lib.dir}"/>  
311    
312    </target>    </target>
313    
# Line 326  Line 339 
339      <mkdir dir="${build.testcases.dir}"/>      <mkdir dir="${build.testcases.dir}"/>
340    
341      <javac srcdir="${tck.src.dir}"      <javac srcdir="${tck.src.dir}"
342            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
343              debug="${build.debug}"             debug="${build.debug}"
344         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
345        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
346             source="${build.sourcelevel}"             source="6"
347               fork="true">             classpath="${junit.jar}"
348               bootclasspath="${product.jar}:${bootclasspath6}"
349               includeAntRuntime="false"
350               includeJavaRuntime="false"
351               executable="${javac8}"
352               fork="true">
353    
354        <compilerarg value="${bootclasspath.args}"/>        <include name="**/*.java"/>
355        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
356        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
357          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
       <classpath refid="test.classpath"/>  
358    
359      </javac>      </javac>
360    
361      <javac srcdir="${test.src.dir}"      <javac srcdir="${test.src.dir}"
362            destdir="${build.testcases.dir}"             destdir="${build.testcases.dir}"
363              debug="${build.debug}"             debug="${build.debug}"
364         debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
365        deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
366             source="${build.sourcelevel}"             source="6"
367               fork="true">             classpath=""
368               bootclasspath="${product.jar}:${bootclasspath6}"
369               includeAntRuntime="false"
370               includeJavaRuntime="false"
371               executable="${javac8}"
372               fork="true">
373    
374        <include name="jsr166/test/**"/>        <include name="jsr166/test/**/*.java"/>
375    
       <compilerarg value="${bootclasspath.args}"/>  
376        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
377        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
378          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
       <classpath refid="test.classpath"/>  
379    
380      </javac>      </javac>
381    
# Line 372  Line 392 
392        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
393        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
394    
       <classpath refid="test.classpath"/>  
   
395      </javac>      </javac>
396  -->  -->
397    
# Line 393  Line 411 
411            errorProperty="junit.failed"            errorProperty="junit.failed"
412          failureProperty="junit.failed"          failureProperty="junit.failed"
413                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
414                        jvm="${java8}"
415                     fork="true">                     fork="true">
416    
417        <jvmarg value="${bootclasspath.args}"/>        <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
418        <jvmarg value="-server"/>        <jvmarg value="-server"/>
419        <jvmarg value="-showversion"/>        <jvmarg value="-showversion"/>
420    
# Line 551  Line 570 
570    
571      </javac>      </javac>
572    
573      <mkdir dir="${build.4jdk7.lib.dir}"/>    </target>
574    
575      <target name="4jdk7-jar"
576              depends="4jdk7compile"
577              description="Builds library jar from compiled sources">
578    
579      <jar destfile="${4jdk7product.jar}" index="true">      <jar destfile="${4jdk7product.jar}">
580        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
581      </jar>      </jar>
582    
     <mkdir dir="${build.4jdk7.tck.classes.dir}"/>  
   
     <javac srcdir="${tck.src.dir}"  
            destdir="${build.4jdk7.tck.classes.dir}"  
            debug="${build.debug}"  
            debuglevel="${build.debuglevel}"  
            deprecation="${build.deprecation}"  
            source="6"  
            classpath="${junit.jar}"  
            bootclasspath="${4jdk7product.jar}:${bootclasspath6}"  
            includeAntRuntime="false"  
            includeJavaRuntime="false"  
            executable="${javac7}"  
            fork="true">  
   
       <include name="**/*.java"/>  
       <compilerarg line="${build.args}"/>  
       <compilerarg value="-XDignore.symbol.file=true"/>  
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>  
   
     </javac>  
   
583    </target>    </target>
584    
585    
586    <target name="4jdk7-test-tck"    <target name="4jdk7-test-tck"
587            depends="4jdk7compile"            depends="4jdk7-jar"
588            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
589    
590      <run-tck-tests      <run-tck-tests
591        jvm="${java7}"        target="7"
592        tck.classes="${build.4jdk7.tck.classes.dir}"        workdir="${build.4jdk7.dir}"
593        product.jar="${4jdk7product.jar}"/>        product.jar="${4jdk7product.jar}"/>
594    </target>    </target>
595    
# Line 620  Line 622 
622      </junit>      </junit>
623    </target>    </target>
624    
625      <target name="4jdk7-test-jtreg"
626              depends="4jdk7compile"
627              description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
628        <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
629        <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
630        <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
631        <mkdir dir="${build.4jdk7.dir}/JTreport"/>
632        <jtreg dir="${jtreg.src.dir}"
633               jdk="${jdk7.home}"
634               workDir="${build.4jdk7.dir}/JTwork"
635               reportDir="${build.4jdk7.dir}/JTreport">
636    
637          <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
638          <arg value="-agentvm"/>
639          <arg value="-v:nopass,fail"/>
640          <arg value="-vmoptions:-esa -ea"/>
641          <arg value="-automatic"/>
642          <arg value="-k:!ignore"/>
643        </jtreg>
644      </target>
645    
646    
647      <target name="4jdk7-test"
648              depends="4jdk7-test-tck, 4jdk7-test-jtreg"
649              description="Runs tck and jtreg tests for jsr166-4jdk7">
650      </target>
651    
652    
653    <target name="4jdk7docs"    <target name="4jdk7docs"
654            description="Builds javadocs for src/jdk7 to dist dir">            description="Builds javadocs for src/jdk7 to dist dir">
# Line 650  Line 679 
679    
680    
681    <target name="4jdk7clean"    <target name="4jdk7clean"
682            description="Removes all build products">            description="Removes all 4jdk7 build products">
683    
684      <delete dir="${build.4jdk7.dir}"/>      <delete dir="${build.4jdk7.dir}"/>
685    
# Line 670  Line 699 
699    
700    </target>    </target>
701    
   <!-- jsr166x -->  
702    
703      <!-- jsr166x -->
704    
705    <target name="jsr166xcompile"    <target name="jsr166xcompile"
706            depends="configure-compiler"            depends="configure-compiler"
707            description="Compiles jsr166x sources to build dir">            description="Compiles jsr166x sources to build dir">
708    
709      <mkdir dir="${build.jsr166x.dir}"/>      <mkdir dir="${build.jsr166x.classes.dir}"/>
710    
711      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
712             destdir="${build.jsr166x.dir}"             destdir="${build.jsr166x.classes.dir}"
713             debug="${build.debug}"             debug="${build.debug}"
714             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
715             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 707  Line 736 
736            depends="jsr166xcompile"            depends="jsr166xcompile"
737            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
738    
     <mkdir dir="${build.jsr166xlib.dir}"/>  
   
739      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
740        <fileset dir="${build.jsr166x.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
741      </jar>      </jar>
742    
743    </target>    </target>
# Line 720  Line 747 
747    <target name="jsr166xdocs"    <target name="jsr166xdocs"
748            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
749    
750      <delete dir="${build.jsr166xjavadocs.dir}"/>      <delete dir="${dist.jsr166xjavadocs.dir}"/>
751      <mkdir dir="${build.jsr166xjavadocs.dir}"/>      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
752    
753      <javadoc destdir="${build.jsr166xjavadocs.dir}"      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
754               packagenames="jsr166x.*"               packagenames="jsr166x.*"
755               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
756               source="5"               source="5"
757               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
758               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
759               executable="${javadoc7}"               executable="${javadoc7}"
760               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true"/>
761    
762    </target>    </target>
763    
764    
765    <target name="jsr166xdist"    <target name="jsr166xdist"
766            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"            depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
767            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
768    
769    
770    
771    <target name="jsr166xclean"    <target name="jsr166xclean"
772            description="Removes all build products">            description="Removes all jsr166x build products">
773    
774      <delete dir="${build.jsr166x.dir}"/>      <delete dir="${build.jsr166x.dir}"/>
     <delete dir="${build.jsr166xlib.dir}"/>  
775    
776    </target>    </target>
777    
# Line 757  Line 783 
783    </target>    </target>
784    
785    
   
   <target name="jsr166xdist-docs"  
           description="Builds javadocs to dist dir">  
   
     <delete dir="${dist.jsr166xjavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166xjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166xjavadocs.dir}"  
              packagenames="jsr166x.*"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdk6src.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
786    <target name="jsr166xdist-jar"    <target name="jsr166xdist-jar"
787            depends="jsr166xclean, jsr166xjar">            depends="jsr166xclean, jsr166xjar">
788    
# Line 788  Line 797 
797            depends="configure-compiler"            depends="configure-compiler"
798            description="Compiles jsr166y sources">            description="Compiles jsr166y sources">
799    
800      <mkdir dir="${build.jsr166y.dir}"/>      <mkdir dir="${build.jsr166y.classes.dir}"/>
801    
802      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
803             destdir="${build.jsr166y.dir}"             destdir="${build.jsr166y.classes.dir}"
804             debug="${build.debug}"             debug="${build.debug}"
805             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
806             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 815  Line 824 
824            depends="jsr166ycompile"            depends="jsr166ycompile"
825            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
826    
     <mkdir dir="${build.jsr166ylib.dir}"/>  
   
827      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
828        <fileset dir="${build.jsr166y.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
829      </jar>      </jar>
830    
831    </target>    </target>
# Line 828  Line 835 
835    <target name="jsr166ydocs"    <target name="jsr166ydocs"
836            description="Builds javadocs to dist dir">            description="Builds javadocs to dist dir">
837    
838      <delete dir="${build.jsr166yjavadocs.dir}"/>      <delete dir="${dist.jsr166yjavadocs.dir}"/>
839      <mkdir dir="${build.jsr166yjavadocs.dir}"/>      <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
840    
841      <javadoc destdir="${build.jsr166yjavadocs.dir}"      <javadoc destdir="${dist.jsr166yjavadocs.dir}"
842               packagenames="jsr166y.*"               packagenames="jsr166y.*"
843               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
844               source="6"               source="6"
845               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
846               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
847               executable="${javadoc7}"               executable="${javadoc7}"
848               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true"/>
849    
850    </target>    </target>
851    
852    
853    <target name="jsr166ydist"    <target name="jsr166ydist"
854            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"            depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
855            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
856    
857    
858    
859    <target name="jsr166yclean"    <target name="jsr166yclean"
860            description="Removes all build products">            description="Removes all jsr166y build products">
861    
862      <delete dir="${build.jsr166y.dir}"/>      <delete dir="${build.jsr166y.dir}"/>
     <delete dir="${build.jsr166ylib.dir}"/>  
863    
864    </target>    </target>
865    
# Line 864  Line 870 
870    
871    </target>    </target>
872    
   <target name="jsr166ydist-docs"  
           description="Builds javadocs to dist dir">  
   
     <delete dir="${dist.jsr166yjavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166yjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166yjavadocs.dir}"  
              packagenames="jsr166y.*"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdk6src.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
873    <target name="jsr166ydist-jar"    <target name="jsr166ydist-jar"
874            depends="jsr166yclean, jsr166yjar">            depends="jsr166yclean, jsr166yjar">
875    
# Line 895  Line 885 
885            depends="configure-compiler, jsr166yjar"            depends="configure-compiler, jsr166yjar"
886            description="Compiles extra166y sources">            description="Compiles extra166y sources">
887    
888      <mkdir dir="${build.extra166y.dir}"/>      <mkdir dir="${build.extra166y.classes.dir}"/>
889    
890      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
891             destdir="${build.extra166y.dir}"             destdir="${build.extra166y.classes.dir}"
892             debug="${build.debug}"             debug="${build.debug}"
893             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
894             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 925  Line 915 
915            depends="extra166ycompile"            depends="extra166ycompile"
916            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
917    
     <mkdir dir="${build.extra166ylib.dir}"/>  
   
918      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
919        <fileset dir="${build.extra166y.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
920      </jar>      </jar>
921    
922    </target>    </target>
# Line 938  Line 926 
926    <target name="extra166ydocs"    <target name="extra166ydocs"
927            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
928    
929      <delete dir="${build.extra166yjavadocs.dir}"/>      <delete dir="${dist.extra166yjavadocs.dir}"/>
930      <mkdir dir="${build.extra166yjavadocs.dir}"/>      <mkdir dir="${dist.extra166yjavadocs.dir}"/>
931    
932      <javadoc destdir="${build.extra166yjavadocs.dir}"      <javadoc destdir="${dist.extra166yjavadocs.dir}"
933               packagenames="extra166y.*"               packagenames="extra166y.*"
934               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
935               source="6"               source="6"
936               bootclasspath="${bootclasspath6}"               bootclasspath="${bootclasspath6}"
937               sourcepath="${topsrc.dir}:${jdk6src.dir}"               sourcepath="${topsrc.dir}:${jdk6src.dir}"
938               executable="${javadoc7}"               executable="${javadoc7}"
939               additionalparam="-XDignore.symbol.file=true" />               additionalparam="-XDignore.symbol.file=true"/>
940    
941    </target>    </target>
942    
943    
944    <target name="extra166ydist"    <target name="extra166ydist"
945            depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"            depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
946            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
947    
948    
949    
950    <target name="extra166yclean"    <target name="extra166yclean"
951            description="Removes all build products">            description="Removes all extra166y build products">
952    
953      <delete dir="${build.extra166y.dir}"/>      <delete dir="${build.extra166y.dir}"/>
     <delete dir="${build.extra166ylib.dir}"/>  
954    
955    </target>    </target>
956    
# Line 974  Line 961 
961    
962    </target>    </target>
963    
   <target name="extra166ydist-docs"  
           description="Builds javadocs to dist dir">  
   
     <delete dir="${dist.extra166yjavadocs.dir}"/>  
     <mkdir dir="${dist.extra166yjavadocs.dir}"/>  
   
     <javadoc destdir="${dist.extra166yjavadocs.dir}"  
              packagenames="extra166y.*"  
              link="${jdkapidocs.url}"  
              source="${build.sourcelevel}"  
              sourcepath="${topsrc.dir}:${jdk6src.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
964    <target name="extra166ydist-jar"    <target name="extra166ydist-jar"
965            depends="extra166yclean, extra166yjar">            depends="extra166yclean, extra166yjar">
966    
# Line 1003  Line 974 
974            depends="configure-compiler"            depends="configure-compiler"
975            description="Compiles jsr166e sources">            description="Compiles jsr166e sources">
976    
977      <mkdir dir="${build.jsr166e.dir}"/>      <mkdir dir="${build.jsr166e.classes.dir}"/>
978    
979      <javac srcdir="${topsrc.dir}"      <javac srcdir="${topsrc.dir}"
980             destdir="${build.jsr166e.dir}"             destdir="${build.jsr166e.classes.dir}"
981             debug="${build.debug}"             debug="${build.debug}"
982             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
983             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
# Line 1032  Line 1003 
1003            depends="jsr166ecompile"            depends="jsr166ecompile"
1004            description="Builds library jar from compiled sources">            description="Builds library jar from compiled sources">
1005    
     <mkdir dir="${build.jsr166elib.dir}"/>  
   
1006      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1007        <fileset dir="${build.jsr166e.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1008      </jar>      </jar>
1009    
1010    </target>    </target>
# Line 1045  Line 1014 
1014    <target name="jsr166edocs"    <target name="jsr166edocs"
1015            description="Builds javadocs to build dir">            description="Builds javadocs to build dir">
1016    
1017      <delete dir="${build.jsr166ejavadocs.dir}"/>      <delete dir="${dist.jsr166ejavadocs.dir}"/>
1018      <mkdir dir="${build.jsr166ejavadocs.dir}"/>      <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1019    
1020      <javadoc destdir="${build.jsr166ejavadocs.dir}"      <javadoc destdir="${dist.jsr166ejavadocs.dir}"
1021               packagenames="jsr166e.*"               packagenames="jsr166e.*"
1022               link="${jdkapidocs.url}"               link="${jdkapidocs.url}"
1023               source="7"               source="7"
# Line 1061  Line 1030 
1030    
1031    
1032    <target name="jsr166edist"    <target name="jsr166edist"
1033            depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"            depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1034            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
1035    
1036    
1037    
1038    <target name="jsr166eclean"    <target name="jsr166eclean"
1039            description="Removes all build products">            description="Removes all jsr166e build products">
1040    
1041      <delete dir="${build.jsr166e.dir}"/>      <delete dir="${build.jsr166e.dir}"/>
     <delete dir="${build.jsr166elib.dir}"/>  
1042    
1043    </target>    </target>
1044    
1045    
   
1046    <target name="jsr166edist-clean"    <target name="jsr166edist-clean"
1047            description="Removes all build and distribution products">            description="Removes all build and distribution products">
1048    
1049    </target>    </target>
1050    
   <target name="jsr166edist-docs"  
           description="Builds javadocs to dist dir">  
   
     <delete dir="${dist.jsr166ejavadocs.dir}"/>  
     <mkdir dir="${dist.jsr166ejavadocs.dir}"/>  
   
     <javadoc destdir="${dist.jsr166ejavadocs.dir}"  
              packagenames="jsr166e.*"  
              link="${jdkapidocs.url}"  
              source="7"  
              sourcepath="${topsrc.dir}:${jdk7src.dir}"  
              executable="${javadoc7}"  
              additionalparam="-XDignore.symbol.file=true" />  
   
   </target>  
   
1051    <target name="jsr166edist-jar"    <target name="jsr166edist-jar"
1052            depends="jsr166eclean, jsr166ejar">            depends="jsr166eclean, jsr166ejar">
1053    

Legend:
Removed from v.1.107  
changed lines
  Added in v.1.116

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27