From 1e54e8baf560c0d01c693e9277adcedba171642b Mon Sep 17 00:00:00 2001
From: lorch <lorch@epfl.ch>
Date: Thu, 24 Apr 2008 19:56:43 +0000
Subject: "ant msil" works again on a fresh build (and af...

"ant msil" works again on a fresh build (and after "ant clean")
---
 build.xml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 1e68ea7291..f8f8dab8c6 100644
--- a/build.xml
+++ b/build.xml
@@ -1002,26 +1002,19 @@ MSIL
       <condition><not><isset property="ilasm.cmd"/></not></condition>
     </fail>
     <!-- Sets ilasm arguments (either Windows or Unix) -->
-    <!-- property name="ilasm.infile" value="${msil.dir}/predef.msil" -->
-    <path id="ilasm.infiles">
-      <fileset dir="${msil.dir}" includes="*.msil"/>
-    </path>
-    <pathconvert property="ilasm.infile" pathsep=" ">
-      <path refid="ilasm.infiles" />
-    </pathconvert>
     <property name="ilasm.outfile" value="${msil.dir}/predef.dll"/>
     <if>
       <isset property="os.win"/>
       <then>
         <property
           name="ilasm.args"
-          value="/quiet /dll /output=${ilasm.outfile} ${ilasm.infile}"
+          value="/quiet /dll /output=${ilasm.outfile}"
         />
       </then>
       <else>
         <property
           name="ilasm.args"
-          value="/dll /output:${ilasm.outfile} ${ilasm.infile}"
+          value="/dll /output:${ilasm.outfile}"
         />
       </else>
     </if>
@@ -1075,12 +1068,15 @@ MSIL
       <include name="scala/testing/*.scala"/> 
       <include name="scala/text/*.scala"/> -->
     </quick>
+    <pathconvert property="ilasm.infile" pathsep=" ">
+      <fileset dir="${msil.dir}" includes="*.msil"/>
+    </pathconvert>
     <exec
       executable="${ilasm.cmd}" vmlauncher="no">
       <!--
       errorproperty="ilasm.err" outputproperty="ilasm.out">
       -->
-      <arg line="${ilasm.args}"/>
+      <arg line="${ilasm.args} ${ilasm.infile}"/>
     </exec>
   </target>
 
-- 
cgit v1.2.3