From 50a178f73e49f2ed52b52f359e74683e06c65b9e Mon Sep 17 00:00:00 2001
From: Lukas Rytz <lukas.rytz@epfl.ch>
Date: Fri, 6 Aug 2010 09:01:56 +0000
Subject: updated intellij project SAMPLE files to new fa...

updated intellij project SAMPLE files to new facet configuration. uses
'palo' right now because a .jar (scala-compiler.jar) is required, a
directory does not work. no review.
---
 src/intellij/actors.iml.SAMPLE     | 14 +++-----------
 src/intellij/compiler.iml.SAMPLE   | 19 ++++---------------
 src/intellij/dbc.iml.SAMPLE        | 14 +++-----------
 src/intellij/library.iml.SAMPLE    | 17 +++--------------
 src/intellij/manual.iml.SAMPLE     | 14 +++-----------
 src/intellij/partest.iml.SAMPLE    | 14 +++-----------
 src/intellij/scala-lang.ipr.SAMPLE | 19 ++++++++++++++++++-
 src/intellij/scalap.iml.SAMPLE     | 14 +++-----------
 src/intellij/swing.iml.SAMPLE      | 14 +++-----------
 9 files changed, 43 insertions(+), 96 deletions(-)

(limited to 'src/intellij')

diff --git a/src/intellij/actors.iml.SAMPLE b/src/intellij/actors.iml.SAMPLE
index 76a07d6667..8902ee2de2 100644
--- a/src/intellij/actors.iml.SAMPLE
+++ b/src/intellij/actors.iml.SAMPLE
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
-    <facet type="Scala" name="Scala">
+    <facet type="scala" name="Scala">
       <configuration>
-        <option name="myScalaCompilerJarPaths">
-          <array>
-            <option value="$MODULE_DIR$/../../../../Library/Application Support/IntelliJIdea90CE/Scala/lib/scala-compiler.jar" />
-          </array>
-        </option>
-        <option name="myScalaSdkJarPaths">
-          <array>
-            <option value="$MODULE_DIR$/../../../../Library/Application Support/IntelliJIdea90CE/Scala/lib/scala-library.jar" />
-          </array>
-        </option>
+        <option name="compilerLibraryLevel" value="Project" />
+        <option name="compilerLibraryName" value="compiler_palo" />
       </configuration>
     </facet>
   </component>
diff --git a/src/intellij/compiler.iml.SAMPLE b/src/intellij/compiler.iml.SAMPLE
index 6327f1b371..ef3eb9d730 100644
--- a/src/intellij/compiler.iml.SAMPLE
+++ b/src/intellij/compiler.iml.SAMPLE
@@ -1,21 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
-    <facet type="Scala" name="Scala">
+    <facet type="scala" name="Scala">
       <configuration>
-        <option name="takeFromSettings" value="true" />
-        <option name="myScalaCompilerJarPaths">
-          <array>
-            <option value="$MODULE_DIR$/../../build/locker/classes/compiler" />
-            <option value="$MODULE_DIR$/../../lib/fjbg.jar" />
-            <option value="$MODULE_DIR$/../../lib/msil.jar" />
-          </array>
-        </option>
-        <option name="myScalaSdkJarPaths">
-          <array>
-            <option value="$MODULE_DIR$/../../build/locker/classes/library" />
-          </array>
-        </option>
+        <option name="compilerLibraryLevel" value="Project" />
+        <option name="compilerLibraryName" value="compiler_palo" />
       </configuration>
     </facet>
   </component>
@@ -26,9 +15,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="quicklib" level="project" />
     <orderEntry type="library" name="lib" level="project" />
     <orderEntry type="library" name="ant" level="application" />
+    <orderEntry type="library" name="quicklib" level="project" />
   </component>
 </module>
 
diff --git a/src/intellij/dbc.iml.SAMPLE b/src/intellij/dbc.iml.SAMPLE
index 26f0027431..785cc00cc8 100644
--- a/src/intellij/dbc.iml.SAMPLE
+++ b/src/intellij/dbc.iml.SAMPLE
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
-    <facet type="Scala" name="Scala">
+    <facet type="scala" name="Scala">
       <configuration>
-        <option name="myScalaCompilerJarPaths">
-          <array>
-            <option value="$MODULE_DIR$/../../../../Library/Application Support/IntelliJIdea90CE/Scala/lib/scala-compiler.jar" />
-          </array>
-        </option>
-        <option name="myScalaSdkJarPaths">
-          <array>
-            <option value="$MODULE_DIR$/../../../../Library/Application Support/IntelliJIdea90CE/Scala/lib/scala-library.jar" />
-          </array>
-        </option>
+        <option name="compilerLibraryLevel" value="Project" />
+        <option name="compilerLibraryName" value="compiler_palo" />
       </configuration>
     </facet>
   </component>
diff --git a/src/intellij/library.iml.SAMPLE b/src/intellij/library.iml.SAMPLE
index 25ecd691cf..9a8774fa47 100644
--- a/src/intellij/library.iml.SAMPLE
+++ b/src/intellij/library.iml.SAMPLE
@@ -1,21 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
-    <facet type="Scala" name="Scala">
+    <facet type="scala" name="Scala">
       <configuration>
-        <option name="takeFromSettings" value="true" />
-        <option name="myScalaCompilerJarPaths">
-          <array>
-            <option value="$MODULE_DIR$/../../build/locker/classes/compiler" />
-            <option value="$MODULE_DIR$/../../lib/fjbg.jar" />
-            <option value="$MODULE_DIR$/../../lib/msil.jar" />
-          </array>
-        </option>
-        <option name="myScalaSdkJarPaths">
-          <array>
-            <option value="$MODULE_DIR$/../../build/locker/classes/library" />
-          </array>
-        </option>
+        <option name="compilerLibraryLevel" value="Project" />
+        <option name="compilerLibraryName" value="compiler_palo" />
       </configuration>
     </facet>
   </component>
