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.65 by jsr166, Fri Apr 9 20:10:29 2004 UTC vs.
Revision 1.73 by dl, Tue Nov 8 00:13:41 2005 UTC

# Line 40 | Line 40
40    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
41    <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
42    <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
43 +  <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
44 +  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
45 +  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
46  
47    <!-- Source locations -->
48    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 52 | Line 55
55    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
56    <property name="lib.dir"              location="${basedir}/lib"/>
57    <property name="dist.dir"             location="${basedir}/dist"/>
58 +  <property name="topsrc.dir"           location="${basedir}/src"/>
59 +  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
60  
61    <!-- Distribution locations -->
62    <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
63 +  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
64  
65    <!-- Jar locations -->
66    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
67 +  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
68    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
69 +  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
70  
71    <!-- Bootclasspath argument -->
72    <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
# Line 76 | Line 84
84  
85    <!-- J1 classpath -->
86    <path id="j1.classpath">
87 +    <pathelement location="${build.classes.dir}"/>
88      <pathelement location="${build.j1.dir}"/>
89      <pathelement location="${junit.jar}"/>
90 +
91 +    <!-- Include dl.u.c for BoundedBuffer comparison -->
92 +    <pathelement location="${concurrent.jar}"/>
93    </path>
94  
95  
# Line 98 | Line 110
110             source="${build.sourcelevel}"
111               fork="true">
112  
113 +      <include name="**/*.java"/>
114 + <!--
115 +      <exclude name="java/lang/**"/>
116        <compilerarg line="${build.args}"/>
117 +      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
118 + -->
119  
120      </javac>
121  
# Line 133 | Line 150
150      <mkdir dir="${build.javadocs.dir}"/>
151  
152      <javadoc destdir="${build.javadocs.dir}"
153 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
153 >                link="http://java.sun.com/j2se/1.5.0/docs/api"
154              overview="${src.dir}/intro.html"
155 <              source="${build.sourcelevel}">
156 <
140 <      <tag name="revised" description="Last revised:"/>
141 <      <tag name="spec"    description="Specified by:"/>
155 >            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
156 >    >          
157  
158        <packageset dir="${src.dir}"/>
159  
# Line 243 | Line 258
258      <mkdir dir="${dist.javadocs.dir}"/>
259  
260      <javadoc destdir="${dist.javadocs.dir}"
261 <                link="http://java.sun.com/j2se/1.4.2/docs/api"
261 >              link="http://java.sun.com/j2se/1.5.0/docs/api"
262              overview="${src.dir}/intro.html"
248              source="${build.sourcelevel}">
249
250      <packageset dir="${src.dir}"/>
263  
264 +            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
265 +     >
266 +      <packageset dir="${src.dir}" defaultexcludes="yes">
267 +      <include name="java/util/concurrent"/>
268 +      <include name="java/util/concurrent/atomic"/>
269 +      <include name="java/util/concurrent/locks"/>
270 +      </packageset>
271 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
272 +      <include name="main/java/util/*.java"/>
273 +      <include name="main/java/util/*.html"/>
274 + <!--      <include name="jsr166x/*.java"/> -->
275 +      </fileset>
276      </javadoc>
277  
278    </target>
# Line 668 | Line 692
692    </target>
693  
694  
695 <  <target name="compile-j1" depends="init, configure-compiler">
695 >  <target name="compile-j1" depends="init, configure-compiler, compile">
696  
697      <mkdir dir="${build.j1.dir}"/>
698  
# Line 677 | Line 701
701              debug="${build.debug}"
702         debuglevel="${build.debuglevel}"
703        deprecation="${build.deprecation}"
704 <           source="${build.sourcelevel}"
705 <             fork="true">
704 >           source="${build.sourcelevel}" >
705 >
706 >      <include name="**/*.java"/>
707 >      <exclude name="**/dijkstra/**"/>
708  
709        <compilerarg line="${build.args}"/>
710        <classpath refid="j1.classpath"/>
# Line 708 | Line 734
734    <target name="j1" depends="compile-j1"
735            description="Runs a standalone JavaOne program">
736  
737 <    <java classname="jsr166.misc.SortedEnumSet" fork="true">
737 >    <java classname="${j1.test}" fork="true">
738        <classpath refid="j1.classpath"/>
739 +      <jvmarg value="-client"/>
740 +
741 +      <!-- TestPseudoRandom args -->
742 +      <arg value="2"/>
743 +      <arg value="25"/>
744 +      <arg value="100000"/>
745 +
746 +      <!-- WebCrawler args -->
747 +      <!--
748 +      <arg value="jsr166.webcrawler.WebCrawler3"/>
749 +      <arg value="http://www.priorartisans.com"/>
750 +      <arg value="25"/>
751 +      -->
752 +
753      </java>
754  
755    </target>
# Line 924 | Line 964
964  
965    </target>
966  
967 +  <!-- jsr166x -->
968 +
969 +
970 +  <target name="jsr166xcompile"
971 +          depends="init, configure-compiler"
972 +          description="Compiles jsr166x sources">
973 +
974 +    <mkdir dir="${build.jsr166x.dir}"/>
975 +
976 +    <javac srcdir="${jsr166xsrc.dir}"
977 +          destdir="${build.jsr166x.dir}"
978 +            debug="${build.debug}"
979 +       debuglevel="${build.debuglevel}"
980 +      deprecation="${build.deprecation}"
981 +           source="${build.sourcelevel}"
982 +             fork="true">
983 +
984 +      <include name="**/*.java"/>
985 +      <compilerarg line="${build.args}"/>
986 +
987 +    </javac>
988 +
989 +  </target>
990 +
991 +
992 +
993 +  <target name="jsr166xjar"
994 +          depends="jsr166xcompile"
995 +          description="Builds library jar from compiled sources">
996 +
997 +    <mkdir dir="${build.jsr166xlib.dir}"/>
998 +
999 +    <jar destfile="${jsr166xproduct.jar}">
1000 +      <fileset dir="${build.jsr166x.dir}"/>
1001 +    </jar>
1002 +
1003 +  </target>
1004 +
1005 +
1006 +
1007 +  <target name="jsr166xdocs"
1008 +          description="Builds javadocs with custom tags to build folder">
1009 +
1010 +    <delete dir="${build.jsr166xjavadocs.dir}"/>
1011 +    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
1012 +
1013 +    <javadoc destdir="${build.jsr166xjavadocs.dir}"
1014 +                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1015 +            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
1016 +
1017 +    >
1018 +      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1019 +      <include name="jsr166x"/>
1020 +      </packageset>
1021 +
1022 +
1023 +    </javadoc>
1024 +
1025 +  </target>
1026 +
1027 +
1028 +  <target name="jsr166xdist"
1029 +          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
1030 +          description="Puts all distributable products in single hierarchy"/>
1031 +
1032 +
1033 +
1034 +  <target name="jsr166xclean"
1035 +          description="Removes all build products">
1036 +
1037 +    <delete dir="${build.jsr166x.dir}"/>
1038 +    <delete dir="${build.jsr166xlib.dir}"/>
1039 +
1040 +  </target>
1041 +
1042 +
1043 +
1044 +  <target name="jsr166xdist-clean"
1045 +          description="Removes all build and distribution products">
1046 +
1047 +  </target>
1048 +
1049 +
1050 +
1051 +  <target name="jsr166xdist-docs"
1052 +          description="Builds javadocs without custom tags to dist folder">
1053 +
1054 +    <delete dir="${dist.jsr166xjavadocs.dir}"/>
1055 +    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
1056 +
1057 +    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
1058 +                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1059 +              source="${build.sourcelevel}">
1060 +
1061 +      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1062 +      <include name="jsr166x"/>
1063 +      </packageset>
1064 +
1065 +    </javadoc>
1066 +
1067 +  </target>
1068 +
1069 +  <target name="jsr166xdist-jar"
1070 +          depends="jsr166xclean, jsr166xjar">
1071 +
1072 +    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
1073 +
1074 +  </target>
1075 +
1076   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines