/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.48 by tim, Fri Aug 1 19:41:06 2003 UTC revision 1.53 by dl, Tue Aug 26 19:59:14 2003 UTC
# Line 35  Line 35 
35    <property name="build.lib.dir"        location="${build.dir}/lib"/>    <property name="build.lib.dir"        location="${build.dir}/lib"/>
36    <property name="build.ant.dir"        location="${build.dir}/ant"/>    <property name="build.ant.dir"        location="${build.dir}/ant"/>
37    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>    <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
38      <property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
39    <property name="build.stripped.dir"   location="${build.dir}/stripped"/>    <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
40    <property name="build.reports.dir"    location="${build.dir}/reports"/>    <property name="build.reports.dir"    location="${build.dir}/reports"/>
41    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>    <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
# Line 57  Line 58 
58    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
59    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
60    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
61      <property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
62    
63    
64    <!-- Files excluded from dist-docs and emulation jar -->    <!-- Files excluded from dist-docs and emulation jar -->
# Line 72  Line 73 
73      <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>      <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
74      <exclude name="java/util/concurrent/atomic/AtomicLong*"/>      <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
75      <exclude name="java/util/concurrent/atomic/AtomicReference*"/>      <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
76        <exclude name="java/util/concurrent/locks/LockSupport*"/>
77        <exclude name="java/util/concurrent/locks/ReentrantLock*"/>
78    </patternset>    </patternset>
79    
80    
# Line 99  Line 102 
102             source="${build.sourcelevel}"             source="${build.sourcelevel}"
103               fork="true">               fork="true">
104    
105    <!--
106        <compilerarg    line="${gjc.args}"/>        <compilerarg    line="${gjc.args}"/>
107        <bootclasspath refid="compile.bootclasspath"/>        <bootclasspath refid="compile.bootclasspath"/>
108    -->
109    
110      </javac>      </javac>
111    
# Line 174  Line 179 
179    </target>    </target>
180    
181    
182      <target name="sinjdocs"
183              depends="configure-tests"
184              description="Builds javadocs with custom tags to build folder">
185    
186        <delete dir="${build.sinjdocs.dir}"/>
187        <mkdir dir="${build.sinjdocs.dir}"/>
188    
189        <java classname="net.cscott.sinjdoc.Main" fork="true">
190    
191          <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
192    
193          <classpath>
194            <pathelement location="${sinjdoc.jar}"/>
195            <pathelement location="${lib.dir}/jutil.jar"/>
196            <pathelement location="${lib.dir}/cup.jar"/>
197            <path refid="test.classpath"/>
198          </classpath>
199    
200    
201          <arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
202          <arg value="-sourcepath"/> <arg value="${src.dir}"/>
203          <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
204          <arg value="-source"/>     <arg value="${build.sourcelevel}"/>
205          <!-- <arg value="-verbose"/> -->
206          <!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
207          <arg value="java.lang"/>
208          <arg value="java.util"/>
209          <arg value="java.util.concurrent"/>
210          <arg value="java.util.concurrent.atomic"/>
211          <arg value="java.util.concurrent.locks"/>
212    
213          <!--
214          <arg value="-help"/>
215          -->
216    
217        </java>
218    
219      </target>
220    
221    
222    <target name="strip"    <target name="strip"
223            depends="init, configure-compiler"            depends="init, configure-compiler"
224            description="Strip generics from java source (not working yet)">            description="Strip generics from java source (not working yet)">
# Line 193  Line 238 
238             source="${build.sourcelevel}"             source="${build.sourcelevel}"
239               fork="true">               fork="true">
240    
241        <!--
242        <compilerarg    line="${gjc.args} -s"/>        <compilerarg    line="${gjc.args} -s"/>
243        <bootclasspath refid="compile.bootclasspath"/>        <bootclasspath refid="compile.bootclasspath"/>
244         -->
245    
246      </javac>      </javac>
247    
# Line 477  Line 524 
524             source="${build.sourcelevel}"             source="${build.sourcelevel}"
525               fork="true">               fork="true">
526    
527    <!--
528        <compilerarg    line="${gjc.args}"/>        <compilerarg    line="${gjc.args}"/>
529    -->
530        <bootclasspath refid="test.compile.bootclasspath"/>        <bootclasspath refid="test.compile.bootclasspath"/>
531        <classpath     refid="test.classpath"/>        <classpath     refid="test.classpath"/>
532    
# Line 543  Line 592 
592    
593    
594    <target name="configure-compiler">    <target name="configure-compiler">
595    <!--
596      <property name="gjc.version"      <property name="gjc.version"
597               value="2.2"/>               value="2.2"/>
598    
# Line 569  Line 618 
618      <property name="collect.jar"      <property name="collect.jar"
619            location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>            location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
620    
621    -->
622      <condition property="warnunchecked.arg" value="-warnunchecked">      <condition property="warnunchecked.arg" value="-warnunchecked">
623        <istrue value="${gjc.warnunchecked}"/>        <istrue value="${gjc.warnunchecked}"/>
624      </condition>      </condition>
# Line 601  Line 650 
650    
651    
652      <!-- Common options in javac invocations -->      <!-- Common options in javac invocations -->
653    <!--
654      <property name="gjc.args"      <property name="gjc.args"
655               value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"               value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
656      />      />
657    -->
658    
659    </target>    </target>
660    

Legend:
Removed from v.1.48  
changed lines
  Added in v.1.53

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27