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.64 by tim, Wed Mar 24 20:32:33 2004 UTC vs.
Revision 1.86 by jsr166, Sat May 28 02:19:20 2011 UTC

# Line 21 | Line 21
21  
22  
23    <!-- Compilation options -->
24 <  <property name="build.sourcelevel"    value="1.5"/>
24 >  <property name="build.sourcelevel"    value="1.6"/>
25    <property name="build.debug"          value="true"/>
26    <property name="build.debuglevel"     value="source,lines,vars"/>
27    <property name="build.deprecation"    value="false"/>
28  
29    <!-- Build locations -->
30 <  <property name="build.dir"            location="build"/>
31 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
32 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
33 <  <property name="build.j1.dir"         location="${build.dir}/j1"/>
34 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
35 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
36 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
37 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
38 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
39 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
40 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
41 <  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
30 >  <property name="build.dir"                   location="build"/>
31 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
32 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
33 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
34 >  <property name="build.lib.dir"               location="${build.dir}/lib"/>
35 >  <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
36 >  <property name="build.reports.dir"           location="${build.dir}/reports"/>
37 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
38 >  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
39 >  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
40 >
41 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
42 >  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
43 >  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
44 >
45 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
46 >  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
47 >  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
48  
49    <!-- Source locations -->
50    <property name="src.dir"              location="${basedir}/src/main"/>
51    <property name="test.src.dir"         location="${basedir}/src/test"/>
52 <  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
52 >  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
53    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
54    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
49  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
50  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
55    <property name="lib.dir"              location="${basedir}/lib"/>
56    <property name="dist.dir"             location="${basedir}/dist"/>
57 <
57 >  <property name="topsrc.dir"           location="${basedir}/src"/>
58 >  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
59 >  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
60 >  <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
61 >  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
62    <!-- Distribution locations -->
63 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
63 >  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
64 >  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
65 >  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
66 >  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
67  
68    <!-- Jar locations -->
69    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
70 +  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
71 +  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
72 +  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
73    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
74 <  
74 >
75    <!-- Bootclasspath argument -->
76    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
77  
# Line 67 | Line 81
81      <pathelement location="${junit.jar}"/>
82    </path>
83  
84 <  <!-- Test classpath -->
85 <  <path id="j1.classpath">
86 <    <pathelement location="${build.j1.dir}"/>
73 <    <pathelement location="${junit.jar}"/>
84 >  <!-- ALoops classpath -->
85 >  <path id="loops.classpath">
86 >    <pathelement location="${build.loops.dir}"/>
87    </path>
88  
89  
90    <!-- Main targets -->
91  
92 +  <target name="dists"
93 +          depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
94 +          description="Builds all public jars and docs"/>
95  
96    <target name="compile"
97            depends="init, configure-compiler"
# Line 91 | Line 107
107             source="${build.sourcelevel}"
108               fork="true">
109  
110 +      <include name="**/*.java"/>
111 +      <compilerarg value="-XDignore.symbol.file=true"/>
112 +
113 + <!--
114 +      <exclude name="java/lang/**"/>
115        <compilerarg line="${build.args}"/>
116 +      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
117 + -->
118  
119      </javac>
120  
# Line 126 | Line 149
149      <mkdir dir="${build.javadocs.dir}"/>
150  
151      <javadoc destdir="${build.javadocs.dir}"
152 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
152 >                link="http://download.oracle.com/javase/6/docs/api/"
153              overview="${src.dir}/intro.html"
154 <              source="${build.sourcelevel}">
155 <
133 <      <tag name="revised" description="Last revised:"/>
134 <      <tag name="spec"    description="Specified by:"/>
154 >            sourcepath="${src.dir}:${jdksrc.dir}"
155 >    >
156  
157        <packageset dir="${src.dir}"/>
158  
# Line 141 | Line 162
162  
163  
164  
144  <target name="doccheck"
145          depends="filter-doccheck"
146          description="Reports on javadoc style errors">
147
148    <delete dir="${build.doccheck.dir}"/>
149    <mkdir dir="${build.doccheck.dir}"/>
150
151    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
152         docletpath="${lib.dir}/doccheck.jar"
153            destdir="${build.doccheck.dir}">
154      <packageset dir="${build.dc-filter.dir}"/>
155    </javadoc>
156
157    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
158
159  </target>
160
161
162
163  <target name="checkstyle"
164          depends="filter-src"
165          description="Reports on style errors in Java source (verbose, mostly chaff)">
166
167    <taskdef resource="checkstyletask.properties"
168            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
169
170    <mkdir dir="${build.checkstyle.dir}"/>
171    
172    <checkstyle config="etc/checkstyle/sun_checks.xml"
173       failOnViolation="false">
174      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
175      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
176    </checkstyle>
177    
178    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
179          out="${build.checkstyle.dir}/checkstyle-report.html"
180        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
181
182  </target>
183
184  
185
165    <target name="dist"
166            depends="init, dist-clean, dist-jar, dist-docs"
167            description="Puts all distributable products in single hierarchy"/>
168  
169  
191
170    <target name="release"
171            depends="dist"
172            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 235 | Line 213
213      <delete dir="${dist.javadocs.dir}"/>
214      <mkdir dir="${dist.javadocs.dir}"/>
215  
216 <    <javadoc destdir="${dist.javadocs.dir}"
217 <                link="http://java.sun.com/j2se/1.4.2/docs/api"
240 <            overview="${src.dir}/intro.html"
241 <              source="${build.sourcelevel}">
242 <
243 <      <packageset dir="${src.dir}"/>
216 >    <!-- the packagenames="none" hack below prevents scanning the -->
217 >    <!-- sourcepath for packages -->
218  
219 +    <javadoc destdir="${dist.javadocs.dir}"
220 +             packagenames="none"
221 +             link="http://download.oracle.com/javase/6/docs/api/"
222 +             overview="${src.dir}/intro.html"
223 +             sourcepath="${src.dir}:${jdksrc.dir}" >
224 +      <fileset dir="${src.dir}" defaultexcludes="yes">
225 +      <include name="**/*.java"/>
226 +      </fileset>
227      </javadoc>
228  
229    </target>
# Line 259 | Line 241
241      <echo>java.home is ${java.home}</echo>
242  
243    </target>
244 <  
245 <  
244 >
245 >
246    <target name="dist-jar"
247            depends="clean, jar">
248  
# Line 269 | Line 251
251    </target>
252  
253  
272  <target name="compile-ant-filter"
273          depends="init">
274
275    <mkdir dir="${build.ant.dir}"/>
276
277    <javac srcdir="${ant.src.dir}"
278          destdir="${build.ant.dir}"
279           source="1.4"
280    />
281
282  </target>
283
284
285  <target name="filter-src"
286          depends="compile-ant-filter">
287
288    <mkdir dir="${build.filter.src.dir}"/>
289
290    <copy todir="${build.filter.src.dir}">
291      <fileset dir="${src.dir}">
292        <include name="**/*.html"/>
293      </fileset>
294    </copy>
295
296    <copy todir="${build.filter.src.dir}">
297      <fileset dir="${src.dir}">
298        <exclude name="**/*.html"/>
299        <!-- Files excluded from dist-docs -->
300        <exclude name="java/util/Random.*"/>
301        <exclude name="sun/misc/Unsafe.*"/>
302      </fileset>
303      <!--
304      <filterchain>
305      -->
306
307        <!--
308         # This filter gets rid of angle-bracketed type parameters
309         # so that javadoc can run on the result. The following
310         # heuristic seems to work:
311         #
312         # For all lines not starting with space(s)-asterisk-space(s),
313         #   replace <something> with a space, where there may be more
314         #   than one right angle bracket at the end, and "something"
315         #   must not contain parens or pipes. (This may need some
316         #   tweaking.)
317         -->
318
319        <!--
320        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
321                      classpath="${build.ant.dir}">
322          <param name="notmatching" value="^\s+\*\s.*$"/>
323          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
324          <param name="replacement" value=" "/>
325        </filterreader>
326        -->
327
328      <!--
329      </filterchain>
330      -->
331    </copy>
332
333  </target>
334
335
336  <target name="filter-doccheck"
337          depends="filter-src">
338
339    <mkdir dir="${build.dc-filter.dir}"/>
340
341    <copy todir="${build.dc-filter.dir}">
342      <fileset dir="${build.filter.src.dir}">
343        <include name="**/*.html"/>
344      </fileset>
345    </copy>
346
347    <property name="generic.declarations"
348             value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
349    />
350
351    <copy todir="${build.dc-filter.dir}">
352      <fileset dir="${build.filter.src.dir}">
353        <exclude name="**/*.html"/>
354      </fileset>
355      <filterchain>
356        <!--
357         # These two filters try to make the source look like
358         # something that doccheck can process. The first removes
359         # -source 1.4 assertions and the second adds in a bunch
360         # of single letter public nested marker interfaces so that
361         # the generic type parameters are recognized.
362         -->
363
364        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
365                      classpath="${build.ant.dir}">
366          <param name="matching"    value="^\s*assert[\s ].*$"/>
367          <param name="pattern"     value="assert"/>
368          <param name="replacement" value="//assert"/>
369        </filterreader>
370
371        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
372                      classpath="${build.ant.dir}">
373          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
374          <param name="pattern"     value="$"/>
375          <param name="replacement" value=" ${generic.declarations}"/>
376        </filterreader>
377
378      </filterchain>
379    </copy>
380
381  </target>
382
383
254    <target name="compile-tests"
255            depends="jar">
256  
# Line 396 | Line 266
266  
267        <compilerarg value="${bootclasspath.args}"/>
268        <compilerarg line="${build.args}"/>
269 <      
269 >      <compilerarg value="-XDignore.symbol.file=true"/>
270 >
271        <classpath refid="test.classpath"/>
272  
273      </javac>
# Line 410 | Line 281
281               fork="true">
282  
283        <include name="jsr166/test/**"/>
284 <      
284 >
285        <compilerarg value="${bootclasspath.args}"/>
286        <compilerarg line="${build.args}"/>
287 <      
287 >      <compilerarg value="-XDignore.symbol.file=true"/>
288 >
289        <classpath refid="test.classpath"/>
290  
291      </javac>
# Line 429 | Line 301
301  
302        <compilerarg value="${bootclasspath.args}"/>
303        <compilerarg line="${build.args}"/>
304 <      
304 >      <compilerarg value="-XDignore.symbol.file=true"/>
305 >
306        <classpath refid="test.classpath"/>
307  
308      </javac>
# Line 456 | Line 329
329        <jvmarg value="${bootclasspath.args}"/>
330        <jvmarg value="-server"/>
331        <jvmarg value="-showversion"/>
332 <      
332 >
333        <classpath refid="test.classpath"/>
334  
335        <formatter type="xml"/>
# Line 466 | Line 339
339            <include name="**/${testcase}Test.java"/>
340          </fileset>
341        </batchtest>
342 <      
342 >
343        <batchtest todir="${build.reports.dir}" if="do.test.old">
344          <fileset dir="${test.src.dir}">
345            <include name="jsr166/test/**/${testcase}Test.java"/>
346          </fileset>
347        </batchtest>
348  
349 < <!--      
349 > <!--
350        <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
351          <fileset dir="${jtreg.src.dir}">
352            <include name="**/${testcase}Test.java"/>
# Line 501 | Line 374
374        <fileset dir="${build.reports.dir}">
375          <include name="TEST-*.xml"/>
376        </fileset>
377 <      <report styledir="${stylesheet.dir}"
505 <                format="${junit.report.format}"
506 <                 todir="${build.reports.dir}"
377 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
378        />
379      </junitreport>
380  
# Line 540 | Line 411
411      <available property="xalan.available"
412                 classname="org.apache.xalan.Version"/>
413  
414 <              
414 >
415      <!-- Ant 1.6beta and later don't need or want this check -->
416 <    <!--    
416 >    <!--
417      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
418            unless="junit.available"/>
419  
# Line 553 | Line 424
424    </target>
425  
426  
427 +  <!-- Various demos and test programs -->
428  
557  <!-- Anthill targets -->
558
559  <target name="anthill-build">
560  
561    <!-- Override this in user.properties -->
562    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
563    
564    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
565      <arg value="-Xmx256000000"/>
566      <!-- classpath of new JVM -->
567      <arg value="-classpath"/> <arg path="${java.class.path}"/>
568      <!-- location of Ant home directory -->
569      <arg value="-Dant.home=${ant.home}"/>
570      <!-- the Ant main class -->
571      <arg value="org.apache.tools.ant.Main"/>
572      <!-- The build file -->
573      <arg value="-buildfile"/>  <arg value="build.xml"/>
574      <!-- the target to build on the new Ant instance -->
575      <arg value="-DJAVA_HOME=${tiger.home}"/>
576      <arg value="do-anthill-build"/>
577    </exec>
578  </target>
579  
580  <target name="do-anthill-build"
581          depends="jar, test, docs, dist-docs"/>
582
583  <target name="anthill-publish">
584
585    <copy todir="${deployDir}/docs/private">
586      <fileset dir="${build.javadocs.dir}"/>
587    </copy>
588
589    <copy todir="${deployDir}/docs/public">
590      <fileset dir="${dist.javadocs.dir}"/>
591    </copy>
592
593    <copy tofile="${deployDir}/index.html"
594          file="${basedir}/etc/anthill-index.html"/>
595
596    <copy todir="${deployDir}/notes">
597      <fileset dir="${basedir}/etc/notes"/>
598    </copy>
429  
430 <  </target>
430 >  <target name="loops" depends="init, configure-compiler"
431 >          description="Benchmark from Doug Lea's AQS paper">
432  
433 +    <mkdir dir="${build.loops.dir}"/>
434  
435 <  <!-- Standalone sample program -->
436 <  
605 <  <target name="sample" depends="">
606 <  
607 <    <mkdir dir="${build.testcases.dir}"/>
608 <    
609 <    <javac srcdir="${test.src.dir}"
610 <          destdir="${build.testcases.dir}"
435 >    <javac srcdir="${loops.src.dir}"
436 >          destdir="${build.loops.dir}"
437              debug="${build.debug}"
438         debuglevel="${build.debuglevel}"
439        deprecation="${build.deprecation}"
440             source="${build.sourcelevel}"
441               fork="true">
442 <      
617 <      <!--
618 <      <compilerarg value="${bootclasspath.args}"/>
442 >
443        <compilerarg line="${build.args}"/>
444 <      
445 <      <classpath refid="test.classpath"/>
446 <      -->
623 <      
624 <      <include name="jsr166/test/Sample.java"/>
625 <      
444 >      <classpath refid="loops.classpath"/>
445 >      <compilerarg value="-XDignore.symbol.file=true"/>
446 >
447      </javac>
448 <    
449 <    <copy todir="${build.testcases.dir}">
450 <      <fileset dir="${test.src.dir}">
630 <        <include name="**/*.properties"/>
631 <      </fileset>
632 <    </copy>
633 <  
634 <            
635 <    <java classname="jsr166.test.Sample" fork="true">
636 <      <jvmarg value="${bootclasspath.args}"/>
637 <      <!-- <jvmarg value="-server"/> -->
638 <      <!-- <jvmarg value="-ea"/> -->
639 <      <classpath refid="test.classpath"/>
640 <      <!-- <arg value="1000"/> -->
448 >
449 >    <java classname="ALoops" fork="true">
450 >      <classpath refid="loops.classpath"/>
451      </java>
452 +
453    </target>
454  
455  
456 <  <!-- BoF demos -->
457 <  
458 <  <target name="j1" depends="jar">
459 <  
460 <    <mkdir dir="${build.j1.dir}"/>
461 <    
462 <    <javac srcdir="${j1.src.dir}"
463 <          destdir="${build.j1.dir}"
456 >  <!-- jsr166x -->
457 >
458 >
459 >  <target name="jsr166xcompile"
460 >          depends="init, configure-compiler"
461 >          description="Compiles jsr166x sources">
462 >
463 >    <mkdir dir="${build.jsr166x.dir}"/>
464 >
465 >    <javac srcdir="${jsr166xsrc.dir}"
466 >          destdir="${build.jsr166x.dir}"
467              debug="${build.debug}"
468         debuglevel="${build.debuglevel}"
469        deprecation="${build.deprecation}"
470             source="${build.sourcelevel}"
471               fork="true">
472 <            
473 <      <compilerarg value="${bootclasspath.args}"/>
472 >
473 >      <include name="**/*.java"/>
474        <compilerarg line="${build.args}"/>
475 <      
476 <      <classpath refid="j1.classpath"/>
663 <      
475 >      <compilerarg value="-XDignore.symbol.file=true"/>
476 >
477      </javac>
665    
666 <!--
667    <java classname="MainClass" fork="true">
668      <jvmarg value="${bootclasspath.args}"/>
669      <classpath refid="j1.classpath"/>
670    </java>
671 -->
478  
479 <    <junit printsummary="true"
674 <             showoutput="true"
675 <          errorProperty="junit.failed"
676 <        failureProperty="junit.failed"
677 <                    dir="${build.j1.dir}"
678 <                   fork="true">
479 >  </target>
480  
680      <jvmarg value="${bootclasspath.args}"/>
681      <jvmarg value="-server"/>
682      
683      <classpath refid="j1.classpath"/>
481  
685      <formatter type="xml"/>
482  
483 <      <batchtest todir="${build.j1.dir}">
484 <        <fileset dir="${j1.src.dir}">
485 <          <include name="**/*Test.java"/>
690 <        </fileset>
691 <      </batchtest>
483 >  <target name="jsr166xjar"
484 >          depends="jsr166xcompile"
485 >          description="Builds library jar from compiled sources">
486  
487 <    </junit>
487 >    <mkdir dir="${build.jsr166xlib.dir}"/>
488  
489 <    <!-- Sets junit.report.format to frames if redirection is present,
490 <         otherwise sets it to noframes. -->
491 <    <available property="junit.report.format"
698 <                  value="frames"
699 <              classname="org.apache.xalan.lib.Redirect"
700 <    />
701 <    <property name="junit.report.format" value="noframes"/>
489 >    <jar destfile="${jsr166xproduct.jar}">
490 >      <fileset dir="${build.jsr166x.dir}"/>
491 >    </jar>
492  
493 <    <junitreport todir="${build.j1.dir}">
704 <      <fileset dir="${build.j1.dir}">
705 <        <include name="TEST-*.xml"/>
706 <      </fileset>
707 <      <report styledir="${stylesheet.dir}"
708 <                format="${junit.report.format}"
709 <                 todir="${build.j1.dir}"
710 <      />
711 <    </junitreport>
493 >  </target>
494  
495 <    <fail message="Test Cases Failed" if="junit.failed"/>
495 >
496 >
497 >  <target name="jsr166xdocs"
498 >          description="Builds javadocs with custom tags to build folder">
499 >
500 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
501 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
502 >
503 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
504 >             packagenames="jsr166x"
505 >             link="http://download.oracle.com/javase/6/docs/api/"
506 >             source="${build.sourcelevel}"
507 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
508  
509    </target>
510  
511 <  
512 <  
513 <  <!-- C++ and JNI definitions and demos -->
514 <  
515 <  <target name="configure-cpp">
516 <
517 <    <!-- Define tasks and types -->
518 <    
519 <    <path id="cpptasks.path">
520 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
521 <    </path>
522 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
523 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
730 <    
731 <    <!-- Set platform property for JNI includes -->
732 <    
733 <    <condition property="platform" value="linux">
734 <      <os name="Linux"/>
735 <    </condition>
736 <    <condition property="platform" value="win32">
737 <      <os family="windows"/>
738 <    </condition>
739 <    <condition property="platform" value="solaris">
740 <      <os name="SunOS"/>
741 <    </condition>
742 <    
511 >
512 >  <target name="jsr166xdist"
513 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
514 >          description="Puts all distributable products in single hierarchy"/>
515 >
516 >
517 >
518 >  <target name="jsr166xclean"
519 >          description="Removes all build products">
520 >
521 >    <delete dir="${build.jsr166x.dir}"/>
522 >    <delete dir="${build.jsr166xlib.dir}"/>
523 >
524    </target>
525 <  
526 <  
527 <  <target name="cppdemo" depends="configure-cpp">
528 <  
529 <    <mkdir dir="${build.dir}"/>
530 <    
531 <    <cc multithreaded="true"
532 <                 name="g++"
533 <               objdir="${build.dir}"
534 <              outfile="${build.dir}/CppDemo">
535 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
536 <      <libset libs="stdc++"/>
537 <    </cc>
538 <    
539 <    <exec executable="${build.dir}/CppDemo">
540 <      <arg line="count in word frequency of word in command line count"/>
541 <    </exec>
542 <    
543 <  </target>
544 <  
545 <  
546 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
547 <  
548 <    <mkdir dir="${build.testcases.dir}"/>
549 <    
550 <    <javac srcdir="${test.src.dir}"
551 <          destdir="${build.testcases.dir}"
525 >
526 >
527 >
528 >  <target name="jsr166xdist-clean"
529 >          description="Removes all build and distribution products">
530 >
531 >  </target>
532 >
533 >
534 >
535 >  <target name="jsr166xdist-docs"
536 >          description="Builds javadocs without custom tags to dist folder">
537 >
538 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
539 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
540 >
541 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
542 >             packagenames="jsr166x"
543 >             link="http://download.oracle.com/javase/6/docs/api/"
544 >             source="${build.sourcelevel}"
545 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
546 >
547 >  </target>
548 >
549 >  <target name="jsr166xdist-jar"
550 >          depends="jsr166xclean, jsr166xjar">
551 >
552 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
553 >
554 >  </target>
555 >
556 >  <!-- jsr166y -->
557 >
558 >
559 >  <target name="jsr166ycompile"
560 >          depends="init, configure-compiler"
561 >          description="Compiles jsr166y sources">
562 >
563 >    <mkdir dir="${build.jsr166y.dir}"/>
564 >
565 >    <javac srcdir="${jsr166ysrc.dir}"
566 >          destdir="${build.jsr166y.dir}"
567              debug="${build.debug}"
568         debuglevel="${build.debuglevel}"
569        deprecation="${build.deprecation}"
570             source="${build.sourcelevel}"
571               fork="true">
572 <      <compilerarg value="${bootclasspath.args}"/>
572 >
573 >      <include name="**/*.java"/>
574        <compilerarg line="${build.args}"/>
575 <      <classpath refid="test.classpath"/>
576 <      <include name="JniDemo.java"/>
575 >      <compilerarg value="-XDignore.symbol.file=true"/>
576 >      <compilerarg value="${bootclasspath.args}"/>
577 >
578 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
579 >
580      </javac>
581 <    
582 <    <javah destdir="${build.testcases.dir}"
583 <      classpathref="test.classpath">
584 <      <class name="JniDemo"/>
585 <    </javah>
586 <    
587 <    <cc multithreaded="true"
588 <                 name="g++"
589 <               objdir="${build.dir}"
590 <              outfile="${build.dir}/JniDemo"
591 <              outtype="shared">
592 <              
593 <      <compiler>
594 <        <defineset>
595 <          <define name="__int64" value="long long"/>
596 <        </defineset>
597 <        <includepath location="${java.home}/../include"/>
598 <        <includepath location="${java.home}/../include/${platform}"/>
599 <        <compilerarg value="-mno-cygwin"/>
600 <      </compiler>
601 <      
602 <      <linker>
603 <        <linkerarg value="--add-stdcall-alias"/>
604 <      </linker>
605 <      
606 <      <includepath location="${build.testcases.dir}"/>
607 <      
608 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
609 <      
610 <      <libset libs="stdc++"/>
611 <      
612 <    </cc>
613 <    
614 <    <!-- Necessary if windows, harmless if not -->
615 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
616 <    
617 <    <java classname="JniDemo" fork="true">
618 <      <!-- Watch out: path separator hardwired to semicolon here! -->
619 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
620 <      <classpath refid="test.classpath"/>
621 <      <arg line="count in word frequency of word in command line count"/>
622 <    </java>
623 <    
581 >
582 >  </target>
583 >
584 >
585 >
586 >  <target name="jsr166yjar"
587 >          depends="jsr166ycompile"
588 >          description="Builds library jar from compiled sources">
589 >
590 >    <mkdir dir="${build.jsr166ylib.dir}"/>
591 >
592 >    <jar destfile="${jsr166yproduct.jar}" index="true">
593 >      <fileset dir="${build.jsr166y.dir}"/>
594 >    </jar>
595 >
596 >  </target>
597 >
598 >
599 >
600 >  <target name="jsr166ydocs"
601 >          description="Builds javadocs with custom tags to build folder">
602 >
603 >    <delete dir="${build.jsr166yjavadocs.dir}"/>
604 >    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
605 >
606 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
607 >             packagenames="jsr166y"
608 >             link="http://download.oracle.com/javase/6/docs/api/"
609 >             source="${build.sourcelevel}"
610 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
611 >
612 >  </target>
613 >
614 >
615 >  <target name="jsr166ydist"
616 >          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
617 >          description="Puts all distributable products in single hierarchy"/>
618 >
619 >
620 >
621 >  <target name="jsr166yclean"
622 >          description="Removes all build products">
623 >
624 >    <delete dir="${build.jsr166y.dir}"/>
625 >    <delete dir="${build.jsr166ylib.dir}"/>
626 >
627 >  </target>
628 >
629 >
630 >
631 >  <target name="jsr166ydist-clean"
632 >          description="Removes all build and distribution products">
633 >
634    </target>
635  
636 +  <target name="jsr166ydist-docs"
637 +          description="Builds javadocs without custom tags to dist folder">
638 +
639 +    <delete dir="${dist.jsr166yjavadocs.dir}"/>
640 +    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
641  
642 +    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
643 +             packagenames="jsr166y"
644 +             link="http://download.oracle.com/javase/6/docs/api/"
645 +             source="${build.sourcelevel}"
646 +             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
647  
648 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
648 >  </target>
649  
650 +  <target name="jsr166ydist-jar"
651 +          depends="jsr166yclean, jsr166yjar">
652  
653 +    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
654  
832  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
833  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
834  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
835  <property name="pretiger.sourcelevel" value="1.4"/>
836  
837  <target name="defang"
838       depends="init"
839   description="Generates pre-Tiger compatible source">
840  
841    <delete dir="${pretiger.src.dir}"/>
842    <mkdir dir="${pretiger.src.dir}"/>
843  
844    <exec executable="perl">
845      <arg file="etc/defang.pl"/>
846      <!-- <arg value="-v"/> -->
847      <arg value="-s"/> <arg file="${src.dir}"/>
848      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
849    </exec>
850    
655    </target>
656  
657 <  <target name="compile-pretiger"
854 <          depends="init, configure-compiler, defang"
855 <          description="Compiles pre-Tiger sources to build folder">
657 >  <!-- extra166y -->
658  
857    <mkdir dir="${build.pretiger.dir}"/>
659  
660 <    <javac srcdir="${pretiger.src.dir}"
661 <          destdir="${build.pretiger.dir}"
660 >  <target name="extra166ycompile"
661 >          depends="init, configure-compiler, jsr166ycompile"
662 >          description="Compiles extra166y sources">
663 >
664 >    <mkdir dir="${build.extra166y.dir}"/>
665 >
666 >    <javac srcdir="${extra166ysrc.dir}"
667 >          destdir="${build.extra166y.dir}"
668              debug="${build.debug}"
669 +            classpath="${jsr166yproduct.jar}"
670         debuglevel="${build.debuglevel}"
671        deprecation="${build.deprecation}"
672 <           source="${pretiger.sourcelevel}"
672 >           source="${build.sourcelevel}"
673               fork="true">
674  
675 +      <include name="**/*.java"/>
676        <compilerarg line="${build.args}"/>
677 <      <exclude name="**/Thread.java"/>
677 >      <compilerarg value="-XDignore.symbol.file=true"/>
678 >      <compilerarg value="${bootclasspath.args}"/>
679 >
680 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
681  
682      </javac>
683  
684    </target>
873  
874  <target name="pretiger" depends="compile-pretiger">
685  
686 <    <mkdir dir="${build.lib.dir}"/>
687 <    
688 <    <jar destfile="${pretiger.jar}">
689 <      <fileset dir="${build.pretiger.dir}">
690 <      </fileset>
686 >
687 >
688 >  <target name="extra166yjar"
689 >          depends="extra166ycompile"
690 >          description="Builds library jar from compiled sources">
691 >
692 >    <mkdir dir="${build.extra166ylib.dir}"/>
693 >
694 >    <jar destfile="${extra166yproduct.jar}" index="true">
695 >      <fileset dir="${build.extra166y.dir}"/>
696      </jar>
697 <    
697 >
698 >  </target>
699 >
700 >
701 >
702 >  <target name="extra166ydocs"
703 >          description="Builds javadocs with custom tags to build folder">
704 >
705 >    <delete dir="${build.extra166yjavadocs.dir}"/>
706 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
707 >
708 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
709 >             packagenames="extra166y"
710 >             link="http://download.oracle.com/javase/6/docs/api/"
711 >             source="${build.sourcelevel}"
712 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
713 >
714 >  </target>
715 >
716 >
717 >  <target name="extra166ydist"
718 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
719 >          description="Puts all distributable products in single hierarchy"/>
720 >
721 >
722 >
723 >  <target name="extra166yclean"
724 >          description="Removes all build products">
725 >
726 >    <delete dir="${build.extra166y.dir}"/>
727 >    <delete dir="${build.extra166ylib.dir}"/>
728 >
729 >  </target>
730 >
731 >
732 >
733 >  <target name="extra166ydist-clean"
734 >          description="Removes all build and distribution products">
735 >
736 >  </target>
737 >
738 >  <target name="extra166ydist-docs"
739 >          description="Builds javadocs without custom tags to dist folder">
740 >
741 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
742 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
743 >
744 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
745 >             packagenames="extra166y"
746 >             link="http://download.oracle.com/javase/6/docs/api/"
747 >             source="${build.sourcelevel}"
748 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
749 >
750 >  </target>
751 >
752 >  <target name="extra166ydist-jar"
753 >          depends="extra166yclean, extra166yjar">
754 >
755 >    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
756 >
757    </target>
758  
759   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines