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.73 by dl, Tue Nov 8 00:13:41 2005 UTC vs.
Revision 1.74 by dl, Thu Sep 13 11:19:25 2007 UTC

# Line 44 | Line 44
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"/>
53    <property name="test.src.dir"         location="${basedir}/src/test"/>
# Line 57 | Line 61
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 111 | Line 118
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}"/>
# Line 150 | Line 159
159      <mkdir dir="${build.javadocs.dir}"/>
160  
161      <javadoc destdir="${build.javadocs.dir}"
162 <                link="http://java.sun.com/j2se/1.5.0/docs/api"
162 >                link="http://java.sun.com/javase/6/docs/api/"
163              overview="${src.dir}/intro.html"
164              sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
165      >          
# Line 258 | Line 267
267      <mkdir dir="${dist.javadocs.dir}"/>
268  
269      <javadoc destdir="${dist.javadocs.dir}"
270 <              link="http://java.sun.com/j2se/1.5.0/docs/api"
270 >            link="http://java.sun.com/javase/6/docs/api/"
271              overview="${src.dir}/intro.html"
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>
# Line 1011 | Line 1030
1030      <mkdir dir="${build.jsr166xjavadocs.dir}"/>
1031  
1032      <javadoc destdir="${build.jsr166xjavadocs.dir}"
1033 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
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      >
# Line 1055 | Line 1075
1075      <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
1076  
1077      <javadoc destdir="${dist.jsr166xjavadocs.dir}"
1078 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1078 >                link="http://java.sun.com/javase/6/docs/api/"
1079                source="${build.sourcelevel}">
1080  
1081        <packageset dir="${topsrc.dir}" defaultexcludes="yes">
# Line 1073 | Line 1093
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