Merge pull request #1724 from paulp/merge-msil-genjvm-delete

Merge msil and genjvm deletions.
scala · Dec 9, 2012 · 1347ff1 · 1347ff1
2 parents b1cb657 + e8d6f5e
commit 1347ff1
Show file tree

Hide file tree

Showing 168 changed files with 120 additions and 29,786 deletions.
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
@@ -7,9 +7,7 @@ Eclipse-LazyStart: true
 Bundle-ClassPath: 
  .,
  bin,
- lib/fjbg.jar,
  lib/jline.jar,
- lib/msil.jar
 Export-Package: 
  scala.tools.nsc,
  scala.tools.nsc.ast,
@@ -47,11 +45,6 @@ Export-Package:
  scala.reflect.runtime,
  scala.reflect.internal.transform,
  scala.reflect.api,
- ch.epfl.lamp.compiler.msil,
- ch.epfl.lamp.compiler.msil.emit,
- ch.epfl.lamp.compiler.msil.util,
- ch.epfl.lamp.fjbg,
- ch.epfl.lamp.util
 Require-Bundle: 
  org.apache.ant,
  org.scala-ide.scala.library

diff --git a/README.rst b/README.rst
@@ -18,7 +18,6 @@ build script or user-created if needed.  This is not a complete listing. ::
    +--dist/                     The destination folder for Scala distributions.
    +--docs/                     Documentation and sample code.
    +--lib/                      Pre-compiled libraries for the build.
-   |   +--fjbg.jar              The Java byte-code generation library.
    |   +--scala-compiler.jar    The stable reference ('starr') compiler jar
    |   +--scala-library.jar     The stable reference ('starr') library jar
    |   +--scala-library-src.jar A snapshot of the source used to build starr.

diff --git a/build.detach.xml b/build.detach.xml
@@ -11,7 +11,7 @@ SuperSabbus for Scala detach plugin.
 <!-- ===========================================================================
 END-USER TARGETS
 ============================================================================ -->
-  
+
   <target name="build" depends="pack.done"
     description="Builds the Scala detach plugin."/>
 
@@ -72,8 +72,6 @@ QUICK BUILD (QUICK)
     <path id="quick.classpath">
       <pathelement location="${build-quick.dir}/classes/library"/>
       <pathelement location="${build-quick.dir}/classes/compiler"/>
-      <pathelement location="${lib.dir}/fjbg.jar"/>
-      <pathelement location="${lib.dir}/msil.jar"/>
       <pathelement location="${lib.dir}/forkjoin.jar"/>
       <pathelement location="${ant.home}/lib/ant.jar"/>
     </path>
@@ -120,9 +118,9 @@ QUICK BUILD (QUICK)
 <!-- ===========================================================================
 PACKED QUICK BUILD (PACK)
 ============================================================================ -->
-  
+
   <target name="pack.start" depends="quick.done"/>
-  
+
   <target name="pack.pre-lib" depends="pack.start">
     <uptodate
       property="pack.lib.available"

diff --git a/build.examples.xml b/build.examples.xml
@@ -28,10 +28,6 @@ PROPERTIES
   <!-- Location of pre-compiled libraries properties -->
   <property name="scala.lib.jar"      value="${lib.dir}/scala-library.jar"/>
   <property name="scala.comp.jar"     value="${lib.dir}/scala-compiler.jar"/>
-  <property name="fjbg.name"          value="fjbg.jar"/>
-  <property name="fjbg.jar"           value="${lib.dir}/${fjbg.name}"/>
-  <property name="msil.name"          value="msil.jar"/>
-  <property name="msil.jar"           value="${lib.dir}/${msil.name}"/>
   <property name="ant.jar"            value="${ant.home}/lib/ant.jar"/>
   <property name="ant-contrib.jar"    value="${lib.dir}/ant/ant-contrib.jar"/>
   <!-- -->
@@ -59,7 +55,7 @@ INITIALISATION
     <fail message="Scala library in '${lib.dir}/' is not available">
       <condition><not><and>
         <available
-          classname="scala.Predef" 
+          classname="scala.Predef"
           classpath="${scala.lib.jar}"
         />
         <available
@@ -81,24 +77,6 @@ INITIALISATION
         />
       </not></condition>
     </fail>
-    <echo level="verbose" message="fjbg.jar=${fjbg.jar}"/>
-    <fail message="FJBG library in '${lib.dir}/' is not available">
-      <condition><not>
-        <available
-          classname="ch.epfl.lamp.fjbg.JCode"
-          classpath="${fjbg.jar}"
-        />
-      </not></condition>
-    </fail>
-    <echo level="verbose" message="msil.jar=${msil.jar}"/>
-    <fail message="MSIL library in '${lib.dir}/' is not available">
-      <condition><not>
-        <available
-          classname="ch.epfl.lamp.compiler.msil.MemberInfo"
-          classpath="${msil.jar}"
-        />
-      </not></condition>
-    </fail>
     <echo level="verbose" message="ant.jar=${ant.jar}"/>
     <echo level="verbose" message="ant-contrib.jar=${ant-contrib.jar}"/>
     <fail message="Additional Ant tasks in '${lib.dir}/' is not available">
@@ -110,14 +88,9 @@ INITIALISATION
       </not></condition>
     </fail>
     <!-- Creating class-pathes -->
-    <path id="common.classpath">
-      <pathelement location="${fjbg.jar}"/>
-      <pathelement location="${msil.jar}"/>
-    </path>
     <path id="scala.classpath">
       <pathelement location="${scala.lib.jar}"/>
       <pathelement location="${scala.comp.jar}"/>
-      <path refid="common.classpath"/>
     </path>
     <!-- Creating boot-level tasks -->
     <taskdef resource="net/sf/antcontrib/antlib.xml">