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.69 by jsr166, Fri Jul 2 16:06:25 2004 UTC vs.
Revision 1.72 by dl, Fri May 20 16:29:57 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  
# Line 77 | 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  
# Line 101 | Line 111
111               fork="true">
112  
113        <include name="**/*.java"/>
114 + <!--
115        <exclude name="java/lang/**"/>
116 + -->
117        <compilerarg line="${build.args}"/>
118  
119      </javac>
# Line 137 | 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://java.sun.com/j2se/1.5.0/docs/api"
153              overview="${src.dir}/intro.html"
154 <              source="${build.sourcelevel}">
155 <
144 <      <tag name="revised" description="Last revised:"/>
145 <      <tag name="spec"    description="Specified by:"/>
154 >            sourcepath="${src.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
155 >    >          
156  
157        <packageset dir="${src.dir}"/>
158  
# Line 247 | Line 257
257      <mkdir dir="${dist.javadocs.dir}"/>
258  
259      <javadoc destdir="${dist.javadocs.dir}"
260 <                link="http://java.sun.com/j2se/1.4.2/docs/api"
260 >              link="http://java.sun.com/j2se/1.5.0/docs/api"
261              overview="${src.dir}/intro.html"
252 –              source="${build.sourcelevel}">
253 –
254 –      <packageset dir="${src.dir}"/>
262  
263 +            sourcepath="${src.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
264 +     >
265 +      <packageset dir="${src.dir}" defaultexcludes="yes">
266 +      <include name="java/util/concurrent"/>
267 +      <include name="java/util/concurrent/atomic"/>
268 +      <include name="java/util/concurrent/locks"/>
269 +      </packageset>
270 +      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
271 +      <include name="main/java/util/*.java"/>
272 + <!--      <include name="jsr166x/*.java"/> -->
273 +      </fileset>
274      </javadoc>
275  
276    </target>
# Line 672 | Line 690
690    </target>
691  
692  
693 <  <target name="compile-j1" depends="init, configure-compiler">
693 >  <target name="compile-j1" depends="init, configure-compiler, compile">
694  
695      <mkdir dir="${build.j1.dir}"/>
696  
# Line 944 | Line 962
962  
963    </target>
964  
965 +  <!-- jsr166x -->
966 +
967 +
968 +  <target name="jsr166xcompile"
969 +          depends="init, configure-compiler"
970 +          description="Compiles jsr166x sources">
971 +
972 +    <mkdir dir="${build.jsr166x.dir}"/>
973 +
974 +    <javac srcdir="${jsr166xsrc.dir}"
975 +          destdir="${build.jsr166x.dir}"
976 +            debug="${build.debug}"
977 +       debuglevel="${build.debuglevel}"
978 +      deprecation="${build.deprecation}"
979 +           source="${build.sourcelevel}"
980 +             fork="true">
981 +
982 +      <include name="**/*.java"/>
983 +      <compilerarg line="${build.args}"/>
984 +
985 +    </javac>
986 +
987 +  </target>
988 +
989 +
990 +
991 +  <target name="jsr166xjar"
992 +          depends="jsr166xcompile"
993 +          description="Builds library jar from compiled sources">
994 +
995 +    <mkdir dir="${build.jsr166xlib.dir}"/>
996 +
997 +    <jar destfile="${jsr166xproduct.jar}">
998 +      <fileset dir="${build.jsr166x.dir}"/>
999 +    </jar>
1000 +
1001 +  </target>
1002 +
1003 +
1004 +
1005 +  <target name="jsr166xdocs"
1006 +          description="Builds javadocs with custom tags to build folder">
1007 +
1008 +    <delete dir="${build.jsr166xjavadocs.dir}"/>
1009 +    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
1010 +
1011 +    <javadoc destdir="${build.jsr166xjavadocs.dir}"
1012 +                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1013 +            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
1014 +
1015 +    >
1016 +      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1017 +      <include name="jsr166x"/>
1018 +      </packageset>
1019 +
1020 +
1021 +    </javadoc>
1022 +
1023 +  </target>
1024 +
1025 +
1026 +  <target name="jsr166xdist"
1027 +          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
1028 +          description="Puts all distributable products in single hierarchy"/>
1029 +
1030 +
1031 +
1032 +  <target name="jsr166xclean"
1033 +          description="Removes all build products">
1034 +
1035 +    <delete dir="${build.jsr166x.dir}"/>
1036 +    <delete dir="${build.jsr166xlib.dir}"/>
1037 +
1038 +  </target>
1039 +
1040 +
1041 +
1042 +  <target name="jsr166xdist-clean"
1043 +          description="Removes all build and distribution products">
1044 +
1045 +  </target>
1046 +
1047 +
1048 +
1049 +  <target name="jsr166xdist-docs"
1050 +          description="Builds javadocs without custom tags to dist folder">
1051 +
1052 +    <delete dir="${dist.jsr166xjavadocs.dir}"/>
1053 +    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
1054 +
1055 +    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
1056 +                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1057 +              source="${build.sourcelevel}">
1058 +
1059 +      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1060 +      <include name="jsr166x"/>
1061 +      </packageset>
1062 +
1063 +    </javadoc>
1064 +
1065 +  </target>
1066 +
1067 +  <target name="jsr166xdist-jar"
1068 +          depends="jsr166xclean, jsr166xjar">
1069 +
1070 +    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
1071 +
1072 +  </target>
1073 +
1074   </project>

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines