diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-12 10:45:10 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-12 14:25:15 -0700 |
| commit | e39e0011bba5e2c9f5f81758a875312ed15d8194 (patch) | |
| tree | 0ec352d3cf97a5f51512e884e2c6cdf04729899a /src | |
| parent | 5262cd5422a49336a546b2ac08c307f2a0a9c606 (diff) | |
| download | scala-e39e0011bba5e2c9f5f81758a875312ed15d8194.tar.gz scala-e39e0011bba5e2c9f5f81758a875312ed15d8194.tar.bz2 scala-e39e0011bba5e2c9f5f81758a875312ed15d8194.zip | |
update eclipse projects (partest, repl & scaladoc)
Since we've removed scala.annotations.serializable in 2.11,
you'll need to following bandaid to use eclipse on master.
This is the easiest fix, but certainly not recommended in general.
```
--- i/src/eclipse/scala-library/.classpath
+++ w/src/eclipse/scala-library/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="library"/>
- <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
+ <classpathentry exported="true" kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
```
This corresponds to checking the export check box for the scala library jar
in the library's build path.
Diffstat (limited to 'src')
| -rw-r--r-- | src/eclipse/partest/.classpath | 1 | ||||
| -rw-r--r-- | src/eclipse/repl/.classpath | 11 | ||||
| -rw-r--r-- | src/eclipse/repl/.project | 35 | ||||
| -rw-r--r-- | src/eclipse/scaladoc/.classpath | 4 |
4 files changed, 51 insertions, 0 deletions
diff --git a/src/eclipse/partest/.classpath b/src/eclipse/partest/.classpath index 75a9fae19a..a990c5a1b3 100644 --- a/src/eclipse/partest/.classpath +++ b/src/eclipse/partest/.classpath @@ -10,5 +10,6 @@ <classpathentry kind="lib" path="lib/jline.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/asm"/> <classpathentry combineaccessrules="false" kind="src" path="/continuations-library"/> + <classpathentry combineaccessrules="false" kind="src" path="/repl"/> <classpathentry kind="output" path="build-quick-partest"/> </classpath> diff --git a/src/eclipse/repl/.classpath b/src/eclipse/repl/.classpath new file mode 100644 index 0000000000..30744da306 --- /dev/null +++ b/src/eclipse/repl/.classpath @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="repl"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry combineaccessrules="false" kind="src" path="/reflect"/> + <classpathentry combineaccessrules="false" kind="src" path="/scala-compiler"/> + <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/> + <classpathentry kind="var" path="SCALA_BASEDIR/lib/jline.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/asm"/> + <classpathentry kind="output" path="build-quick-repl"/> +</classpath> diff --git a/src/eclipse/repl/.project b/src/eclipse/repl/.project new file mode 100644 index 0000000000..ea188bc262 --- /dev/null +++ b/src/eclipse/repl/.project @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>repl</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>build-quick-repl</name> + <type>2</type> + <locationURI>SCALA_BASEDIR/build/quick/classes/repl</locationURI> + </link> + <link> + <name>lib</name> + <type>2</type> + <locationURI>SCALA_BASEDIR/lib</locationURI> + </link> + <link> + <name>repl</name> + <type>2</type> + <locationURI>SCALA_BASEDIR/src/repl</locationURI> + </link> + </linkedResources> +</projectDescription> diff --git a/src/eclipse/scaladoc/.classpath b/src/eclipse/scaladoc/.classpath index 422b8fbb07..f12ba4bb2c 100644 --- a/src/eclipse/scaladoc/.classpath +++ b/src/eclipse/scaladoc/.classpath @@ -1,9 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry combineaccessrules="false" kind="src" path="/partest"/> <classpathentry kind="src" path="scaladoc"/> <classpathentry combineaccessrules="false" kind="src" path="/reflect"/> <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/> <classpathentry combineaccessrules="false" kind="src" path="/scala-compiler"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="SCALA_BASEDIR/lib/ant/ant.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/continuations-library"/> + <classpathentry combineaccessrules="false" kind="src" path="/asm"/> <classpathentry kind="output" path="build-quick-scaladoc"/> </classpath> |