From 3d115bd2a4191c28e6d8a9c2633740288479cec7 Mon Sep 17 00:00:00 2001
From: Martin Odersky <odersky@gmail.com>
Date: Mon, 2 Nov 2009 16:48:56 +0000
Subject: Fixed #2545.

---
 build.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 51c610296d..272bcdcd9a 100644
--- a/build.xml
+++ b/build.xml
@@ -516,6 +516,18 @@ QUICK BUILD (QUICK)
         <pathelement location="${build-quick.dir}/classes/library"/>
       </compilationpath>
     </scalacfork>
+    <scalacfork
+      destdir="${build-quick.dir}/classes/library"
+      compilerpathref="locker.classpath"
+      srcpath="${src.dir}/library"
+      params="${scalac.args.quick}"
+      srcdir="${src.dir}/swing"
+      jvmargs="${scalacfork.jvmargs}">
+      <include name="scala/swing/package.scala"/>
+      <compilationpath>
+        <pathelement location="${build-quick.dir}/classes/library"/>
+      </compilationpath>
+    </scalacfork>
     <scalacfork
       destdir="${build-quick.dir}/classes/library"
       compilerpathref="locker.classpath"
@@ -524,6 +536,7 @@ QUICK BUILD (QUICK)
       srcdir="${src.dir}/swing"
       jvmargs="${scalacfork.jvmargs}">
       <include name="**/*.scala"/>
+      <exclude name="scala/swing/package.scala"/>
       <compilationpath>
         <pathelement location="${build-quick.dir}/classes/library"/>
       </compilationpath>
@@ -963,6 +976,14 @@ BOOTSTRAPPING BUILD (STRAP)
       addparams="${scalac.args.all}">
       <include name="**/*.scala"/>
     </scalac>
+    <scalac
+      srcdir="${src.dir}/swing"
+      destdir="${build-strap.dir}/classes/library"
+      classpath="${build-strap.dir}/classes/library"
+      target="jvm-1.5"
+      addparams="${scalac.args.all}">
+      <include name="scala/swing/package.scala"/>
+    </scalac>
     <scalac
       srcdir="${src.dir}/swing"
       destdir="${build-strap.dir}/classes/library"
@@ -970,6 +991,7 @@ BOOTSTRAPPING BUILD (STRAP)
       target="jvm-1.5"
       addparams="${scalac.args.all}">
       <include name="**/*.scala"/>
+      <exclude name="scala/swing/package.scala"/>
     </scalac>
     <propertyfile file="${build-strap.dir}/classes/library/library.properties">
       <entry key="version.number" value="${version.number}"/>
-- 
cgit v1.2.3