diff options
author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-16 10:38:54 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-16 10:38:54 -0700 |
commit | 022eed3245db21f5faf06ae6472e585ead137f82 (patch) | |
tree | 6bf63670925002e992ac646198744620aa6ff81d /src | |
parent | 24f583a5f0bf7724b96083ed70e3953de685428c (diff) | |
parent | 65eb59134517ccf6509ef988954965adab550d5a (diff) | |
download | scala-022eed3245db21f5faf06ae6472e585ead137f82.tar.gz scala-022eed3245db21f5faf06ae6472e585ead137f82.tar.bz2 scala-022eed3245db21f5faf06ae6472e585ead137f82.zip |
Merge pull request #908 from lrytz/intellij
updated intellij project files
Diffstat (limited to 'src')
-rw-r--r-- | src/intellij/README | 11 | ||||
-rw-r--r-- | src/intellij/actors.iml.SAMPLE | 4 | ||||
-rw-r--r-- | src/intellij/asm.iml.SAMPLE | 12 | ||||
-rw-r--r-- | src/intellij/compiler.iml.SAMPLE | 8 | ||||
-rw-r--r-- | src/intellij/fjbg.iml.SAMPLE | 12 | ||||
-rw-r--r-- | src/intellij/forkjoin.iml.SAMPLE | 12 | ||||
-rw-r--r-- | src/intellij/library.iml.SAMPLE | 6 | ||||
-rw-r--r-- | src/intellij/manual.iml.SAMPLE | 2 | ||||
-rw-r--r-- | src/intellij/msil.iml.SAMPLE | 24 | ||||
-rw-r--r-- | src/intellij/partest.iml.SAMPLE | 6 | ||||
-rw-r--r-- | src/intellij/reflect.iml.SAMPLE | 6 | ||||
-rw-r--r-- | src/intellij/scala-lang.ipr.SAMPLE | 30 | ||||
-rw-r--r-- | src/intellij/scalap.iml.SAMPLE | 3 | ||||
-rw-r--r-- | src/intellij/swing.iml.SAMPLE | 2 | ||||
-rw-r--r-- | src/intellij/test.iml.SAMPLE | 10 |
15 files changed, 107 insertions, 41 deletions
diff --git a/src/intellij/README b/src/intellij/README index f24d700889..9ef612bd0a 100644 --- a/src/intellij/README +++ b/src/intellij/README @@ -1,12 +1,13 @@ -Use IntelliJ IDEA X EAP (http://confluence.jetbrains.net/display/IDEADEV/IDEA+X+EAP) -a Scala Plugin nightly build (http://confluence.jetbrains.net/display/SCA/Scala+Plugin+Nightly+Builds+for+IDEA+X) +Use the latest IntelliJ IDEA release and install the Scala plugin from within the IDE. The following steps are required to use IntelliJ IDEA on Scala trunk + - compile "locker" using "ant locker.done" - Copy the *.iml.SAMPLE / *.ipr.SAMPLE files to *.iml / *.ipr - In IDEA, create a global library named "ant" which contains "ant.jar" - - In the Scala Facet of the "library" module, update the path in the command-line - argument for "-sourcepath" + - Also create an SDK entry named "1.6" containing the java 1.6 SDK + - In the Scala Facet of the "library" and "reflect" modules, update the path in the + command-line argument for "-sourcepath" - In the Project Settings, update the "Version Control" to match your checkout Known problems - - Currently, it's not possible to build the "actors" module in IDEA + - Due to SI-4365, the "library" module has to be built using "-Yno-generic-signatures" diff --git a/src/intellij/actors.iml.SAMPLE b/src/intellij/actors.iml.SAMPLE index b095d29d7b..896c4966ff 100644 --- a/src/intellij/actors.iml.SAMPLE +++ b/src/intellij/actors.iml.SAMPLE @@ -6,7 +6,7 @@ <option name="compilerLibraryLevel" value="Project" /> <option name="compilerLibraryName" value="compiler-locker" /> <option name="maximumHeapSize" value="1536" /> - <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=128M -d32 -server -XX:+UseParallelGC" /> + <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=256m -XX:+CMSClassUnloadingEnabled -XX:+UseCompressedOops -XX:+UseParallelGC" /> </configuration> </facet> </component> @@ -18,7 +18,7 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="library" /> - <orderEntry type="library" name="lib" level="project" /> + <orderEntry type="module" module-name="forkjoin" /> </component> </module> diff --git a/src/intellij/asm.iml.SAMPLE b/src/intellij/asm.iml.SAMPLE new file mode 100644 index 0000000000..ba9e7e899f --- /dev/null +++ b/src/intellij/asm.iml.SAMPLE @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$/../asm"> + <sourceFolder url="file://$MODULE_DIR$/../asm" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> + diff --git a/src/intellij/compiler.iml.SAMPLE b/src/intellij/compiler.iml.SAMPLE index e3278d0311..696c347b7b 100644 --- a/src/intellij/compiler.iml.SAMPLE +++ b/src/intellij/compiler.iml.SAMPLE @@ -6,7 +6,7 @@ <option name="compilerLibraryLevel" value="Project" /> <option name="compilerLibraryName" value="compiler-locker" /> <option name="maximumHeapSize" value="1536" /> - <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=128M -d32 -server -XX:+UseParallelGC" /> + <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=256m -XX:+CMSClassUnloadingEnabled -XX:+UseCompressedOops -XX:+UseParallelGC" /> </configuration> </facet> </component> @@ -18,8 +18,12 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="library" /> - <orderEntry type="library" name="lib" level="project" /> <orderEntry type="module" module-name="reflect" /> + <orderEntry type="module" module-name="asm" /> + <orderEntry type="module" module-name="fjbg" /> + <orderEntry type="module" module-name="msil" /> <orderEntry type="library" name="ant" level="application" /> + <orderEntry type="library" name="jline" level="project" /> </component> </module> + diff --git a/src/intellij/fjbg.iml.SAMPLE b/src/intellij/fjbg.iml.SAMPLE new file mode 100644 index 0000000000..03eca69246 --- /dev/null +++ b/src/intellij/fjbg.iml.SAMPLE @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$/../fjbg"> + <sourceFolder url="file://$MODULE_DIR$/../fjbg" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> + diff --git a/src/intellij/forkjoin.iml.SAMPLE b/src/intellij/forkjoin.iml.SAMPLE new file mode 100644 index 0000000000..be807cc019 --- /dev/null +++ b/src/intellij/forkjoin.iml.SAMPLE @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$/../forkjoin"> + <sourceFolder url="file://$MODULE_DIR$/../forkjoin" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> + diff --git a/src/intellij/library.iml.SAMPLE b/src/intellij/library.iml.SAMPLE index a86c0a005c..9c1b7ec185 100644 --- a/src/intellij/library.iml.SAMPLE +++ b/src/intellij/library.iml.SAMPLE @@ -5,9 +5,9 @@ <configuration> <option name="compilerLibraryLevel" value="Project" /> <option name="compilerLibraryName" value="compiler-locker" /> - <option name="compilerOptions" value="-sourcepath /Users/luc/scala/git/src/library" /> + <option name="compilerOptions" value="-sourcepath /Users/luc/scala/scala/src/library -Yno-generic-signatures" /> <option name="maximumHeapSize" value="1536" /> - <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=128M -d32 -server -XX:+UseParallelGC" /> + <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=256m -XX:+CMSClassUnloadingEnabled -XX:+UseCompressedOops -XX:+UseParallelGC" /> </configuration> </facet> </component> @@ -18,7 +18,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="lib" level="project" /> + <orderEntry type="module" module-name="forkjoin" /> </component> </module> diff --git a/src/intellij/manual.iml.SAMPLE b/src/intellij/manual.iml.SAMPLE index 10de797fc4..62810e0cba 100644 --- a/src/intellij/manual.iml.SAMPLE +++ b/src/intellij/manual.iml.SAMPLE @@ -6,7 +6,7 @@ <option name="compilerLibraryLevel" value="Project" /> <option name="compilerLibraryName" value="compiler-locker" /> <option name="maximumHeapSize" value="1536" /> - <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=128M -d32 -server -XX:+UseParallelGC" /> + <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=256m -XX:+CMSClassUnloadingEnabled -XX:+UseCompressedOops -XX:+UseParallelGC" /> </configuration> </facet> </component> diff --git a/src/intellij/msil.iml.SAMPLE b/src/intellij/msil.iml.SAMPLE new file mode 100644 index 0000000000..56f794785f --- /dev/null +++ b/src/intellij/msil.iml.SAMPLE @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="FacetManager"> + <facet type="scala" name="Scala"> + <configuration> + <option name="compilerLibraryLevel" value="Project" /> + <option name="compilerLibraryName" value="compiler-locker" /> + <option name="maximumHeapSize" value="1536" /> + <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=256m -XX:+CMSClassUnloadingEnabled -XX:+UseCompressedOops -XX:+UseParallelGC" /> + </configuration> + </facet> + </component> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$/../msil"> + <sourceFolder url="file://$MODULE_DIR$/../msil" isTestSource="false" /> + <excludeFolder url="file://$MODULE_DIR$/../msil/ch/epfl/lamp/compiler/msil/tests" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="library" /> + </component> +</module> + diff --git a/src/intellij/partest.iml.SAMPLE b/src/intellij/partest.iml.SAMPLE index 7dcd868fe4..ab4a32a9b3 100644 --- a/src/intellij/partest.iml.SAMPLE +++ b/src/intellij/partest.iml.SAMPLE @@ -6,7 +6,7 @@ <option name="compilerLibraryLevel" value="Project" /> <option name="compilerLibraryName" value="compiler-locker" /> <option name="maximumHeapSize" value="1536" /> - <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=128M -d32 -server -XX:+UseParallelGC" /> + <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=256m -XX:+CMSClassUnloadingEnabled -XX:+UseCompressedOops -XX:+UseParallelGC" /> </configuration> </facet> </component> @@ -17,11 +17,11 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="compiler" /> <orderEntry type="module" module-name="library" /> + <orderEntry type="module" module-name="reflect" /> <orderEntry type="module" module-name="actors" /> <orderEntry type="module" module-name="scalap" /> - <orderEntry type="library" name="lib" level="project" /> + <orderEntry type="module" module-name="compiler" /> <orderEntry type="library" name="ant" level="application" /> </component> </module> diff --git a/src/intellij/reflect.iml.SAMPLE b/src/intellij/reflect.iml.SAMPLE index 7f14a00699..10973c503f 100644 --- a/src/intellij/reflect.iml.SAMPLE +++ b/src/intellij/reflect.iml.SAMPLE @@ -5,9 +5,9 @@ <configuration> <option name="compilerLibraryLevel" value="Project" /> <option name="compilerLibraryName" value="compiler-locker" /> - <option name="compilerOptions" value="-sourcepath /Users/luc/scala/git/src/reflect" /> + <option name="compilerOptions" value="-sourcepath /Users/luc/scala/scala/src/reflect" /> <option name="maximumHeapSize" value="1536" /> - <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=128M -d32 -server -XX:+UseParallelGC" /> + <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=256m -XX:+CMSClassUnloadingEnabled -XX:+UseCompressedOops -XX:+UseParallelGC" /> </configuration> </facet> </component> @@ -18,8 +18,8 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="lib" level="project" /> <orderEntry type="module" module-name="library" /> + <orderEntry type="library" name="jline" level="project" /> </component> </module> diff --git a/src/intellij/scala-lang.ipr.SAMPLE b/src/intellij/scala-lang.ipr.SAMPLE index c5f7b904c8..37307c2029 100644 --- a/src/intellij/scala-lang.ipr.SAMPLE +++ b/src/intellij/scala-lang.ipr.SAMPLE @@ -32,7 +32,7 @@ <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" /> <component name="EntryPointsManager"> <entry_points version="2.0" /> - </component> + </component> <component name="InspectionProjectProfileManager"> <profiles> <profile version="1.0" is_locked="false"> @@ -196,9 +196,13 @@ <component name="ProjectModuleManager"> <modules> <module fileurl="file://$PROJECT_DIR$/actors.iml" filepath="$PROJECT_DIR$/actors.iml" /> + <module fileurl="file://$PROJECT_DIR$/asm.iml" filepath="$PROJECT_DIR$/asm.iml" /> <module fileurl="file://$PROJECT_DIR$/compiler.iml" filepath="$PROJECT_DIR$/compiler.iml" /> + <module fileurl="file://$PROJECT_DIR$/fjbg.iml" filepath="$PROJECT_DIR$/fjbg.iml" /> + <module fileurl="file://$PROJECT_DIR$/forkjoin.iml" filepath="$PROJECT_DIR$/forkjoin.iml" /> <module fileurl="file://$PROJECT_DIR$/library.iml" filepath="$PROJECT_DIR$/library.iml" /> <module fileurl="file://$PROJECT_DIR$/manual.iml" filepath="$PROJECT_DIR$/manual.iml" /> + <module fileurl="file://$PROJECT_DIR$/msil.iml" filepath="$PROJECT_DIR$/msil.iml" /> <module fileurl="file://$PROJECT_DIR$/partest.iml" filepath="$PROJECT_DIR$/partest.iml" /> <module fileurl="file://$PROJECT_DIR$/reflect.iml" filepath="$PROJECT_DIR$/reflect.iml" /> <module fileurl="file://$PROJECT_DIR$/scala.iml" filepath="$PROJECT_DIR$/scala.iml" /> @@ -213,6 +217,10 @@ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/../../out" /> </component> + <component name="ScalacSettings"> + <option name="COMPILER_LIBRARY_NAME" value="compiler-locker" /> + <option name="COMPILER_LIBRARY_LEVEL" value="Project" /> + </component> <component name="VcsDirectoryMappings"> <mapping directory="$PROJECT_DIR$/../.." vcs="Git" /> </component> @@ -221,32 +229,20 @@ <CLASSES> <root url="file://$PROJECT_DIR$/../../build/locker/classes/library" /> <root url="file://$PROJECT_DIR$/../../build/locker/classes/compiler" /> - <root url="jar://$PROJECT_DIR$/../../lib/forkjoin.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../lib/fjbg.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../lib/msil.jar!/" /> + <root url="file://$PROJECT_DIR$/../../build/locker/classes/reflect" /> + <root url="file://$PROJECT_DIR$/../../build/libs/classes/fjbg" /> + <root url="file://$PROJECT_DIR$/../../build/asm/classes" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> - <library name="lib"> + <library name="jline"> <CLASSES> <root url="jar://$PROJECT_DIR$/../../lib/jline.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../lib/forkjoin.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../lib/fjbg.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../lib/msil.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> - <library name="quicklib"> - <CLASSES> - <root url="file://$PROJECT_DIR$/../../build/quick/classes/library" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="file://$PROJECT_DIR$/../library" /> - </SOURCES> - </library> </component> </project> diff --git a/src/intellij/scalap.iml.SAMPLE b/src/intellij/scalap.iml.SAMPLE index 9473864fbd..77eea7c38f 100644 --- a/src/intellij/scalap.iml.SAMPLE +++ b/src/intellij/scalap.iml.SAMPLE @@ -6,7 +6,7 @@ <option name="compilerLibraryLevel" value="Project" /> <option name="compilerLibraryName" value="compiler-locker" /> <option name="maximumHeapSize" value="1536" /> - <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=128M -d32 -server -XX:+UseParallelGC" /> + <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=256m -XX:+CMSClassUnloadingEnabled -XX:+UseCompressedOops -XX:+UseParallelGC" /> </configuration> </facet> </component> @@ -18,6 +18,7 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="library" /> + <orderEntry type="module" module-name="reflect" /> <orderEntry type="module" module-name="compiler" /> </component> </module> diff --git a/src/intellij/swing.iml.SAMPLE b/src/intellij/swing.iml.SAMPLE index e9c4d13b91..c97bfdf91f 100644 --- a/src/intellij/swing.iml.SAMPLE +++ b/src/intellij/swing.iml.SAMPLE @@ -6,7 +6,7 @@ <option name="compilerLibraryLevel" value="Project" /> <option name="compilerLibraryName" value="compiler-locker" /> <option name="maximumHeapSize" value="1536" /> - <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=128M -d32 -server -XX:+UseParallelGC" /> + <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=256m -XX:+CMSClassUnloadingEnabled -XX:+UseCompressedOops -XX:+UseParallelGC" /> </configuration> </facet> </component> diff --git a/src/intellij/test.iml.SAMPLE b/src/intellij/test.iml.SAMPLE index e6729ae362..112fec428f 100644 --- a/src/intellij/test.iml.SAMPLE +++ b/src/intellij/test.iml.SAMPLE @@ -5,12 +5,16 @@ <content url="file://$MODULE_DIR$/../../test" /> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="actors" /> - <orderEntry type="module" module-name="compiler" /> - <orderEntry type="module" module-name="continuations" /> <orderEntry type="module" module-name="library" /> + <orderEntry type="module" module-name="reflect" /> + <orderEntry type="module" module-name="compiler" /> + <orderEntry type="module" module-name="actors" /> <orderEntry type="module" module-name="swing" /> <orderEntry type="module" module-name="partest" /> + <orderEntry type="module" module-name="asm" /> + <orderEntry type="module" module-name="fjbg" /> + <orderEntry type="module" module-name="forkjoin" /> + <orderEntry type="module" module-name="msil" /> </component> </module> |