From ee2d15b908360a415c7e30fdde62a2c9bf5f849f Mon Sep 17 00:00:00 2001
From: Gilles Dubochet <gilles.dubochet@epfl.ch>
Date: Thu, 7 May 2009 14:13:06 +0000
Subject: Fixes in Sabbus: "ant newlibs build" and "ant n...

Fixes in Sabbus: "ant newlibs build" and "ant newlibs newstarr" work as
expected.
---
 build.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 9772460908..961d583f3d 100644
--- a/build.xml
+++ b/build.xml
@@ -439,11 +439,13 @@ QUICK BUILD (QUICK)
     <stopwatch name="quick.lib.timer" action="total"/>
   </target>
   
-  <target name="quick.pre-libs" depends="quick.lib" if="libs.msil.outdated">
+  <target name="quick.newlibs" depends="quick.lib" if="libs.msil.outdated">
     <antcall target="libs.done"/>
+    <property name="fjbg.jar" value="${lib.dir}/fjbg.jar"/>
+    <property name="msil.jar" value="${build-libs.dir}/msil.jar"/>
   </target>
   
-  <target name="quick.libs" depends="quick.pre-libs">
+  <target name="quick.libs" depends="quick.newlibs" unless="libs.msil.outdated">
     <property name="fjbg.jar" value="${lib.dir}/fjbg.jar"/>
     <property name="msil.jar" value="${lib.dir}/msil.jar"/>
   </target>
@@ -1333,7 +1335,6 @@ LIBRARIES (MSIL, FJBG maybe later)
     <jar destfile="${build-libs.dir}/msil.jar">
       <fileset dir="${build-libs.dir}/classes/msil"/>
     </jar>
-    <property name="msil.jar" value="${build-libs.dir}/msil.jar"/>
   </target>
   
   <target name="libs.done" depends="libs.msilpack"/>
-- 
cgit v1.2.3