diff options
Diffstat (limited to 'src/eclipse')
| -rw-r--r-- | src/eclipse/.gitignore | 2 | ||||
| -rw-r--r-- | src/eclipse/README.md | 7 | ||||
| -rw-r--r-- | src/eclipse/partest/.classpath | 2 | ||||
| -rw-r--r-- | src/eclipse/scaladoc/.classpath | 6 | ||||
| -rw-r--r-- | src/eclipse/test-junit/.classpath | 2 |
5 files changed, 14 insertions, 5 deletions
diff --git a/src/eclipse/.gitignore b/src/eclipse/.gitignore new file mode 100644 index 0000000000..8999e4d839 --- /dev/null +++ b/src/eclipse/.gitignore @@ -0,0 +1,2 @@ +**/.cache-* +**/.settings/ diff --git a/src/eclipse/README.md b/src/eclipse/README.md index d541092361..f67fa26e5e 100644 --- a/src/eclipse/README.md +++ b/src/eclipse/README.md @@ -46,6 +46,13 @@ consider them unchanged: git update-index --no-assume-unchanged `find src/eclipse -iname .classpath -or -iname .project` +0. The 2.12, sources of Scala need to be built with a 2.12 version of the compiler. One can configure a 2.12 Scala installation +in Eclipse. In order to do this, go to `Window -> Preferences -> Scala -> Installations` and add a 2.12 installation. You can +either download a prepackaged version of 2.12 from the Scala homepage or you add the Scala installation that is part of the +`build/pack/lib` directory. The latter is required in case you absolutely need to depend on a nightly build of the compiler to +compile the compiler itself. Once the 2.12 Scala installation is created you need to select all Scala projects, do a right click +and select `Scala -> Set the Scala installation` where you have to choose the newly created 2.12 Scala installation. + If it doesn’t compile ===================== diff --git a/src/eclipse/partest/.classpath b/src/eclipse/partest/.classpath index 4dc5dd77d0..ab9ede5a19 100644 --- a/src/eclipse/partest/.classpath +++ b/src/eclipse/partest/.classpath @@ -9,6 +9,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/scala-compiler"/> <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/> - <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/partest/scala-partest_2.11-1.0.13.jar"/> + <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/partest/scala-partest_2.12.0-M4-1.0.13.jar"/> <classpathentry kind="output" path="build-quick-partest-extras"/> </classpath> diff --git a/src/eclipse/scaladoc/.classpath b/src/eclipse/scaladoc/.classpath index a3d177a751..40387983b0 100644 --- a/src/eclipse/scaladoc/.classpath +++ b/src/eclipse/scaladoc/.classpath @@ -6,8 +6,8 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/scala-compiler"/> <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/> - <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/scaladoc/scala-xml_2.11-1.0.5.jar"/> - <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/scaladoc/scala-parser-combinators_2.11-1.0.4.jar"/> - <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/partest/scala-partest_2.11-1.0.13.jar"/> + <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/scaladoc/scala-xml_2.12.0-M4-1.0.5.jar"/> + <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/scaladoc/scala-parser-combinators_2.12.0-M4-1.0.4.jar"/> + <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/partest/scala-partest_2.12.0-M4-1.0.13.jar"/> <classpathentry kind="output" path="build-quick-scaladoc"/> </classpath> diff --git a/src/eclipse/test-junit/.classpath b/src/eclipse/test-junit/.classpath index a6445caebe..3635c85112 100644 --- a/src/eclipse/test-junit/.classpath +++ b/src/eclipse/test-junit/.classpath @@ -10,7 +10,7 @@ <classpathentry combineaccessrules="false" kind="src" path="/repl"/> <classpathentry combineaccessrules="false" kind="src" path="/partest-extras"/> <classpathentry combineaccessrules="false" kind="src" path="/scaladoc"/> - <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/scaladoc/scala-xml_2.11-1.0.5.jar"/> + <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/scaladoc/scala-xml_2.12.0-M4-1.0.5.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry kind="output" path="build-test-junit"/> </classpath> |