Changeset 12434


Ignore:
Timestamp:
02/08/10 18:01:03 (12 years ago)
Author:
Mark Evenson
Message:

Revert r12430 because it fails to signal errors in a meaningful manner.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/build.xml

    r12430 r12434  
    221221    <path id="abcl.lisp.output.path"
    222222          location="${build.classes.dir}/org/armedbear/lisp/"/>
    223     <pathconvert dirsep="/" property="abcl.lisp.output" refid="abcl.lisp.output.path"/>
    224223   
    225224    <target name="abcl.compile.lisp"
    226225      depends="abcl.copy.lisp,abcl.compile.java,abcl.fasls.uptodate"
    227226      unless="abcl.fasls.uptodate.p">
    228       <java classpath="${build.classes.dir}"
     227
     228      <!-- The following shenanigans are necessary to get something
     229           that ABCL under Windows can parse as a pathname with the
     230           drive syntax not being interpreted as a Lisp package
     231           namespace, and with backslash characters not starting
     232           escape sequences.  -->
     233      <tempfile property="abcl.compile.lisp.tmp" suffix=".lisp"/>
     234
     235      <echo file="${abcl.compile.lisp.tmp}">
     236      (compile-system :zip nil :quit t
     237          :output-path "${toString:abcl.lisp.output.path}${file.separator}")
     238      </echo>
     239
     240      <tempfile property="abcl.compile.lisp.tmp.2"  suffix=".lisp"/>
     241     
     242      <copy file="${abcl.compile.lisp.tmp}"
     243            tofile="${abcl.compile.lisp.tmp.2}">
     244   <filterchain>
     245      <replacestring from="\" to="/"/>
     246   </filterchain>
     247      </copy>
     248
     249      <java classpath="${build.classes.dir}"
    229250      fork="true"
    230251      failonerror="true"
    231       inputstring="(compile-system :zip nil :quit t :output-path &quot;${abcl.lisp.output}/&quot;)'"
    232252      classname="org.armedbear.lisp.Main">
    233253        <jvmarg value="-Dabcl.home=${abcl.home.dir}${file.separator}"/>
    234254  <arg value="--noinit"/>
     255  <arg value="--load"/>
     256  <arg value="${abcl.compile.lisp.tmp.2}"/>
    235257      </java>
     258            <delete file="${abcl.compile.lisp.tmp}"/>
     259      <delete file="${abcl.compile.lisp.tmp.2}"/>
    236260    </target>
    237261
     
    699723      <echo>Finished recording test output in ${abcl.test.log.file}.</echo>
    700724    </target>
    701    
     725
    702726    <target name="abcl.release"
    703727            depends="abcl.binary.tar,abcl.source.tar,abcl.binary.zip,abcl.source.zip">
Note: See TracChangeset for help on using the changeset viewer.