diff --git a/src/eclipse/README.md b/src/eclipse/README.md deleted file mode 100644 index 5311651db545..000000000000 --- a/src/eclipse/README.md +++ /dev/null @@ -1,88 +0,0 @@ -Eclipse project files -===================== - -The following points describe how to get Scala to run in Eclipse: - -0. To get Scala to work inside of Eclipse Kepler it is necessary to build the Scala IDE by your own -because for the moment there is no update site provided for the newest development version -of Scala. To do so enter the following commands one after the other: - - git clone https://github.com/scala-ide/scala-ide.git - cd scala-ide - ./build-all.sh clean install -Pscala-2.11.x -Peclipse-kepler -DskipTests - - After that you have an update site in `scala-ide/org.scala-ide.sdt.update-site/target/site`, which needs to be -installed in Eclipse. - -0. The second thing that needs to be done is building Scala in order to get all necessary -dependencies. To do that simply enter - - ant - - and wait until it is completed. To verify that everything has been built successfully, execute the REPL that can be found -at `scala/build/pack/bin/scala`. - -0. Import all projects inside of Eclipse by choosing `File/Import Existing Projects` -and navigate to `scala/src/eclipse`. Check all projects and click ok. - -0. You need to define a `path variable` inside Eclipse. Define `SCALA_BASEDIR` in -`Preferences/General/Workspace/Linked Resources`. The value should be the absolute -path to your Scala checkout. All paths in the project files are relative to this one, -so nothing will work before you do so. - - The same `SCALA_BASEDIR` variable needs to be defined as a `classpath variable` in -`Java/Build Path/Classpath Variables`. - - Additionally, we start using Maven dependencies (e.g. `JUnit`) so you need to define another -`classpath variable` inside Eclipse. Define `M2_REPO` in `Java/Build Path/Classpath Variables` -to point to your local Maven repository (e.g. `$HOME/.m2/repository`). - - Lastly, the JRE used by Eclipse needs to know the path to the `JLine` library, which is used by the REPL. -To set the JAR file, navigate to `Java/Installed JREs`, select the default JRE, press `Edit/Add External JARs...` -and enter the path to JLine whose location is `SCALA_BASEDIR/build/deps/repl/jline-2.11.jar` (`SCALA_BASEDIR` cannot be entered, -it needs to be replaced with its absolute path). - -0. The Eclipse Java compiler does not allow certain calls to restricted APIs in the -JDK. The Scala library uses such APIs, so you'd see this error: - - Access restriction: The method compareAndSwapObject(Object, long, Object, Object) - from the type Unsafe is not accessible due to restriction on required library. - - You can *fix* it by allowing calls to restricted APIs in `Java/Compiler/Errors/Warnings/Deprecated and Restricted API` -settings. - -0. 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: - - git update-index --assume-unchanged `find src/eclipse -iname .classpath -or -iname .project` - - If you want to go back to normal (for instance, to commit your changes to project files), run: - - git update-index --no-assume-unchanged `find src/eclipse -iname .classpath -or -iname .project` - -If it doesn’t compile -===================== - -The likely reason is that the build path of the imported projects isn’t correct. This can happen for instance -when the [version.properties](https://github.com/scala/scala/blob/master/versions.properties) file is updated, -and Eclipse .classpath of the different projects isn’t updated accordingly. The fix is simple, manually inspect -the build path of each project and make sure the version of the declared dependencies is in sync with the version -declared in the `version.properties` file. If it isn’t, update it manually and, when done, don’t forget to share -your changes via a pull request. -(We are aware this is cumbersome. If you feel like scripting the process, pull requests are of course welcome.) - -Launching & Debugging scalac -============================ - -Read [here](http://scala-ide.org/docs/tutorials/scalac-trunk/index.html#Launching_and_Debugging_scalac). - -DETAILS -======= - -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. - -The output directory is set to be `build/quick`, so the runner scripts in quick -work as they are (they are generated after an ant build). diff --git a/src/eclipse/asm/.classpath b/src/eclipse/asm/.classpath deleted file mode 100644 index 03d9e9788dc8..000000000000 --- a/src/eclipse/asm/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/eclipse/asm/.project b/src/eclipse/asm/.project deleted file mode 100644 index c9051389af21..000000000000 --- a/src/eclipse/asm/.project +++ /dev/null @@ -1,29 +0,0 @@ - - - asm - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - - - src - 2 - SCALA_BASEDIR/src/asm - - - asm-quick-bin - 2 - SCALA_BASEDIR/build/asm/classes - - - diff --git a/src/eclipse/interactive/.classpath b/src/eclipse/interactive/.classpath deleted file mode 100644 index 9e773a39d2cb..000000000000 --- a/src/eclipse/interactive/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/eclipse/interactive/.project b/src/eclipse/interactive/.project deleted file mode 100644 index 1d30e0c001f9..000000000000 --- a/src/eclipse/interactive/.project +++ /dev/null @@ -1,35 +0,0 @@ - - - interactive - - - - - - org.scala-ide.sdt.core.scalabuilder - - - - - - org.scala-ide.sdt.core.scalanature - org.eclipse.jdt.core.javanature - - - - build-quick-interactive - 2 - SCALA_BASEDIR/build/quick/classes/interactive - - - interactive - 2 - SCALA_BASEDIR/src/interactive - - - lib - 2 - SCALA_BASEDIR/lib - - - diff --git a/src/eclipse/partest/.classpath b/src/eclipse/partest/.classpath deleted file mode 100644 index 7f28868d95ee..000000000000 --- a/src/eclipse/partest/.classpath +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/eclipse/partest/.project b/src/eclipse/partest/.project deleted file mode 100644 index 5c0c851b80d3..000000000000 --- a/src/eclipse/partest/.project +++ /dev/null @@ -1,35 +0,0 @@ - - - partest-extras - - - - - - org.scala-ide.sdt.core.scalabuilder - - - - - - org.scala-ide.sdt.core.scalanature - org.eclipse.jdt.core.javanature - - - - build-quick-partest-extras - 2 - SCALA_BASEDIR/build/quick/classes/partest-extras - - - lib - 2 - SCALA_BASEDIR/lib - - - partest-extras - 2 - SCALA_BASEDIR/src/partest-extras - - - diff --git a/src/eclipse/reflect/.classpath b/src/eclipse/reflect/.classpath deleted file mode 100644 index 3f14621da79f..000000000000 --- a/src/eclipse/reflect/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/eclipse/reflect/.project b/src/eclipse/reflect/.project deleted file mode 100644 index 1e5cbb4ed9a3..000000000000 --- a/src/eclipse/reflect/.project +++ /dev/null @@ -1,30 +0,0 @@ - - - reflect - - - - - - org.scala-ide.sdt.core.scalabuilder - - - - - - org.scala-ide.sdt.core.scalanature - org.eclipse.jdt.core.javanature - - - - build-quick-reflect - 2 - SCALA_BASEDIR/build/quick/classes/reflect - - - reflect - 2 - SCALA_BASEDIR/src/reflect - - - diff --git a/src/eclipse/repl/.classpath b/src/eclipse/repl/.classpath deleted file mode 100644 index 8ff9aabfbf0b..000000000000 --- a/src/eclipse/repl/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/eclipse/repl/.project b/src/eclipse/repl/.project deleted file mode 100644 index 69ad08ab1ad9..000000000000 --- a/src/eclipse/repl/.project +++ /dev/null @@ -1,35 +0,0 @@ - - - repl - - - - - - org.scala-ide.sdt.core.scalabuilder - - - - - - org.scala-ide.sdt.core.scalanature - org.eclipse.jdt.core.javanature - - - - build-quick-repl - 2 - SCALA_BASEDIR/build/quick/classes/repl - - - lib - 2 - SCALA_BASEDIR/lib - - - repl - 2 - SCALA_BASEDIR/src/repl - - - diff --git a/src/eclipse/scala-compiler/.classpath b/src/eclipse/scala-compiler/.classpath deleted file mode 100644 index e81cacca26bd..000000000000 --- a/src/eclipse/scala-compiler/.classpath +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/eclipse/scala-compiler/.project b/src/eclipse/scala-compiler/.project deleted file mode 100644 index cf8a68c8b68f..000000000000 --- a/src/eclipse/scala-compiler/.project +++ /dev/null @@ -1,35 +0,0 @@ - - - scala-compiler - - - - - - org.scala-ide.sdt.core.scalabuilder - - - - - - org.scala-ide.sdt.core.scalanature - org.eclipse.jdt.core.javanature - - - - build-quick-compiler - 2 - SCALA_BASEDIR/build/quick/classes/compiler - - - compiler - 2 - SCALA_BASEDIR/src/compiler - - - lib - 2 - SCALA_BASEDIR/lib - - - diff --git a/src/eclipse/scala-library/.classpath b/src/eclipse/scala-library/.classpath deleted file mode 100644 index eff3c8e0b713..000000000000 --- a/src/eclipse/scala-library/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/eclipse/scala-library/.project b/src/eclipse/scala-library/.project deleted file mode 100644 index 049cf75e0b93..000000000000 --- a/src/eclipse/scala-library/.project +++ /dev/null @@ -1,30 +0,0 @@ - - - scala-library - - - - - - org.scala-ide.sdt.core.scalabuilder - - - - - - org.scala-ide.sdt.core.scalanature - org.eclipse.jdt.core.javanature - - - - build-quick-lib - 2 - SCALA_BASEDIR/build/quick/classes/library - - - library - 2 - SCALA_BASEDIR/src/library - - - diff --git a/src/eclipse/scaladoc/.classpath b/src/eclipse/scaladoc/.classpath deleted file mode 100644 index c8f0e89b8a8c..000000000000 --- a/src/eclipse/scaladoc/.classpath +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/eclipse/scaladoc/.project b/src/eclipse/scaladoc/.project deleted file mode 100644 index bf7649039f09..000000000000 --- a/src/eclipse/scaladoc/.project +++ /dev/null @@ -1,35 +0,0 @@ - - - scaladoc - - - - - - org.scala-ide.sdt.core.scalabuilder - - - - - - org.scala-ide.sdt.core.scalanature - org.eclipse.jdt.core.javanature - - - - build-quick-scaladoc - 2 - SCALA_BASEDIR/build/quick/classes/scaladoc - - - lib - 2 - SCALA_BASEDIR/lib - - - scaladoc - 2 - SCALA_BASEDIR/src/scaladoc - - - diff --git a/src/eclipse/scalap/.classpath b/src/eclipse/scalap/.classpath deleted file mode 100644 index 3b635cf56e29..000000000000 --- a/src/eclipse/scalap/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/eclipse/scalap/.project b/src/eclipse/scalap/.project deleted file mode 100644 index 3599168e324c..000000000000 --- a/src/eclipse/scalap/.project +++ /dev/null @@ -1,35 +0,0 @@ - - - scalap - - - - - - org.scala-ide.sdt.core.scalabuilder - - - - - - org.scala-ide.sdt.core.scalanature - org.eclipse.jdt.core.javanature - - - - build-quick-scalap - 2 - SCALA_BASEDIR/build/quick/classes/scalap - - - lib - 2 - SCALA_BASEDIR/lib - - - scalap - 2 - SCALA_BASEDIR/src/scalap - - - diff --git a/src/eclipse/test-junit/.classpath b/src/eclipse/test-junit/.classpath deleted file mode 100644 index 8a599bd8c740..000000000000 --- a/src/eclipse/test-junit/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/eclipse/test-junit/.project b/src/eclipse/test-junit/.project deleted file mode 100644 index 052b6c1b6fde..000000000000 --- a/src/eclipse/test-junit/.project +++ /dev/null @@ -1,35 +0,0 @@ - - - test-junit - - - - - - org.scala-ide.sdt.core.scalabuilder - - - - - - org.scala-ide.sdt.core.scalanature - org.eclipse.jdt.core.javanature - - - - build-test-junit - 2 - SCALA_BASEDIR/build/junit/classes - - - lib - 2 - SCALA_BASEDIR/lib - - - test-junit - 2 - SCALA_BASEDIR/test/junit - - - diff --git a/src/intellij/README b/src/intellij/README deleted file mode 100644 index a39691f4f066..000000000000 --- a/src/intellij/README +++ /dev/null @@ -1,12 +0,0 @@ -Use the latest IntelliJ IDEA release and install the Scala plugin from within the IDE. - -Compilation withing IDEA is performed in "-Dlocker.skip=1" mode: the sources are built -directly using the STARR compiler. - -The following steps are required to use IntelliJ IDEA on Scala trunk - - Run "ant init". This will download some JARs from to ./build/deps, which are - included in IntelliJ's classpath. - - Run src/intellij/setup.sh - - Open ./src/intellij/scala-lang.ipr in IntelliJ - - File, Project Settings, Project, SDK. Create an SDK entry named "1.6" containing the - java 1.6 SDK diff --git a/src/intellij/actors.iml.SAMPLE b/src/intellij/actors.iml.SAMPLE deleted file mode 100644 index b15af8b11071..000000000000 --- a/src/intellij/actors.iml.SAMPLE +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/src/intellij/asm.iml.SAMPLE b/src/intellij/asm.iml.SAMPLE deleted file mode 100644 index ba9e7e899fff..000000000000 --- a/src/intellij/asm.iml.SAMPLE +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/intellij/compiler.iml.SAMPLE b/src/intellij/compiler.iml.SAMPLE deleted file mode 100644 index 50253000ab3c..000000000000 --- a/src/intellij/compiler.iml.SAMPLE +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/intellij/diff.sh b/src/intellij/diff.sh deleted file mode 100755 index 54f9248608fb..000000000000 --- a/src/intellij/diff.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -# -# Diffs the SAMPLE files against the working project config. -# -export SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )" -for f in "$SCRIPT_DIR"/*.{iml,ipr}; do - echo $f; diff -u $f.SAMPLE $f; -done diff --git a/src/intellij/forkjoin.iml.SAMPLE b/src/intellij/forkjoin.iml.SAMPLE deleted file mode 100644 index be807cc01933..000000000000 --- a/src/intellij/forkjoin.iml.SAMPLE +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/intellij/interactive.iml.SAMPLE b/src/intellij/interactive.iml.SAMPLE deleted file mode 100644 index 83178021d311..000000000000 --- a/src/intellij/interactive.iml.SAMPLE +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/intellij/library.iml.SAMPLE b/src/intellij/library.iml.SAMPLE deleted file mode 100644 index 137ce6eb9c04..000000000000 --- a/src/intellij/library.iml.SAMPLE +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/src/intellij/manual.iml.SAMPLE b/src/intellij/manual.iml.SAMPLE deleted file mode 100644 index 8babde73eab3..000000000000 --- a/src/intellij/manual.iml.SAMPLE +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/src/intellij/partest-extras.iml.SAMPLE b/src/intellij/partest-extras.iml.SAMPLE deleted file mode 100644 index c2ada43493e8..000000000000 --- a/src/intellij/partest-extras.iml.SAMPLE +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/intellij/partest-javaagent.iml.SAMPLE b/src/intellij/partest-javaagent.iml.SAMPLE deleted file mode 100644 index e47e0f634940..000000000000 --- a/src/intellij/partest-javaagent.iml.SAMPLE +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/intellij/reflect.iml.SAMPLE b/src/intellij/reflect.iml.SAMPLE deleted file mode 100644 index d206304896d3..000000000000 --- a/src/intellij/reflect.iml.SAMPLE +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/src/intellij/repl.iml.SAMPLE b/src/intellij/repl.iml.SAMPLE deleted file mode 100644 index 83791f4f6e0f..000000000000 --- a/src/intellij/repl.iml.SAMPLE +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/intellij/scala-lang.ipr.SAMPLE b/src/intellij/scala-lang.ipr.SAMPLE deleted file mode 100644 index c0614c946c44..000000000000 --- a/src/intellij/scala-lang.ipr.SAMPLE +++ /dev/null @@ -1,286 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://www.w3.org/1999/xhtml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/intellij/scala.iml.SAMPLE b/src/intellij/scala.iml.SAMPLE deleted file mode 100644 index a4d863800b7d..000000000000 --- a/src/intellij/scala.iml.SAMPLE +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/intellij/scaladoc.iml.SAMPLE b/src/intellij/scaladoc.iml.SAMPLE deleted file mode 100644 index 8f9a0d83443d..000000000000 --- a/src/intellij/scaladoc.iml.SAMPLE +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/intellij/scalap.iml.SAMPLE b/src/intellij/scalap.iml.SAMPLE deleted file mode 100644 index 27ae45136978..000000000000 --- a/src/intellij/scalap.iml.SAMPLE +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/src/intellij/setup.sh b/src/intellij/setup.sh deleted file mode 100755 index ec303778edf7..000000000000 --- a/src/intellij/setup.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -# -# Generates IntelliJ IDEA project files based on the checked-in samples. -# - -set -e -export SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )" -echo "About to delete .ipr and .iml files and replace with the .SAMPLE files. Press enter to continue or CTRL-C to cancel." -read - -for f in "$SCRIPT_DIR"/*.SAMPLE; do - g=${f%.SAMPLE} - cp $f $g -done diff --git a/src/intellij/test-junit.iml.SAMPLE b/src/intellij/test-junit.iml.SAMPLE deleted file mode 100644 index bb51c30a4f6b..000000000000 --- a/src/intellij/test-junit.iml.SAMPLE +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/intellij/test.iml.SAMPLE b/src/intellij/test.iml.SAMPLE deleted file mode 100644 index cb4a8568a17e..000000000000 --- a/src/intellij/test.iml.SAMPLE +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/intellij/update.sh b/src/intellij/update.sh deleted file mode 100755 index eb6fea782f37..000000000000 --- a/src/intellij/update.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash -# -# Updates the .SAMPLE files with the current project files. -# - -set -e -export SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )" - -echo "About to create overwrite the .ipr.SAMPLE and .iml.SAMPLE files with the current project files. Press enter to continue or CTRL-C to cancel." -read - -for f in "$SCRIPT_DIR"/*.{iml,ipr}; do - cp $f $f.SAMPLE -done - -for f in "$SCRIPT_DIR"/*.SAMPLE; do - g=${f%.SAMPLE} - if [[ ! -f $g ]]; then - echo "Stale sample file, deleting $f" - rm $f - fi -done