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

Diff of /jsr166/build.xml

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

revision 1.37, Fri May 30 03:24:18 2003 UTC revision 1.46, Sat Jul 26 13:17:51 2003 UTC
# Line 59  Line 59 
59    
60    
61    
62    <!-- Files excluded from emulation and dist-docs -->    <!-- Files excluded from dist-docs and emulation jar -->
63    <patternset id="emulation.excludes">    <patternset id="unsafe.exclusion">
64      <exclude name="java/util/Random.*"/>      <exclude name="java/util/Random.*"/>
65      <exclude name="sun/misc/Unsafe.*"/>      <exclude name="sun/misc/Unsafe.*"/>
66    </patternset>    </patternset>
67    
68      <!-- Files excludes from emulation jar -->
69      <patternset id="atomic.exclusion">
70        <exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
71        <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
72        <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
73        <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
74      </patternset>
75    
76    
77    
78    <!-- Main targets -->    <!-- Main targets -->
# Line 194  Line 202 
202            depends="init, dist-clean, dist-jar, dist-docs"            depends="init, dist-clean, dist-jar, dist-docs"
203            description="Puts all distributable products in single hierarchy"/>            description="Puts all distributable products in single hierarchy"/>
204    
205      <target name="release"
206              depends="dist"
207              description="Puts entire CVS tree, plus distribution productions, in a jar">
208    
209    <!--
210        #keep build dir? - dl
211        <delete dir="${build.dir}"/>
212    -->
213        <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
214    
215        <jar basedir="${basedir}" destfile="${release.jar}">
216          <exclude name="${release.jar}"/>
217          <exclude name="user.properties"/>
218          <exclude name="etc/notes/**"/>
219          <exclude name="lib/gjc/2.1/**"/>
220          <exclude name="**/SyntaxTest.java"/>
221        </jar>
222    
223      </target>
224    
225    <target name="clean"    <target name="clean"
226            description="Removes all build products">            description="Removes all build products">
# Line 292  Line 319 
319    
320      <jar destfile="${product.jar}" duplicate="add">      <jar destfile="${product.jar}" duplicate="add">
321        <fileset dir="${build.classes.dir}">        <fileset dir="${build.classes.dir}">
322          <patternset refid="emulation.excludes"/>          <patternset refid="atomic.exclusion"/>
323            <patternset refid="unsafe.exclusion"/>
324        </fileset>        </fileset>
325        <fileset dir="${build.emulation.dir}"/>        <fileset dir="${build.emulation.dir}"/>
326      </jar>      </jar>
# Line 341  Line 369 
369      <copy todir="${build.filter.src.dir}">      <copy todir="${build.filter.src.dir}">
370        <fileset dir="${src.dir}">        <fileset dir="${src.dir}">
371          <exclude name="**/*.html"/>          <exclude name="**/*.html"/>
372          <patternset refid="emulation.excludes"/>          <patternset refid="unsafe.exclusion"/>
373        </fileset>        </fileset>
374        <filterchain>        <filterchain>
375    
# Line 498  Line 526 
526    <target name="configure-compiler">    <target name="configure-compiler">
527    
528      <property name="gjc.version"      <property name="gjc.version"
529               value="2.0"/>               value="2.2"/>
530    
531      <condition property="novariance.arg" value="-novariance">      <condition property="novariance.arg" value="-novariance">
532        <and>        <and>
# Line 539  Line 567 
567       -->       -->
568    
569      <path id="pre.bootclasspath">      <path id="pre.bootclasspath">
       <!-- <pathelement location="${src.dir}"/> -->  
570        <pathelement location="${javac.jar}"/>        <pathelement location="${javac.jar}"/>
571      </path>      </path>
572    
573      <path id="compile.bootclasspath">      <path id="compile.bootclasspath">
574        <!-- <pathelement location="${src.dir}"/> -->        <pathelement location="${build.classes.dir}"/>
575        <pathelement location="${collect.jar}"/>        <pathelement location="${collect.jar}"/>
576        <pathelement location="${rt.jar}"/>        <pathelement location="${rt.jar}"/>
577      </path>      </path>
# Line 660  Line 687 
687    </target>    </target>
688    
689    
690      <target name="ng" depends="test">
691        <java classname="SuperfluousAbstract" fork="true">
692    
693          <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
694    
695        </java>
696      </target>
697    
698    
699  </project>  </project>

Legend:
Removed from v.1.37  
changed lines
  Added in v.1.46

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8