From ddf531d93473f8c10ae563ca28959c5993e0d8e2 Mon Sep 17 00:00:00 2001
From: Geoffrey Washburn <geoffrey.washburn@epfl.ch>
Date: Sun, 18 May 2008 12:53:20 +0000
Subject: Applying the one half of Miles's patch.

---
 .classpath           | 11 ++++------
 META-INF/MANIFEST.MF | 58 +++++++++++-----------------------------------------
 build.xml            | 35 ++++++++++++++++++++++++++++---
 3 files changed, 48 insertions(+), 56 deletions(-)

diff --git a/.classpath b/.classpath
index dba8b04d19..bb255263fc 100644
--- a/.classpath
+++ b/.classpath
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/compiler"/>
-	<classpathentry kind="lib" path="build/quick/lib/compiler/"/>
-	<classpathentry kind="lib" path="lib/fjbg.jar"/>
-	<classpathentry kind="lib" path="lib/msil.jar"/>
-	<classpathentry kind="lib" path="lib/ant/ant-contrib.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="build/quick/lib/library" sourcepath="src/library"/>
+	<classpathentry kind="lib" path="lib/msil.jar"/>
 	<classpathentry kind="lib" path="lib/jline.jar"/>
-	<classpathentry kind="output" path="build/quick/lib/compiler"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="lib" path="lib/fjbg.jar"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 3cef577de5..4f9e9bb8d3 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,52 +1,16 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Scala Distribution
-Bundle-SymbolicName: scala;singleton:=true
-Bundle-Version: 2.6.1.B1
+Bundle-SymbolicName: scala.tools.nsc;singleton:=true
+Bundle-Version: 2.7.1.final
 Eclipse-LazyStart: true
-Bundle-ClassPath: lib/fjbg.jar,
- lib/msil.jar,
- lib/,
- build/quick/lib/library/,
- build/quick/lib/actors/,
- build/quick/lib/dbc/,
- build/quick/lib/compiler/
-Export-Package: ch.epfl.lamp.fjbg,
- scala,
- scala.collection,
- scala.collection.jcl,
- scala.collection.immutable,
- scala.collection.mutable,
- scala.compat,
- scala.concurrent,
- scala.io,
- scala.mobile,
- scala.ref,
- scala.reflect,
- scala.runtime,
- scala.testing,
- scala.text,
- scala.util,
- scala.util.automata,
- scala.util.grammar,
- scala.util.logging,
- scala.util.parsing,
- scala.util.parsing.ast,
- scala.util.parsing.combinator,
- scala.util.parsing.combinator.lexical,
- scala.util.parsing.combinator.syntactical,
- scala.util.parsing.combinator.testing,
- scala.util.parsing.input,
- scala.util.parsing.json,
- scala.util.parsing.syntax,
- scala.util.regexp,
- scala.xml,
- scala.xml.dtd,
- scala.xml.factory,
- scala.xml.parsing,
- scala.xml.path,
- scala.xml.pull,
- scala.xml.transform,
+Bundle-ClassPath: 
+ .,
+ bin,
+ lib/fjbg.jar,
+ lib/jline.jar,
+ lib/msil.jar
+Export-Package: 
  scala.tools.nsc,
  scala.tools.nsc.util,
  scala.tools.nsc.io,
@@ -55,4 +19,6 @@ Export-Package: ch.epfl.lamp.fjbg,
  scala.tools.nsc.ast,
  scala.tools.nsc.ast.parser,
  scala.tools.nsc.reporters
-Require-Bundle: org.apache.ant
+Require-Bundle: 
+ org.apache.ant,
+ scala.library
diff --git a/build.xml b/build.xml
index c47bc7889f..dd0446a839 100644
--- a/build.xml
+++ b/build.xml
@@ -513,7 +513,25 @@ PACKED QUICK BUILD (PACK)
     </jar>
   </target>
   
-  <target name="pack.pre-comp" depends="pack.lib">
+  <target name="pack.pre-libsrc" depends="pack.start">
+    <uptodate
+      property="pack.libsrc.available"
+      targetfile="${build-pack.dir}/lib/scala-library-src.jar"
+      srcfile="${build-quick.dir}/librarysrc.complete"/>
+  </target>
+
+	<target name="pack.libsrc" depends="pack.pre-libsrc">
+    <mkdir dir="${build-pack.dir}/src"/>
+    <jar destfile="${build-pack.dir}/src/scala-library-src.jar">
+      <fileset dir="${src.dir}/library"/>
+      <fileset dir="${src.dir}/actors"/>
+    </jar>
+    <jar destfile="${build-pack.dir}/src/scala-dbc-src.jar">
+      <fileset dir="${src.dir}/dbc"/>
+    </jar>
+  </target>
+
+	<target name="pack.pre-comp" depends="pack.lib">
     <uptodate
       property="pack.comp.available"
       targetfile="${build-pack.dir}/lib/scala-compiler.jar"
@@ -521,8 +539,13 @@ PACKED QUICK BUILD (PACK)
   </target>
 
   <target name="pack.comp" depends="pack.pre-comp" unless="pack.comp.available">
-    <mkdir dir="${build-pack.dir}/lib"/>
-    <jar destfile="${build-pack.dir}/lib/scala-compiler.jar">
+    <mkdir dir="${build-pack.dir}/META-INF"/>
+    <copy file="META-INF/MANIFEST.MF" toDir="${build-pack.dir}/META-INF"/>
+    <manifest file="${build-pack.dir}/META-INF/MANIFEST.MF" mode="update">
+      <attribute name="Bundle-Version" value="${version.number}"/>
+    </manifest>
+  	<mkdir dir="${build-pack.dir}/lib"/>
+    <jar destfile="${build-pack.dir}/lib/scala-compiler.jar" manifest="${build-pack.dir}/META-INF/MANIFEST.MF">
       <fileset dir="${build-quick.dir}/classes/compiler"/>
       <zipfileset src="${fjbg.jar}"/>
       <zipfileset src="${msil.jar}"/>
@@ -597,6 +620,12 @@ PACKED QUICK BUILD (PACK)
     <delete dir="${build-pack.dir}" includeemptydirs="yes" quiet="yes" failonerror="no"/>
   </target>
 
+<!-- ===========================================================================
+PACKED QUICK BUILD FOR ECLIPSE PLUGIN DEVELOPMENT (PLUGIN)
+============================================================================ -->
+
+  <target name="plugin.quick" depends="pack.lib, pack.libsrc"/>
+
 <!-- ===========================================================================
 BOOTSTRAPPING BUILD (STRAP)
 ============================================================================ -->
-- 
cgit v1.2.3