diff options
| author | James Iry <james.iry@typesafe.com> | 2012-12-06 22:36:20 -0800 |
|---|---|---|
| committer | James Iry <james.iry@typesafe.com> | 2012-12-06 22:36:20 -0800 |
| commit | 868fe64b3608a07f3a6af7a096b7d7e4cdcc5421 (patch) | |
| tree | 6d946bb379f95dcc55f1a189c50dbb4dcb72aa71 /src/eclipse | |
| parent | a725494c6186653f2a383e014ba85cb8b2bab1ea (diff) | |
| download | scala-868fe64b3608a07f3a6af7a096b7d7e4cdcc5421.tar.gz scala-868fe64b3608a07f3a6af7a096b7d7e4cdcc5421.tar.bz2 scala-868fe64b3608a07f3a6af7a096b7d7e4cdcc5421.zip | |
SI-6766 Makes the -Pcontinuations:enable flag a project specific preference
Make the continuations plugin flag specific to the continuations library.
Remove the documentation about adding the continuation plugin from
the eclipse README.md.
One consequence of this change is that if a programmer has prefs
for the continuations eclipse project then there will be a merge conflict.
That's unavoidable without having a more sophisticated way to build
the eclipse projects.
Diffstat (limited to 'src/eclipse')
| -rw-r--r-- | src/eclipse/README.md | 6 | ||||
| -rw-r--r-- | src/eclipse/continuations-library/.settings/org.scala-ide.sdt.core.prefs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/eclipse/README.md b/src/eclipse/README.md index 814c0144c6..39a3f457a0 100644 --- a/src/eclipse/README.md +++ b/src/eclipse/README.md @@ -20,9 +20,7 @@ JDK. The Scala library uses such APIs, so you'd see this error: You can *fix* it by allowing calls to restricted APIs in `Java=>Compiler=>Errors/Warnings=>Deprecated and Restricted API` settings. -3. We need to build the continuations library for some dependencies and that library requires the continuations plugin to be enabled. In preferences go to Scala=>Compiler and add "continuations:enable" to the P parameter. - -4. The IDE guesses the Scala library version by looking for `library.properties` inside +3. The IDE guesses the Scala library version by looking for `library.properties` inside the library jar. The `scala-library` project does not have such a file, so you will see an error about incompatible libraries. You can work around it by adding a `library.properties` inside `src/library` with the following contents: @@ -33,7 +31,7 @@ inside `src/library` with the following contents: osgi.version.number=2.10.0.v20120603-141530-b34313db72 copyright.string=Copyright 2002-2012 LAMP/EPFL -5. Project files are tracked by Git, so adding them to `.gitignore` won't prevent them +4. Project files are tracked by Git, so adding them to `.gitignore` won't prevent them from being shown as dirty in `git status`. You can still ignore them by telling Git to consider them unchanged: diff --git a/src/eclipse/continuations-library/.settings/org.scala-ide.sdt.core.prefs b/src/eclipse/continuations-library/.settings/org.scala-ide.sdt.core.prefs new file mode 100644 index 0000000000..63e1df247f --- /dev/null +++ b/src/eclipse/continuations-library/.settings/org.scala-ide.sdt.core.prefs @@ -0,0 +1,2 @@ +P=continuations\:enable +scala.compiler.useProjectSettings=true |