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.67 by jsr166, Sun Apr 11 22:00:40 2004 UTC vs.
Revision 1.71 by peierls, Thu Dec 30 21:43:34 2004 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 100 | Line 110
110             source="${build.sourcelevel}"
111               fork="true">
112  
113 +      <include name="**/*.java"/>
114 +      <exclude name="java/lang/**"/>
115        <compilerarg line="${build.args}"/>
116  
117      </javac>
# Line 670 | Line 682
682    </target>
683  
684  
685 <  <target name="compile-j1" depends="init, configure-compiler">
685 >  <target name="compile-j1" depends="init, configure-compiler, compile">
686  
687      <mkdir dir="${build.j1.dir}"/>
688  
# Line 712 | Line 724
724    <target name="j1" depends="compile-j1"
725            description="Runs a standalone JavaOne program">
726  
727 <    <java classname="jsr166.random.TestRandom" fork="true">
727 >    <java classname="${j1.test}" fork="true">
728        <classpath refid="j1.classpath"/>
729        <jvmarg value="-client"/>
730 +
731 +      <!-- TestPseudoRandom args -->
732 +      <arg value="2"/>
733 +      <arg value="25"/>
734 +      <arg value="100000"/>
735 +
736 +      <!-- WebCrawler args -->
737 +      <!--
738 +      <arg value="jsr166.webcrawler.WebCrawler3"/>
739 +      <arg value="http://www.priorartisans.com"/>
740 +      <arg value="25"/>
741 +      -->
742 +
743      </java>
744  
745    </target>
# Line 929 | Line 954
954  
955    </target>
956  
957 +  <!-- jsr166x -->
958 +
959 +
960 +  <target name="jsr166xcompile"
961 +          depends="init, configure-compiler"
962 +          description="Compiles jsr166x sources">
963 +
964 +    <mkdir dir="${build.jsr166x.dir}"/>
965 +
966 +    <javac srcdir="${jsr166xsrc.dir}"
967 +          destdir="${build.jsr166x.dir}"
968 +            debug="${build.debug}"
969 +       debuglevel="${build.debuglevel}"
970 +      deprecation="${build.deprecation}"
971 +           source="${build.sourcelevel}"
972 +             fork="true">
973 +
974 +      <include name="**/*.java"/>
975 +      <compilerarg line="${build.args}"/>
976 +
977 +    </javac>
978 +
979 +  </target>
980 +
981 +
982 +
983 +  <target name="jsr166xjar"
984 +          depends="jsr166xcompile"
985 +          description="Builds library jar from compiled sources">
986 +
987 +    <mkdir dir="${build.jsr166xlib.dir}"/>
988 +
989 +    <jar destfile="${jsr166xproduct.jar}">
990 +      <fileset dir="${build.jsr166x.dir}"/>
991 +    </jar>
992 +
993 +  </target>
994 +
995 +
996 +
997 +  <target name="jsr166xdocs"
998 +          description="Builds javadocs with custom tags to build folder">
999 +
1000 +    <delete dir="${build.jsr166xjavadocs.dir}"/>
1001 +    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
1002 +
1003 +    <javadoc destdir="${build.jsr166xjavadocs.dir}"
1004 +                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1005 +    >
1006 +      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1007 +      <include name="jsr166x"/>
1008 +      </packageset>
1009 +
1010 +
1011 +    </javadoc>
1012 +
1013 +  </target>
1014 +
1015 +
1016 +  <target name="jsr166xdist"
1017 +          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
1018 +          description="Puts all distributable products in single hierarchy"/>
1019 +
1020 +
1021 +
1022 +  <target name="jsr166xclean"
1023 +          description="Removes all build products">
1024 +
1025 +    <delete dir="${build.jsr166x.dir}"/>
1026 +    <delete dir="${build.jsr166xlib.dir}"/>
1027 +
1028 +  </target>
1029 +
1030 +
1031 +
1032 +  <target name="jsr166xdist-clean"
1033 +          description="Removes all build and distribution products">
1034 +
1035 +  </target>
1036 +
1037 +
1038 +
1039 +  <target name="jsr166xdist-docs"
1040 +          description="Builds javadocs without custom tags to dist folder">
1041 +
1042 +    <delete dir="${dist.jsr166xjavadocs.dir}"/>
1043 +    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
1044 +
1045 +    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
1046 +                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1047 +              source="${build.sourcelevel}">
1048 +
1049 +      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1050 +      <include name="jsr166x"/>
1051 +      </packageset>
1052 +
1053 +    </javadoc>
1054 +
1055 +  </target>
1056 +
1057 +  <target name="jsr166xdist-jar"
1058 +          depends="jsr166xclean, jsr166xjar">
1059 +
1060 +    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
1061 +
1062 +  </target>
1063 +
1064   </project>

Diff Legend

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