Changeset 12294


Ignore:
Timestamp:
12/07/09 11:56:52 (11 years ago)
Author:
Mark Evenson
Message:

Fix abcl.compile.lisp under Windows.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/build.xml

    r12293 r12294  
    209209      </uptodate>
    210210    </target>
     211
     212    <path id="abcl.home.dir.path">
     213        <path location="${src.dir}/org/armedbear/lisp/"/>
     214    </path>         
     215    <pathconvert property="abcl.home.dir" refid="abcl.home.dir.path"/>
     216
     217    <path id="abcl.lisp.output.path"
     218          location="${build.classes.dir}/org/armedbear/lisp/"/>
    211219   
    212220    <target name="abcl.compile.lisp"
    213221      depends="abcl.copy.lisp,abcl.compile.java,abcl.fasls.uptodate"
    214222      unless="abcl.fasls.uptodate.p">
     223
     224      <tempfile property="abcl.compile.lisp.tmp" suffix=".lisp"/>
     225
     226      <echo file="${abcl.compile.lisp.tmp}">
     227      (compile-system :zip nil :quit t
     228          :output-path "${toString:abcl.lisp.output.path}${file.separator}")
     229      </echo>
     230
     231      <tempfile property="abcl.compile.lisp.tmp.2"  suffix=".lisp"/>
     232     
     233      <copy verbose="true" file="${abcl.compile.lisp.tmp}"
     234            tofile="${abcl.compile.lisp.tmp.2}">
     235   <filterchain>
     236      <replacestring from="\" to="/"/>
     237   </filterchain>
     238      </copy>
     239
    215240      <java classpath="${build.classes.dir}"
    216241      fork="true"
    217242      failonerror="true"
    218243      classname="org.armedbear.lisp.Main">
    219         <jvmarg value="-Dabcl.home=${abcl.home.dir}"/>
     244        <jvmarg value="-Dabcl.home=${abcl.home.dir}${file.separator}"/>
    220245  <arg value="--noinit"/>
    221   <arg value="--eval"/>
    222   <arg value="(compile-system :zip nil :quit t :output-path &quot;${build.classes.dir}/org/armedbear/lisp/&quot;)"/>
    223       </java>
     246  <arg value="--load"/>
     247  <arg value="${abcl.compile.lisp.tmp.2}"/>
     248      </java>
     249            <delete file="${abcl.compile.lisp.tmp}"/>
     250      <delete file="${abcl.compile.lisp.tmp.2}"/>
    224251    </target>
    225252
Note: See TracChangeset for help on using the changeset viewer.