diff options
| author | Seth Tisue <seth@tisue.net> | 2015-10-08 11:10:50 -0400 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2015-10-08 11:12:00 -0400 |
| commit | 37f571355d8516b6391a6f92d644f3753f8b25c3 (patch) | |
| tree | 9729372c656494ff11de53ce199fac86a50c9823 /src/intellij | |
| parent | 5d2c92936ffdab259b71f1adb447602d98222ab2 (diff) | |
| download | scala-37f571355d8516b6391a6f92d644f3753f8b25c3.tar.gz scala-37f571355d8516b6391a6f92d644f3753f8b25c3.tar.bz2 scala-37f571355d8516b6391a6f92d644f3753f8b25c3.zip | |
more readme improvements
* be clearer about required JDK versions
* eliminate redundancy with existing src/eclipse and src/intellij readmes
* give IntelliJ readme a .md extension
Diffstat (limited to 'src/intellij')
| -rw-r--r-- | src/intellij/README | 12 | ||||
| -rw-r--r-- | src/intellij/README.md | 13 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/intellij/README b/src/intellij/README deleted file mode 100644 index 4ecab5561f..0000000000 --- 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.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/README.md b/src/intellij/README.md new file mode 100644 index 0000000000..64e7b8188a --- /dev/null +++ b/src/intellij/README.md @@ -0,0 +1,13 @@ +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 to `./build/deps`, which are included in IntelliJ's classpath. + - Run `./src/intellij/setup.sh`. + - Open `./src/intellij/scala.ipr` in IntelliJ. + - `File` → `Project Structure` → `Project` → `Project SDK`. Create an SDK entry named "1.6" containing the Java 1.6 SDK. (Or other SDK version; see "Requirements" in the repo's main README.) + +Compilation within IDEA is performed in `-Dlocker.skip=1` mode: the sources are built +directly using the STARR compiler (which is downloaded from [the Central Repository](http://central.sonatype.org/), according to `starr.version` in `versions.properties`). |