diff options
| author | Paul Phillips <paulp@improving.org> | 2012-12-06 12:13:35 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-12-06 12:13:35 -0800 |
| commit | 330c77b097782ed389a83175302379ea72d22c41 (patch) | |
| tree | 8c7a1eb9f25d724b27d5ca33704ccb43bc0a7cb9 /src/eclipse | |
| parent | b1cb6578bdbdfaa66d3cf09f40dfc1511f7e9711 (diff) | |
| parent | 06844ee821ae500c7485498cc2054e3cf765623f (diff) | |
| download | scala-330c77b097782ed389a83175302379ea72d22c41.tar.gz scala-330c77b097782ed389a83175302379ea72d22c41.tar.bz2 scala-330c77b097782ed389a83175302379ea72d22c41.zip | |
Merge commit 'refs/pull/1717/head' into merge-msil-genjvm-delete
* commit 'refs/pull/1717/head':
SI-6769 Removes GenJVM backend
Conflicts:
src/compiler/scala/tools/nsc/backend/jvm/GenAndroid.scala
Diffstat (limited to 'src/eclipse')
| -rw-r--r-- | src/eclipse/README.md | 2 | ||||
| -rw-r--r-- | src/eclipse/fjbg/.classpath | 7 | ||||
| -rw-r--r-- | src/eclipse/fjbg/.project | 30 | ||||
| -rw-r--r-- | src/eclipse/scala-compiler/.classpath | 1 |
4 files changed, 1 insertions, 39 deletions
diff --git a/src/eclipse/README.md b/src/eclipse/README.md index 39a3f457a0..d135f99418 100644 --- a/src/eclipse/README.md +++ b/src/eclipse/README.md @@ -44,7 +44,7 @@ If you want to go back to normal (for instance, to commit your changes to projec DETAILS ======= -The compiler project depends on the library, reflect, asm and fjbg projects. The +The compiler project depends on the library, reflect, and asm projects. The builder will take care of the correct ordering, and changes in one project will be picked up by the dependent projects. diff --git a/src/eclipse/fjbg/.classpath b/src/eclipse/fjbg/.classpath deleted file mode 100644 index 3e2f55f48a..0000000000 --- a/src/eclipse/fjbg/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="fjbg"/> - <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="output" path="libs-classes-fjbg"/> -</classpath> diff --git a/src/eclipse/fjbg/.project b/src/eclipse/fjbg/.project deleted file mode 100644 index 8acea9f5fe..0000000000 --- a/src/eclipse/fjbg/.project +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>fjbg</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.scala-ide.sdt.core.scalabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.scala-ide.sdt.core.scalanature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> - <linkedResources> - <link> - <name>fjbg</name> - <type>2</type> - <locationURI>SCALA_BASEDIR/src/fjbg</locationURI> - </link> - <link> - <name>libs-classes-fjbg</name> - <type>2</type> - <locationURI>SCALA_BASEDIR/build/libs/classes/fjbg</locationURI> - </link> - </linkedResources> -</projectDescription> diff --git a/src/eclipse/scala-compiler/.classpath b/src/eclipse/scala-compiler/.classpath index 40a4ed9996..e6af46c68f 100644 --- a/src/eclipse/scala-compiler/.classpath +++ b/src/eclipse/scala-compiler/.classpath @@ -3,7 +3,6 @@ <classpathentry kind="src" path="compiler"/> <classpathentry combineaccessrules="false" kind="src" path="/reflect"/> <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/> - <classpathentry combineaccessrules="false" kind="src" path="/fjbg"/> <classpathentry combineaccessrules="false" kind="src" path="/asm"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="lib/ant/ant.jar"/> |