diff --git a/src/intellij/manual.iml.SAMPLE b/src/intellij/manual.iml.SAMPLE
index 8e00acb878..e5dc896776 100644
--- a/src/intellij/manual.iml.SAMPLE
+++ b/src/intellij/manual.iml.SAMPLE
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
-    <facet type="Scala" name="Scala">
+    <facet type="scala" name="Scala">
       <configuration>
-        <option name="myScalaCompilerJarPaths">
-          <array>
-            <option value="$MODULE_DIR$/../../../../Library/Application Support/IntelliJIdea90CE/Scala/lib/scala-compiler.jar" />
-          </array>
-        </option>
-        <option name="myScalaSdkJarPaths">
-          <array>
-            <option value="$MODULE_DIR$/../../../../Library/Application Support/IntelliJIdea90CE/Scala/lib/scala-library.jar" />
-          </array>
-        </option>
+        <option name="compilerLibraryLevel" value="Project" />
+        <option name="compilerLibraryName" value="compiler_palo" />
       </configuration>
     </facet>
   </component>
diff --git a/src/intellij/partest.iml.SAMPLE b/src/intellij/partest.iml.SAMPLE
index 008758b504..36584042e4 100644
--- a/src/intellij/partest.iml.SAMPLE
+++ b/src/intellij/partest.iml.SAMPLE
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
-    <facet type="Scala" name="Scala">
+    <facet type="scala" name="Scala">
       <configuration>
-        <option name="myScalaCompilerJarPaths">
-          <array>
-            <option value="$MODULE_DIR$/../../../../Library/Application Support/IntelliJIdea90CE/Scala/lib/scala-compiler.jar" />
-          </array>
-        </option>
-        <option name="myScalaSdkJarPaths">
-          <array>
-            <option value="$MODULE_DIR$/../../../../Library/Application Support/IntelliJIdea90CE/Scala/lib/scala-library.jar" />
-          </array>
-        </option>
+        <option name="compilerLibraryLevel" value="Project" />
+        <option name="compilerLibraryName" value="compiler_palo" />
       </configuration>
     </facet>
   </component>
diff --git a/src/intellij/scala-lang.ipr.SAMPLE b/src/intellij/scala-lang.ipr.SAMPLE
index 5b1782cf1f..b3964f14f8 100644
--- a/src/intellij/scala-lang.ipr.SAMPLE
+++ b/src/intellij/scala-lang.ipr.SAMPLE
@@ -286,7 +286,7 @@
     <option name="UNCHECKED" value="false" />
   </component>
   <component name="ScalacSettings">
-    <option name="MAXIMUM_HEAP_SIZE" value="1024" />
+    <option name="MAXIMUM_HEAP_SIZE" value="1536" />
   </component>
   <component name="SvnBranchConfigurationManager">
     <option name="myConfigurationMap">
@@ -670,6 +670,23 @@
       <JAVADOC />
       <SOURCES />
     </library>
+    <library name="quicklib_sbt">
+      <CLASSES>
+        <root url="file://$PROJECT_DIR$/../../target/quick/ classes/library" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="compiler_palo">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/../../build/palo/lib/scala-library.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../../build/palo/lib/scala-compiler.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../../lib/fjbg.jar!/" />
+        <root url="jar://$PROJECT_DIR$/../../lib/msil.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
   </component>
 </project>
 
diff --git a/src/intellij/scalap.iml.SAMPLE b/src/intellij/scalap.iml.SAMPLE
index 9315bc37c2..37ad637bfc 100644
--- a/src/intellij/scalap.iml.SAMPLE
+++ b/src/intellij/scalap.iml.SAMPLE
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
-    <facet type="Scala" name="Scala">
+    <facet type="scala" name="Scala">
       <configuration>
-        <option name="myScalaCompilerJarPaths">
-          <array>
-            <option value="$MODULE_DIR$/../../../../Library/Application Support/IntelliJIdea90CE/Scala/lib/scala-compiler.jar" />
-          </array>
-        </option>
-        <option name="myScalaSdkJarPaths">
-          <array>
-            <option value="$MODULE_DIR$/../../../../Library/Application Support/IntelliJIdea90CE/Scala/lib/scala-library.jar" />
-          </array>
-        </option>
+        <option name="compilerLibraryLevel" value="Project" />
+        <option name="compilerLibraryName" value="compiler_palo" />
       </configuration>
     </facet>
   </component>
diff --git a/src/intellij/swing.iml.SAMPLE b/src/intellij/swing.iml.SAMPLE
index 4b5071e3f2..56e015496e 100644
--- a/src/intellij/swing.iml.SAMPLE
+++ b/src/intellij/swing.iml.SAMPLE
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
-    <facet type="Scala" name="Scala">
+    <facet type="scala" name="Scala">
       <configuration>
-        <option name="myScalaCompilerJarPaths">
-          <array>
-            <option value="$MODULE_DIR$/../../../../Library/Application Support/IntelliJIdea90CE/Scala/lib/scala-compiler.jar" />
-          </array>
-        </option>
-        <option name="myScalaSdkJarPaths">
-          <array>
-            <option value="$MODULE_DIR$/../../../../Library/Application Support/IntelliJIdea90CE/Scala/lib/scala-library.jar" />
-          </array>
-        </option>
+        <option name="compilerLibraryLevel" value="Project" />
+        <option name="compilerLibraryName" value="compiler_palo" />
       </configuration>
     </facet>
   </component>
-- 
cgit v1.2.3