From ec664b1cd0c333c15c62551181d13f4be599d31f Mon Sep 17 00:00:00 2001
From: Iulian Dragos <jaguarul@gmail.com>
Date: Wed, 25 Nov 2009 19:42:33 +0000
Subject: Updated Idea files to use relative paths toward...

Updated Idea files to use relative paths towards locker when building
quick
---
 compiler.iml   |  9 +++++----
 scala-lang.ipr | 36 +++++++++++++++++++++---------------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/compiler.iml b/compiler.iml
index 72b86fd446..97b08d70cd 100644
--- a/compiler.iml
+++ b/compiler.iml
@@ -4,8 +4,9 @@
     <facet type="Scala" name="Scala">
       <configuration>
         <option name="takeFromSettings" value="true" />
-        <option name="myScalaCompilerJarPath" value="$MODULE_DIR$/build/locker/classes/compiler:/localhome/dragos/workspace-laptop/git/scala/lib/fjbg.jar" />
-        <option name="myScalaSdkJarPath" value="$MODULE_DIR$/build/locker/classes/library" />
+        <option name="isRelativeToProjectPath" value="true" />
+        <option name="myScalaCompilerJarPath" value="build/locker/classes/compiler lib/fjbg.jar lib/msil.jar" />
+        <option name="myScalaSdkJarPath" value="build/locker/classes/library" />
       </configuration>
     </facet>
   </component>
@@ -18,10 +19,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Scala SDK" level="application" />
     <orderEntry type="library" name="Project ant library" level="project" />
-    <orderEntry type="library" name="ant" level="application" />
     <orderEntry type="library" name="Project Scala SDK" level="project" />
+    <orderEntry type="library" name="ant" level="project" />
+    <orderEntry type="library" name="locker" level="project" />
   </component>
 </module>
 
diff --git a/scala-lang.ipr b/scala-lang.ipr
index 4cf15390b4..dced049dcc 100644
--- a/scala-lang.ipr
+++ b/scala-lang.ipr
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project relativePaths="false" version="4">
+<project version="4">
   <component name="AntConfiguration">
     <defaultAnt bundledAnt="true" />
     <buildFile url="file://$PROJECT_DIR$/build.xml">
@@ -46,7 +46,6 @@
         </ADDITIONAL_INDENT_OPTIONS>
       </value>
     </option>
-    <option name="USE_PER_PROJECT_SETTINGS" value="false" />
   </component>
   <component name="CompilerAPISettings">
     <option name="DEBUGGING_INFO" value="true" />
@@ -57,7 +56,6 @@
   </component>
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
-    <option name="DEPLOY_AFTER_MAKE" value="0" />
     <resourceExtensions>
       <entry name=".+\.(properties|xml|html|dtd|tld)" />
       <entry name=".+\.(gif|png|jpeg|jpg)" />
@@ -74,6 +72,7 @@
       <entry name="?*.tld" />
       <entry name="?*.ftl" />
     </wildcardResourcePatterns>
+    <annotationProcessing enabled="false" useClasspath="true" generatedDirName="generated" />
   </component>
   <component name="CopyrightManager" default="">
     <module2copyright />
@@ -95,7 +94,9 @@
     <option name="ADDITIONAL_OPTIONS_STRING" value="" />
     <option name="MAXIMUM_HEAP_SIZE" value="128" />
   </component>
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+    <file url="file://$PROJECT_DIR$/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala" charset="UTF-8" />
+  </component>
   <component name="FacetAutodetectingManager">
     <autodetection-disabled>
       <facet-type id="Scala">
@@ -1162,15 +1163,6 @@
   </component>
   <component name="IdProvider" IDEtalkID="522B472C2EA573563CC2BA93160270BE" />
   <component name="InspectionProjectProfileManager">
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="true" />
-    <version value="1.0" />
-    <profiles>
-      <profile version="1.0" is_locked="false">
-        <option name="myName" value="Project Default" />
-        <option name="myLocal" value="false" />
-      </profile>
-    </profiles>
     <list size="5">
       <item index="0" class="java.lang.String" itemvalue="TYPO" />
       <item index="1" class="java.lang.String" itemvalue="SERVER PROBLEM" />
@@ -1336,10 +1328,9 @@
     <option name="projectName" value="scala-lang" />
   </component>
   <component name="ProjectDictionaryState">
-    <dictionary name="odersky" />
     <dictionary name="dragos" />
+    <dictionary name="odersky" />
   </component>
-  <component name="ProjectFileVersion" converted="true" />
   <component name="ProjectKey">
     <option name="state" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk/scala-lang.ipr" />
   </component>
@@ -1516,6 +1507,21 @@
       <JAVADOC />
       <SOURCES />
     </library>
+    <library name="ant">
+      <CLASSES>
+        <root url="jar:///usr/share/ant/lib/ant.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="locker">
+      <CLASSES>
+        <root url="file://$PROJECT_DIR$/build/locker/classes/library" />
+        <root url="file://$PROJECT_DIR$/build/locker/classes/compiler" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
   </component>
 </project>
 
-- 
cgit v1.2.3