summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorLex Spoon <lex@lexspoon.org>2008-02-05 16:25:39 +0000
committerLex Spoon <lex@lexspoon.org>2008-02-05 16:25:39 +0000
commitb7470d8225d631ac59aa827c6b249626f1c21b1d (patch)
treee19a7391a36d12bfecfad8c033638d9403c139ce /debian
parente9d163ad64b331daa939f5b016d99660cf69bed6 (diff)
downloadscala-b7470d8225d631ac59aa827c6b249626f1c21b1d.tar.gz
scala-b7470d8225d631ac59aa827c6b249626f1c21b1d.tar.bz2
scala-b7470d8225d631ac59aa827c6b249626f1c21b1d.zip
tweaked the build order and class paths
Diffstat (limited to 'debian')
-rw-r--r--debian/simpbuild.xml12
1 files changed, 6 insertions, 6 deletions
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"/>