Changeset 12404


Ignore:
Timestamp:
01/26/10 11:30:57 (12 years ago)
Author:
Mark Evenson
Message:

Debugging ABCL compilation support; upgrade to JUnit-4.8.1.

Netbeans uses compiled directories before source.

Setting the property 'abcl.compile.lisp.skip' will skip the
compilation of the Lisp files which can be useful to debug under
Netbeans when debugging fundamental parts of ABCL.

Started to document useful Ant-based build knobs in
'build.properties.in'.

Added PathnameTest? and StreamTest? to Java unit tests.

Start documenting properties that affect the Ant build in
'build.properties.in'.

Location:
trunk/abcl
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/build.properties.in

    r11529 r12404  
    11# build.properties
    22# $Id: build.properties,v 1.23 2007-03-03 19:19:11 piso Exp $
     3
     4# Contents show up in JAR Manifest in the Implementation-Source attribute
     5#version.src=[abcl]
     6
     7# If set, ABCL attempts to perform incremental compilation
     8#abcl.build.incremental=true
     9
     10# Skip the compilation of Lisp sources (for debugging)
     11#abcl.compile.lisp.skip=true
  • trunk/abcl/build.xml

    r12338 r12404  
    7777      <include name="org/armedbear/lisp/boot.lisp"/>
    7878      <include name="org/armedbear/lisp/scripting/lisp/*.lisp" if="abcl.jsr-223.p"/>
     79      <include name="**/*.lisp" if="abcl.compile.lisp.skip"/>
    7980    </patternset>
    8081
     
    270271    <property name="abcl.version.path"
    271272        value="${build.classes.dir}/org/armedbear/lisp/version"/>
    272     <target name="abcl.stamp.version" depends="abcl.compile">
     273    <target name="abcl.stamp.version" depends="abcl.compile"  unless="abcl.compile.lisp.skip">
    273274      <!-- Determine which ABCL version we have just built by parsing
    274275           the output of LISP-IMPLEMENTATION-VERSION. -->
     
    608609      <!-- For now, we list tests explicitly, because we have to
    609610           enumerate them later to the JUnit test runner. -->
    610       <include name="org/armedbear/lisp/FastStringBufferTest.java"/>
    611     </patternset>
    612 
    613     <property name="junit-4.5.path"
    614         value="${abcl.ext.dir}/junit-4.5.jar"/>
     611      <include name="org/armedbear/lisp/*.java"/>
     612    </patternset>
     613
     614    <property name="junit.path"
     615        value="${abcl.ext.dir}/junit-4.8.1.jar"/>
     616
    615617
    616618    <path id="abcl.test.compile.classpath">
    617       <pathelement location="${junit-4.5.path}"/>
     619      <pathelement location="${junit.path}"/>
    618620      <pathelement location="${build.classes.dir}"/>
    619621    </path>
     
    624626      <!--XXX generalize over enumeration of all contributions to
    625627           abcl.ext if we get more of them.  -->
    626       <available file="${junit-4.5.path}" property="abcl.ext.p"/>
     628      <available file="${junit.path}" property="abcl.ext.p"/>
    627629    </target>
    628630    <target name="abcl.ext" depends="abcl.ext.p" unless="abcl.ext.p">
    629631
    630632      <mkdir dir="${abcl.ext.dir}"/>
    631       <get src="http://downloads.sourceforge.net/junit/junit-4.5.jar?modtime=1218209625"
    632      usetimestamp="true"
    633      dest="${junit-4.5.path}"/>
     633      <get
     634          src="http://cloud.github.com/downloads/KentBeck/junit/junit-4.8.1.jar"
     635          usetimestamp="true"
     636          dest="${junit.path}"/>
    634637    </target>
    635638 
    636639    <target name="abcl.test.compile"
    637       depends="abcl.test.pre-compile,abcl.compile">
     640      depends="abcl.test.pre-compile">
    638641      <mkdir dir="${abcl.test.classes.dir}"/>
    639642      <javac destdir="${abcl.test.classes.dir}"
     
    659662      classname="org.junit.runner.JUnitCore">
    660663  <arg value="org.armedbear.lisp.FastStringBufferTest"/>
     664        <arg value="org.armedbear.lisp.PathnameTest"/>
     665        <arg value="org.armedbear.lisp.StreamTest"/>
    661666      </java>
    662667    </target>
  • trunk/abcl/nbproject/project.properties

    r12354 r12404  
    1919dist.jar=${dist.dir}/abcl.jar
    2020dist.javadoc.dir=${dist.dir}/javadoc
     21endorsed.classpath=
    2122excludes=
    2223file.reference.abcl-src=src
     
    5657platform.active=default_platform
    5758run.classpath=\
    58     ${javac.classpath}:\
    59     ${build.classes.dir}
     59    ${build.classes.dir}:\
     60    ${javac.classpath}
    6061# Space-separated list of JVM arguments used when running the project
    6162# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
     
    6364run.jvmargs=
    6465run.test.classpath=\
    65     ${javac.test.classpath}:\
    66     ${build.test.classes.dir}
     66    ${build.test.classes.dir}:\
     67    ${javac.test.classpath}
    6768source.encoding=UTF-8
    6869src.dir=${file.reference.abcl-src}
  • trunk/abcl/netbeans-build.xml

    r12354 r12404  
    77  <import file="nbproject/build-impl.xml"/>
    88
    9   <target name="-post-compile">
    10     <antcall target="abcl.compile.lisp"/>
     9  <target name="-pre-compile" if="abcl.compile.lisp.skip">
     10    <antcall target="abcl.copy.lisp"/>
     11  </target>
     12
     13  <target name="-post-compile" unless="abcl.compile.lisp.skip">
     14    <antcall target="abcl.compile.lisp" />
    1115  </target>
    1216</project>
Note: See TracChangeset for help on using the changeset viewer.