From b7470d8225d631ac59aa827c6b249626f1c21b1d Mon Sep 17 00:00:00 2001
From: Lex Spoon <lex@lexspoon.org>
Date: Tue, 5 Feb 2008 16:25:39 +0000
Subject: tweaked the build order and class paths

---
 debian/simpbuild.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'debian')

diff --git a/debian/simpbuild.xml b/debian/simpbuild.xml
index 466ff9c817..328b1c94e1 100644
--- a/debian/simpbuild.xml
+++ b/debian/simpbuild.xml
@@ -227,7 +227,6 @@
   </macrodef>
 
   <target name="build">
-    <parallel threadsPerProcessor="1">
     <!-- Build library -->
     <sequential>
     <mkdir dir="${build.lib.dir}"/>
@@ -266,6 +265,7 @@
     </sequential>
 
    
+    <parallel threadsPerProcessor="1">
     <!-- Build compiler -->
     <sequential>
     <mkdir dir="${build.comp.dir}"/>
@@ -275,7 +275,7 @@
       deprecation="yes" unchecked="yes"
     >
       <classpath>
-        <pathelement location="${starr.lib.jar}"/>
+        <pathelement location="${build.lib.dir}"/>
         <pathelement location="${ant.jar}"/>
         <path refid="starr.classpath"/>
       </classpath>
@@ -292,8 +292,8 @@
       deprecation="yes" unchecked="yes"
     >
       <classpath>
-        <pathelement location="${starr.lib.jar}"/>
-        <pathelement location="${starr.comp.jar}"/>
+        <pathelement location="${build.lib.dir}"/>
+	<pathelement location="${starr.comp.jar}"/>
       </classpath>
       <include name="**/*.scala"/>
     </scalac>
@@ -315,7 +315,7 @@
       deprecation="yes" unchecked="yes"
     >
       <classpath>
-        <pathelement location="${starr.lib.jar}"/>
+        <pathelement location="${build.lib.dir}"/>
       </classpath>
       <include name="**/*.scala"/>
     </scalac>
@@ -548,7 +548,7 @@
     <scalac srcdir="${topdir}/src/manual" destdir="${build.manual.dir}"
       deprecation="yes" unchecked="yes">
       <classpath>
-        <path refid="starr.classpath"/>
+	<pathelement location="${build.lib.dir}"/>
       </classpath>
     </scalac>
     <emit command="scala"/>
-- 
cgit v1.2.3