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.88 by jsr166, Sun May 29 16:00: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 125 | Line 148
148      <delete dir="${build.javadocs.dir}"/>
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"
130 <            overview="${src.dir}/intro.html"
131 <              source="${build.sourcelevel}">
132 <
133 <      <tag name="revised" description="Last revised:"/>
134 <      <tag name="spec"    description="Specified by:"/>
135 <
136 <      <packageset dir="${src.dir}"/>
137 <
138 <    </javadoc>
139 <
140 <  </target>
141 <
142 <
151 >    <!-- the packagenames="none" hack below prevents scanning the -->
152 >    <!-- sourcepath for packages -->
153  
154 <  <target name="doccheck"
155 <          depends="filter-doccheck"
156 <          description="Reports on javadoc style errors">
157 <
158 <    <delete dir="${build.doccheck.dir}"/>
159 <    <mkdir dir="${build.doccheck.dir}"/>
160 <
161 <    <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}"/>
154 >    <javadoc destdir="${build.javadocs.dir}"
155 >             packagenames="none"
156 >             link="http://download.oracle.com/javase/7/docs/api/"
157 >             overview="${src.dir}/intro.html"
158 >             sourcepath="${src.dir}:${jdksrc.dir}" >
159 >      <fileset dir="${src.dir}" defaultexcludes="yes">
160 >      <include name="**/*.java"/>
161 >      </fileset>
162      </javadoc>
163  
157    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
158
164    </target>
165  
166  
167  
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
168    <target name="dist"
169            depends="init, dist-clean, dist-jar, dist-docs"
170            description="Puts all distributable products in single hierarchy"/>
171  
172  
191
173    <target name="release"
174            depends="dist"
175            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 235 | Line 216
216      <delete dir="${dist.javadocs.dir}"/>
217      <mkdir dir="${dist.javadocs.dir}"/>
218  
219 <    <javadoc destdir="${dist.javadocs.dir}"
220 <                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}"/>
219 >    <!-- the packagenames="none" hack below prevents scanning the -->
220 >    <!-- sourcepath for packages -->
221  
222 +    <javadoc destdir="${dist.javadocs.dir}"
223 +             packagenames="none"
224 +             link="http://download.oracle.com/javase/7/docs/api/"
225 +             overview="${src.dir}/intro.html"
226 +             sourcepath="${src.dir}:${jdksrc.dir}" >
227 +      <fileset dir="${src.dir}" defaultexcludes="yes">
228 +      <include name="**/*.java"/>
229 +      </fileset>
230      </javadoc>
231  
232    </target>
# Line 259 | Line 244
244      <echo>java.home is ${java.home}</echo>
245  
246    </target>
247 <  
248 <  
247 >
248 >
249    <target name="dist-jar"
250            depends="clean, jar">
251  
# Line 269 | Line 254
254    </target>
255  
256  
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
257    <target name="compile-tests"
258            depends="jar">
259  
# Line 396 | Line 269
269  
270        <compilerarg value="${bootclasspath.args}"/>
271        <compilerarg line="${build.args}"/>
272 <      
272 >      <compilerarg value="-XDignore.symbol.file=true"/>
273 >
274        <classpath refid="test.classpath"/>
275  
276      </javac>
# Line 410 | Line 284
284               fork="true">
285  
286        <include name="jsr166/test/**"/>
287 <      
287 >
288        <compilerarg value="${bootclasspath.args}"/>
289        <compilerarg line="${build.args}"/>
290 <      
290 >      <compilerarg value="-XDignore.symbol.file=true"/>
291 >
292        <classpath refid="test.classpath"/>
293  
294      </javac>
# Line 429 | Line 304
304  
305        <compilerarg value="${bootclasspath.args}"/>
306        <compilerarg line="${build.args}"/>
307 <      
307 >      <compilerarg value="-XDignore.symbol.file=true"/>
308 >
309        <classpath refid="test.classpath"/>
310  
311      </javac>
# Line 456 | Line 332
332        <jvmarg value="${bootclasspath.args}"/>
333        <jvmarg value="-server"/>
334        <jvmarg value="-showversion"/>
335 <      
335 >
336        <classpath refid="test.classpath"/>
337  
338        <formatter type="xml"/>
# Line 466 | Line 342
342            <include name="**/${testcase}Test.java"/>
343          </fileset>
344        </batchtest>
345 <      
345 >
346        <batchtest todir="${build.reports.dir}" if="do.test.old">
347          <fileset dir="${test.src.dir}">
348            <include name="jsr166/test/**/${testcase}Test.java"/>
349          </fileset>
350        </batchtest>
351  
352 < <!--      
352 > <!--
353        <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
354          <fileset dir="${jtreg.src.dir}">
355            <include name="**/${testcase}Test.java"/>
# Line 501 | Line 377
377        <fileset dir="${build.reports.dir}">
378          <include name="TEST-*.xml"/>
379        </fileset>
380 <      <report styledir="${stylesheet.dir}"
505 <                format="${junit.report.format}"
506 <                 todir="${build.reports.dir}"
380 >      <report format="${junit.report.format}" todir="${build.reports.dir}"
381        />
382      </junitreport>
383  
# Line 540 | Line 414
414      <available property="xalan.available"
415                 classname="org.apache.xalan.Version"/>
416  
417 <              
417 >
418      <!-- Ant 1.6beta and later don't need or want this check -->
419 <    <!--    
419 >    <!--
420      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
421            unless="junit.available"/>
422  
# Line 553 | Line 427
427    </target>
428  
429  
430 +  <!-- Various demos and test programs -->
431  
557  <!-- Anthill targets -->
432  
433 <  <target name="anthill-build">
434 <  
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>
599 <
600 <  </target>
433 >  <target name="loops" depends="init, configure-compiler"
434 >          description="Benchmark from Doug Lea's AQS paper">
435  
436 +    <mkdir dir="${build.loops.dir}"/>
437  
438 <  <!-- Standalone sample program -->
439 <  
605 <  <target name="sample" depends="">
606 <  
607 <    <mkdir dir="${build.testcases.dir}"/>
608 <    
609 <    <javac srcdir="${test.src.dir}"
610 <          destdir="${build.testcases.dir}"
438 >    <javac srcdir="${loops.src.dir}"
439 >          destdir="${build.loops.dir}"
440              debug="${build.debug}"
441         debuglevel="${build.debuglevel}"
442        deprecation="${build.deprecation}"
443             source="${build.sourcelevel}"
444               fork="true">
445 <      
617 <      <!--
618 <      <compilerarg value="${bootclasspath.args}"/>
445 >
446        <compilerarg line="${build.args}"/>
447 <      
448 <      <classpath refid="test.classpath"/>
449 <      -->
623 <      
624 <      <include name="jsr166/test/Sample.java"/>
625 <      
447 >      <classpath refid="loops.classpath"/>
448 >      <compilerarg value="-XDignore.symbol.file=true"/>
449 >
450      </javac>
451 <    
452 <    <copy todir="${build.testcases.dir}">
453 <      <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"/> -->
451 >
452 >    <java classname="ALoops" fork="true">
453 >      <classpath refid="loops.classpath"/>
454      </java>
455 +
456    </target>
457  
458  
459 <  <!-- BoF demos -->
460 <  
461 <  <target name="j1" depends="jar">
462 <  
463 <    <mkdir dir="${build.j1.dir}"/>
464 <    
465 <    <javac srcdir="${j1.src.dir}"
466 <          destdir="${build.j1.dir}"
459 >  <!-- jsr166x -->
460 >
461 >
462 >  <target name="jsr166xcompile"
463 >          depends="init, configure-compiler"
464 >          description="Compiles jsr166x sources">
465 >
466 >    <mkdir dir="${build.jsr166x.dir}"/>
467 >
468 >    <javac srcdir="${jsr166xsrc.dir}"
469 >          destdir="${build.jsr166x.dir}"
470              debug="${build.debug}"
471         debuglevel="${build.debuglevel}"
472        deprecation="${build.deprecation}"
473             source="${build.sourcelevel}"
474               fork="true">
475 <            
476 <      <compilerarg value="${bootclasspath.args}"/>
475 >
476 >      <include name="**/*.java"/>
477        <compilerarg line="${build.args}"/>
478 <      
479 <      <classpath refid="j1.classpath"/>
663 <      
478 >      <compilerarg value="-XDignore.symbol.file=true"/>
479 >
480      </javac>
665    
666 <!--
667    <java classname="MainClass" fork="true">
668      <jvmarg value="${bootclasspath.args}"/>
669      <classpath refid="j1.classpath"/>
670    </java>
671 -->
481  
482 <    <junit printsummary="true"
674 <             showoutput="true"
675 <          errorProperty="junit.failed"
676 <        failureProperty="junit.failed"
677 <                    dir="${build.j1.dir}"
678 <                   fork="true">
482 >  </target>
483  
680      <jvmarg value="${bootclasspath.args}"/>
681      <jvmarg value="-server"/>
682      
683      <classpath refid="j1.classpath"/>
484  
685      <formatter type="xml"/>
485  
486 <      <batchtest todir="${build.j1.dir}">
487 <        <fileset dir="${j1.src.dir}">
488 <          <include name="**/*Test.java"/>
690 <        </fileset>
691 <      </batchtest>
486 >  <target name="jsr166xjar"
487 >          depends="jsr166xcompile"
488 >          description="Builds library jar from compiled sources">
489  
490 <    </junit>
490 >    <mkdir dir="${build.jsr166xlib.dir}"/>
491  
492 <    <!-- Sets junit.report.format to frames if redirection is present,
493 <         otherwise sets it to noframes. -->
494 <    <available property="junit.report.format"
495 <                  value="frames"
496 <              classname="org.apache.xalan.lib.Redirect"
700 <    />
701 <    <property name="junit.report.format" value="noframes"/>
492 >    <jar destfile="${jsr166xproduct.jar}">
493 >      <fileset dir="${build.jsr166x.dir}"/>
494 >    </jar>
495 >
496 >  </target>
497  
703    <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>
498  
499 <    <fail message="Test Cases Failed" if="junit.failed"/>
499 >
500 >  <target name="jsr166xdocs"
501 >          description="Builds javadocs with custom tags to build folder">
502 >
503 >    <delete dir="${build.jsr166xjavadocs.dir}"/>
504 >    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
505 >
506 >    <javadoc destdir="${build.jsr166xjavadocs.dir}"
507 >             packagenames="jsr166x"
508 >             link="http://download.oracle.com/javase/7/docs/api/"
509 >             source="${build.sourcelevel}"
510 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
511  
512    </target>
513  
514 <  
515 <  
516 <  <!-- C++ and JNI definitions and demos -->
517 <  
518 <  <target name="configure-cpp">
519 <
520 <    <!-- Define tasks and types -->
521 <    
522 <    <path id="cpptasks.path">
523 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
524 <    </path>
525 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
526 <    <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 <    
514 >
515 >  <target name="jsr166xdist"
516 >          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
517 >          description="Puts all distributable products in single hierarchy"/>
518 >
519 >
520 >
521 >  <target name="jsr166xclean"
522 >          description="Removes all build products">
523 >
524 >    <delete dir="${build.jsr166x.dir}"/>
525 >    <delete dir="${build.jsr166xlib.dir}"/>
526 >
527    </target>
528 <  
529 <  
530 <  <target name="cppdemo" depends="configure-cpp">
531 <  
532 <    <mkdir dir="${build.dir}"/>
533 <    
534 <    <cc multithreaded="true"
535 <                 name="g++"
536 <               objdir="${build.dir}"
537 <              outfile="${build.dir}/CppDemo">
538 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
539 <      <libset libs="stdc++"/>
540 <    </cc>
541 <    
542 <    <exec executable="${build.dir}/CppDemo">
543 <      <arg line="count in word frequency of word in command line count"/>
544 <    </exec>
545 <    
546 <  </target>
547 <  
548 <  
549 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
550 <  
551 <    <mkdir dir="${build.testcases.dir}"/>
552 <    
553 <    <javac srcdir="${test.src.dir}"
554 <          destdir="${build.testcases.dir}"
528 >
529 >
530 >
531 >  <target name="jsr166xdist-clean"
532 >          description="Removes all build and distribution products">
533 >
534 >  </target>
535 >
536 >
537 >
538 >  <target name="jsr166xdist-docs"
539 >          description="Builds javadocs without custom tags to dist folder">
540 >
541 >    <delete dir="${dist.jsr166xjavadocs.dir}"/>
542 >    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
543 >
544 >    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
545 >             packagenames="jsr166x"
546 >             link="http://download.oracle.com/javase/7/docs/api/"
547 >             source="${build.sourcelevel}"
548 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
549 >
550 >  </target>
551 >
552 >  <target name="jsr166xdist-jar"
553 >          depends="jsr166xclean, jsr166xjar">
554 >
555 >    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
556 >
557 >  </target>
558 >
559 >  <!-- jsr166y -->
560 >
561 >
562 >  <target name="jsr166ycompile"
563 >          depends="init, configure-compiler"
564 >          description="Compiles jsr166y sources">
565 >
566 >    <mkdir dir="${build.jsr166y.dir}"/>
567 >
568 >    <javac srcdir="${jsr166ysrc.dir}"
569 >          destdir="${build.jsr166y.dir}"
570              debug="${build.debug}"
571         debuglevel="${build.debuglevel}"
572        deprecation="${build.deprecation}"
573             source="${build.sourcelevel}"
574               fork="true">
575 <      <compilerarg value="${bootclasspath.args}"/>
575 >
576 >      <include name="**/*.java"/>
577        <compilerarg line="${build.args}"/>
578 <      <classpath refid="test.classpath"/>
579 <      <include name="JniDemo.java"/>
578 >      <compilerarg value="-XDignore.symbol.file=true"/>
579 >      <compilerarg value="${bootclasspath.args}"/>
580 >
581 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
582 >
583      </javac>
584 <    
585 <    <javah destdir="${build.testcases.dir}"
586 <      classpathref="test.classpath">
587 <      <class name="JniDemo"/>
588 <    </javah>
589 <    
590 <    <cc multithreaded="true"
591 <                 name="g++"
592 <               objdir="${build.dir}"
593 <              outfile="${build.dir}/JniDemo"
594 <              outtype="shared">
595 <              
596 <      <compiler>
597 <        <defineset>
598 <          <define name="__int64" value="long long"/>
599 <        </defineset>
600 <        <includepath location="${java.home}/../include"/>
601 <        <includepath location="${java.home}/../include/${platform}"/>
602 <        <compilerarg value="-mno-cygwin"/>
603 <      </compiler>
604 <      
605 <      <linker>
606 <        <linkerarg value="--add-stdcall-alias"/>
607 <      </linker>
608 <      
609 <      <includepath location="${build.testcases.dir}"/>
610 <      
611 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
612 <      
613 <      <libset libs="stdc++"/>
614 <      
812 <    </cc>
813 <    
814 <    <!-- Necessary if windows, harmless if not -->
815 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
816 <    
817 <    <java classname="JniDemo" fork="true">
818 <      <!-- Watch out: path separator hardwired to semicolon here! -->
819 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
820 <      <classpath refid="test.classpath"/>
821 <      <arg line="count in word frequency of word in command line count"/>
822 <    </java>
823 <    
584 >
585 >  </target>
586 >
587 >
588 >
589 >  <target name="jsr166yjar"
590 >          depends="jsr166ycompile"
591 >          description="Builds library jar from compiled sources">
592 >
593 >    <mkdir dir="${build.jsr166ylib.dir}"/>
594 >
595 >    <jar destfile="${jsr166yproduct.jar}" index="true">
596 >      <fileset dir="${build.jsr166y.dir}"/>
597 >    </jar>
598 >
599 >  </target>
600 >
601 >
602 >
603 >  <target name="jsr166ydocs"
604 >          description="Builds javadocs with custom tags to build folder">
605 >
606 >    <delete dir="${build.jsr166yjavadocs.dir}"/>
607 >    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
608 >
609 >    <javadoc destdir="${build.jsr166yjavadocs.dir}"
610 >             packagenames="jsr166y"
611 >             link="http://download.oracle.com/javase/7/docs/api/"
612 >             source="${build.sourcelevel}"
613 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
614 >
615    </target>
616  
617  
618 +  <target name="jsr166ydist"
619 +          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
620 +          description="Puts all distributable products in single hierarchy"/>
621 +
622  
828  <!-- Backward compatibility, work in progress (some files not checked in) -->
623  
624 +  <target name="jsr166yclean"
625 +          description="Removes all build products">
626  
627 +    <delete dir="${build.jsr166y.dir}"/>
628 +    <delete dir="${build.jsr166ylib.dir}"/>
629  
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    
630    </target>
631  
853  <target name="compile-pretiger"
854          depends="init, configure-compiler, defang"
855          description="Compiles pre-Tiger sources to build folder">
632  
857    <mkdir dir="${build.pretiger.dir}"/>
633  
634 <    <javac srcdir="${pretiger.src.dir}"
635 <          destdir="${build.pretiger.dir}"
634 >  <target name="jsr166ydist-clean"
635 >          description="Removes all build and distribution products">
636 >
637 >  </target>
638 >
639 >  <target name="jsr166ydist-docs"
640 >          description="Builds javadocs without custom tags to dist folder">
641 >
642 >    <delete dir="${dist.jsr166yjavadocs.dir}"/>
643 >    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
644 >
645 >    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
646 >             packagenames="jsr166y"
647 >             link="http://download.oracle.com/javase/7/docs/api/"
648 >             source="${build.sourcelevel}"
649 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
650 >
651 >  </target>
652 >
653 >  <target name="jsr166ydist-jar"
654 >          depends="jsr166yclean, jsr166yjar">
655 >
656 >    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
657 >
658 >  </target>
659 >
660 >  <!-- extra166y -->
661 >
662 >
663 >  <target name="extra166ycompile"
664 >          depends="init, configure-compiler, jsr166ycompile"
665 >          description="Compiles extra166y sources">
666 >
667 >    <mkdir dir="${build.extra166y.dir}"/>
668 >
669 >    <javac srcdir="${extra166ysrc.dir}"
670 >          destdir="${build.extra166y.dir}"
671              debug="${build.debug}"
672 +            classpath="${jsr166yproduct.jar}"
673         debuglevel="${build.debuglevel}"
674        deprecation="${build.deprecation}"
675 <           source="${pretiger.sourcelevel}"
675 >           source="${build.sourcelevel}"
676               fork="true">
677  
678 +      <include name="**/*.java"/>
679        <compilerarg line="${build.args}"/>
680 <      <exclude name="**/Thread.java"/>
680 >      <compilerarg value="-XDignore.symbol.file=true"/>
681 >      <compilerarg value="${bootclasspath.args}"/>
682 >
683 > <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
684  
685      </javac>
686  
687    </target>
873  
874  <target name="pretiger" depends="compile-pretiger">
688  
689 <    <mkdir dir="${build.lib.dir}"/>
690 <    
691 <    <jar destfile="${pretiger.jar}">
692 <      <fileset dir="${build.pretiger.dir}">
693 <      </fileset>
689 >
690 >
691 >  <target name="extra166yjar"
692 >          depends="extra166ycompile"
693 >          description="Builds library jar from compiled sources">
694 >
695 >    <mkdir dir="${build.extra166ylib.dir}"/>
696 >
697 >    <jar destfile="${extra166yproduct.jar}" index="true">
698 >      <fileset dir="${build.extra166y.dir}"/>
699      </jar>
700 <    
700 >
701 >  </target>
702 >
703 >
704 >
705 >  <target name="extra166ydocs"
706 >          description="Builds javadocs with custom tags to build folder">
707 >
708 >    <delete dir="${build.extra166yjavadocs.dir}"/>
709 >    <mkdir dir="${build.extra166yjavadocs.dir}"/>
710 >
711 >    <javadoc destdir="${build.extra166yjavadocs.dir}"
712 >             packagenames="extra166y"
713 >             link="http://download.oracle.com/javase/7/docs/api/"
714 >             source="${build.sourcelevel}"
715 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
716 >
717 >  </target>
718 >
719 >
720 >  <target name="extra166ydist"
721 >          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
722 >          description="Puts all distributable products in single hierarchy"/>
723 >
724 >
725 >
726 >  <target name="extra166yclean"
727 >          description="Removes all build products">
728 >
729 >    <delete dir="${build.extra166y.dir}"/>
730 >    <delete dir="${build.extra166ylib.dir}"/>
731 >
732 >  </target>
733 >
734 >
735 >
736 >  <target name="extra166ydist-clean"
737 >          description="Removes all build and distribution products">
738 >
739 >  </target>
740 >
741 >  <target name="extra166ydist-docs"
742 >          description="Builds javadocs without custom tags to dist folder">
743 >
744 >    <delete dir="${dist.extra166yjavadocs.dir}"/>
745 >    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
746 >
747 >    <javadoc destdir="${dist.extra166yjavadocs.dir}"
748 >             packagenames="extra166y"
749 >             link="http://download.oracle.com/javase/7/docs/api/"
750 >             source="${build.sourcelevel}"
751 >             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
752 >
753 >  </target>
754 >
755 >  <target name="extra166ydist-jar"
756 >          depends="extra166yclean, extra166yjar">
757 >
758 >    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
759 >
760    </target>
761  
762   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines