summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-06-09 09:55:02 -0700
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-06-09 09:55:02 -0700
commitc9602af1d7a601604cc813a6ec73323bccaf0259 (patch)
treee2ddbc47e84516321d743824c814910341571694
parenta05597e75fd9a88028a01828a59a59d037604c23 (diff)
parent689a2f1d8eb7767a6eb3ca99e02611b5aa814edc (diff)
downloadscala-c9602af1d7a601604cc813a6ec73323bccaf0259.tar.gz
scala-c9602af1d7a601604cc813a6ec73323bccaf0259.tar.bz2
scala-c9602af1d7a601604cc813a6ec73323bccaf0259.zip
Merge pull request #696 from retronym/topic/intellij-reflect-module3
An IntelliJ module for reflect.
-rw-r--r--src/intellij/compiler.iml.SAMPLE2
-rw-r--r--src/intellij/reflect.iml.SAMPLE25
-rw-r--r--src/intellij/scala-lang.ipr.SAMPLE1
3 files changed, 27 insertions, 1 deletions
diff --git a/src/intellij/compiler.iml.SAMPLE b/src/intellij/compiler.iml.SAMPLE
index 75c7653018..e3278d0311 100644
--- a/src/intellij/compiler.iml.SAMPLE
+++ b/src/intellij/compiler.iml.SAMPLE
@@ -19,7 +19,7 @@
<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="library" name="ant" level="application" />
</component>
</module>
-
diff --git a/src/intellij/reflect.iml.SAMPLE b/src/intellij/reflect.iml.SAMPLE
new file mode 100644
index 0000000000..7f14a00699
--- /dev/null
+++ b/src/intellij/reflect.iml.SAMPLE
@@ -0,0 +1,25 @@
+<?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="compilerOptions" value="-sourcepath /Users/luc/scala/git/src/reflect" />
+ <option name="maximumHeapSize" value="1536" />
+ <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=128M -d32 -server -XX:+UseParallelGC" />
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$/../reflect">
+ <sourceFolder url="file://$MODULE_DIR$/../reflect" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="lib" level="project" />
+ <orderEntry type="module" module-name="library" />
+ </component>
+</module>
+
diff --git a/src/intellij/scala-lang.ipr.SAMPLE b/src/intellij/scala-lang.ipr.SAMPLE
index 43d6362708..c5f7b904c8 100644
--- a/src/intellij/scala-lang.ipr.SAMPLE
+++ b/src/intellij/scala-lang.ipr.SAMPLE
@@ -200,6 +200,7 @@
<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$/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" />
<module fileurl="file://$PROJECT_DIR$/scalap.iml" filepath="$PROJECT_DIR$/scalap.iml" />
<module fileurl="file://$PROJECT_DIR$/swing.iml" filepath="$PROJECT_DIR$/swing.iml" />