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.66 by jsr166, Sun Apr 11 01:37:41 2004 UTC vs.
Revision 1.74 by dl, Thu Sep 13 11:19:25 2007 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 +  <property name="build.jsr166y.dir"    location="${build.dir}/jsr166y"/>
48 +  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
49 +  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
50  
51    <!-- Source locations -->
52    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 52 | Line 59
59    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
60    <property name="lib.dir"              location="${basedir}/lib"/>
61    <property name="dist.dir"             location="${basedir}/dist"/>
62 +  <property name="topsrc.dir"           location="${basedir}/src"/>
63 +  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
64 +  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
65  
66    <!-- Distribution locations -->
67    <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
68 +  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
69 +  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
70  
71    <!-- Jar locations -->
72    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
73 +  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
74 +  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
75    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
76    <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
77  
# Line 77 | Line 91
91  
92    <!-- J1 classpath -->
93    <path id="j1.classpath">
94 +    <pathelement location="${build.classes.dir}"/>
95      <pathelement location="${build.j1.dir}"/>
96      <pathelement location="${junit.jar}"/>
97 +
98 +    <!-- Include dl.u.c for BoundedBuffer comparison -->
99      <pathelement location="${concurrent.jar}"/>
100    </path>
101  
# Line 100 | Line 117
117             source="${build.sourcelevel}"
118               fork="true">
119  
120 +      <include name="**/*.java"/>
121 +      <compilerarg value="-XDignore.symbol.file"/>
122 +
123 + <!--
124 +      <exclude name="java/lang/**"/>
125        <compilerarg line="${build.args}"/>
126 +      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
127 + -->
128  
129      </javac>
130  
# Line 135 | Line 159
159      <mkdir dir="${build.javadocs.dir}"/>
160  
161      <javadoc destdir="${build.javadocs.dir}"
162 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
162 >                link="http://java.sun.com/javase/6/docs/api/"
163              overview="${src.dir}/intro.html"
164 <              source="${build.sourcelevel}">
165 <
142 <      <tag name="revised" description="Last revised:"/>
143 <      <tag name="spec"    description="Specified by:"/>
164 >            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
165 >    >          
166  
167        <packageset dir="${src.dir}"/>
168  
# Line 245 | Line 267
267      <mkdir dir="${dist.javadocs.dir}"/>
268  
269      <javadoc destdir="${dist.javadocs.dir}"
270 <                link="http://java.sun.com/j2se/1.4.2/docs/api"
270 >            link="http://java.sun.com/javase/6/docs/api/"
271              overview="${src.dir}/intro.html"
250              source="${build.sourcelevel}">
251
252      <packageset dir="${src.dir}"/>
272  
273 +            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
274 +     >
275 + <!--
276 +      <packageset dir="${src.dir}" defaultexcludes="yes">
277 +      <include name="java/util/concurrent"/>
278 +      <include name="java/util/concurrent/atomic"/>
279 +      <include name="java/util/concurrent/locks"/>
280 +      </packageset>
281 + -->
282 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
283 +      <include name="main/java/util/concurrent/*.java"/>
284 +      <include name="main/java/util/concurrent/atomic/*.java"/>
285 +      <include name="main/java/util/concurrent/locks/*.java"/>
286 +      <include name="main/java/util/*.java"/>
287 + <!--
288 +      <include name="main/java/util/concurrent/*.html"/>
289 +      <include name="main/java/util/concurrent/atomic/*.html"/>
290 +      <include name="main/java/util/concurrent/locks/*.html"/>
291 +      <include name="main/java/util/*.html"/>
292 + -->
293 + <!--      <include name="jsr166x/*.java"/> -->
294 +      </fileset>
295      </javadoc>
296  
297    </target>
# Line 670 | Line 711
711    </target>
712  
713  
714 <  <target name="compile-j1" depends="init, configure-compiler">
714 >  <target name="compile-j1" depends="init, configure-compiler, compile">
715  
716      <mkdir dir="${build.j1.dir}"/>
717  
# Line 712 | Line 753
753    <target name="j1" depends="compile-j1"
754            description="Runs a standalone JavaOne program">
755  
756 <    <java classname="jsr166.bbuf.BoundedBufferDemo" fork="true">
756 >    <java classname="${j1.test}" fork="true">
757        <classpath refid="j1.classpath"/>
758 <      <jvmarg value="-server"/>
759 <      <arg value="http://www.perl.com/"/>
760 <      <arg value="1"/>
758 >      <jvmarg value="-client"/>
759 >
760 >      <!-- TestPseudoRandom args -->
761 >      <arg value="2"/>
762 >      <arg value="25"/>
763 >      <arg value="100000"/>
764 >
765 >      <!-- WebCrawler args -->
766 >      <!--
767 >      <arg value="jsr166.webcrawler.WebCrawler3"/>
768 >      <arg value="http://www.priorartisans.com"/>
769 >      <arg value="25"/>
770 >      -->
771 >
772      </java>
773  
774    </target>
# Line 931 | Line 983
983  
984    </target>
985  
986 +  <!-- jsr166x -->
987 +
988 +
989 +  <target name="jsr166xcompile"
990 +          depends="init, configure-compiler"
991 +          description="Compiles jsr166x sources">
992 +
993 +    <mkdir dir="${build.jsr166x.dir}"/>
994 +
995 +    <javac srcdir="${jsr166xsrc.dir}"
996 +          destdir="${build.jsr166x.dir}"
997 +            debug="${build.debug}"
998 +       debuglevel="${build.debuglevel}"
999 +      deprecation="${build.deprecation}"
1000 +           source="${build.sourcelevel}"
1001 +             fork="true">
1002 +
1003 +      <include name="**/*.java"/>
1004 +      <compilerarg line="${build.args}"/>
1005 +
1006 +    </javac>
1007 +
1008 +  </target>
1009 +
1010 +
1011 +
1012 +  <target name="jsr166xjar"
1013 +          depends="jsr166xcompile"
1014 +          description="Builds library jar from compiled sources">
1015 +
1016 +    <mkdir dir="${build.jsr166xlib.dir}"/>
1017 +
1018 +    <jar destfile="${jsr166xproduct.jar}">
1019 +      <fileset dir="${build.jsr166x.dir}"/>
1020 +    </jar>
1021 +
1022 +  </target>
1023 +
1024 +
1025 +
1026 +  <target name="jsr166xdocs"
1027 +          description="Builds javadocs with custom tags to build folder">
1028 +
1029 +    <delete dir="${build.jsr166xjavadocs.dir}"/>
1030 +    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
1031 +
1032 +    <javadoc destdir="${build.jsr166xjavadocs.dir}"
1033 +             link="http://java.sun.com/javase/6/docs/api/"
1034 +
1035 +            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
1036 +
1037 +    >
1038 +      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1039 +      <include name="jsr166x"/>
1040 +      </packageset>
1041 +
1042 +
1043 +    </javadoc>
1044 +
1045 +  </target>
1046 +
1047 +
1048 +  <target name="jsr166xdist"
1049 +          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
1050 +          description="Puts all distributable products in single hierarchy"/>
1051 +
1052 +
1053 +
1054 +  <target name="jsr166xclean"
1055 +          description="Removes all build products">
1056 +
1057 +    <delete dir="${build.jsr166x.dir}"/>
1058 +    <delete dir="${build.jsr166xlib.dir}"/>
1059 +
1060 +  </target>
1061 +
1062 +
1063 +
1064 +  <target name="jsr166xdist-clean"
1065 +          description="Removes all build and distribution products">
1066 +
1067 +  </target>
1068 +
1069 +
1070 +
1071 +  <target name="jsr166xdist-docs"
1072 +          description="Builds javadocs without custom tags to dist folder">
1073 +
1074 +    <delete dir="${dist.jsr166xjavadocs.dir}"/>
1075 +    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
1076 +
1077 +    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
1078 +                link="http://java.sun.com/javase/6/docs/api/"
1079 +              source="${build.sourcelevel}">
1080 +
1081 +      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1082 +      <include name="jsr166x"/>
1083 +      </packageset>
1084 +
1085 +    </javadoc>
1086 +
1087 +  </target>
1088 +
1089 +  <target name="jsr166xdist-jar"
1090 +          depends="jsr166xclean, jsr166xjar">
1091 +
1092 +    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
1093 +
1094 +  </target>
1095 +
1096 +  <!-- jsr166y -->
1097 +
1098 +
1099 +  <target name="jsr166ycompile"
1100 +          depends="init, configure-compiler"
1101 +          description="Compiles jsr166y sources">
1102 +
1103 +    <mkdir dir="${build.jsr166y.dir}"/>
1104 +
1105 +    <javac srcdir="${jsr166ysrc.dir}"
1106 +          destdir="${build.jsr166y.dir}"
1107 +            debug="${build.debug}"
1108 +       debuglevel="${build.debuglevel}"
1109 +      deprecation="${build.deprecation}"
1110 +           source="${build.sourcelevel}"
1111 +             fork="true">
1112 +
1113 +      <include name="**/*.java"/>
1114 +      <compilerarg line="${build.args}"/>
1115 +      <compilerarg value="${bootclasspath.args}"/>
1116 +
1117 + <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
1118 +
1119 +    </javac>
1120 +
1121 +  </target>
1122 +
1123 +
1124 +
1125 +  <target name="jsr166yjar"
1126 +          depends="jsr166ycompile"
1127 +          description="Builds library jar from compiled sources">
1128 +
1129 +    <mkdir dir="${build.jsr166ylib.dir}"/>
1130 +
1131 +    <jar destfile="${jsr166yproduct.jar}">
1132 +      <fileset dir="${build.jsr166y.dir}"/>
1133 +    </jar>
1134 +
1135 +  </target>
1136 +
1137 +
1138 +
1139 +  <target name="jsr166ydocs"
1140 +          description="Builds javadocs with custom tags to build folder">
1141 +
1142 +    <delete dir="${build.jsr166yjavadocs.dir}"/>
1143 +    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
1144 +
1145 +    <javadoc destdir="${build.jsr166yjavadocs.dir}"
1146 +                link="http://java.sun.com/javase/6/docs/api/"
1147 +            sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
1148 +
1149 +    >
1150 +      <packageset dir="${topsrc.dir}" defaultexcludes="no">
1151 +      <include name="jsr166y"/>
1152 +      </packageset>
1153 +
1154 +
1155 +    </javadoc>
1156 +
1157 +  </target>
1158 +
1159 +
1160 +  <target name="jsr166ydist"
1161 +          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
1162 +          description="Puts all distributable products in single hierarchy"/>
1163 +
1164 +
1165 +
1166 +  <target name="jsr166yclean"
1167 +          description="Removes all build products">
1168 +
1169 +    <delete dir="${build.jsr166y.dir}"/>
1170 +    <delete dir="${build.jsr166ylib.dir}"/>
1171 +
1172 +  </target>
1173 +
1174 +
1175 +
1176 +  <target name="jsr166ydist-clean"
1177 +          description="Removes all build and distribution products">
1178 +
1179 +  </target>
1180 +
1181 +  <target name="jsr166ydist-docs"
1182 +          description="Builds javadocs without custom tags to dist folder">
1183 +
1184 +    <delete dir="${dist.jsr166yjavadocs.dir}"/>
1185 +    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
1186 +
1187 +    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
1188 +                link="http://java.sun.com/javase/6/docs/api/"
1189 +              source="${build.sourcelevel}">
1190 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
1191 +      <include name="jsr166y/*.java"/>
1192 +      <include name="jsr166y/forkjoin/*.java"/>
1193 +            </fileset>
1194 +    </javadoc>
1195 +
1196 +  </target>
1197 +
1198 +  <target name="jsr166ydist-jar"
1199 +          depends="jsr166yclean, jsr166yjar">
1200 +
1201 +    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
1202 +
1203 +  </target>
1204 +
1205   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines