diff options
| -rw-r--r-- | actors.iml | 3 | ||||
| -rw-r--r-- | compiler.iml | 4 | ||||
| -rw-r--r-- | dbc.iml | 3 | ||||
| -rw-r--r-- | library.iml | 6 | ||||
| -rw-r--r-- | manual.iml | 4 | ||||
| -rw-r--r-- | partest.iml | 6 | ||||
| -rw-r--r-- | scala-lang.ipr | 61 | ||||
| -rw-r--r-- | scalap.iml | 3 | ||||
| -rw-r--r-- | swing.iml | 3 |
9 files changed, 44 insertions, 49 deletions
diff --git a/actors.iml b/actors.iml index cfd4a2705e..b002792a0c 100644 --- a/actors.iml +++ b/actors.iml @@ -12,9 +12,10 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="lib1" level="project" /> <orderEntry type="module" module-name="compiler" /> <orderEntry type="module" module-name="library" /> + <orderEntry type="library" name="Project ant library" level="project" /> + <orderEntry type="library" name="Project Scala SDK" level="project" /> </component> </module> diff --git a/compiler.iml b/compiler.iml index 25f76e60a8..a41887aa3b 100644 --- a/compiler.iml +++ b/compiler.iml @@ -12,8 +12,10 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="lib1" level="project" /> <orderEntry type="module" module-name="library" /> + <orderEntry type="library" name="Project ant library" level="project" /> + <orderEntry type="library" name="Project Scala SDK" level="project" /> + <orderEntry type="library" name="ant" level="application" /> </component> </module> @@ -12,10 +12,11 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="lib1" level="project" /> <orderEntry type="module" module-name="compiler" /> <orderEntry type="module" module-name="library" /> <orderEntry type="module" module-name="actors" /> + <orderEntry type="library" name="Project ant library" level="project" /> + <orderEntry type="library" name="Project Scala SDK" level="project" /> </component> </module> diff --git a/library.iml b/library.iml index 509ee77328..4d5668de90 100644 --- a/library.iml +++ b/library.iml @@ -15,9 +15,9 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="ant" level="project" /> - <orderEntry type="library" name="testlib" level="project" /> - <orderEntry type="library" name="lib1" level="project" /> + <orderEntry type="library" name="Project ant library" level="project" /> + <orderEntry type="library" name="Project Scala SDK" level="project" /> + <orderEntry type="library" name="ant" level="application" /> </component> </module> diff --git a/manual.iml b/manual.iml index 04e3c6cfc6..0ee975326b 100644 --- a/manual.iml +++ b/manual.iml @@ -12,7 +12,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="lib1" level="project" /> <orderEntry type="module" module-name="actors" /> <orderEntry type="module" module-name="compiler" /> <orderEntry type="module" module-name="dbc" /> @@ -20,6 +19,9 @@ <orderEntry type="module" module-name="partest" /> <orderEntry type="module" module-name="scalap" /> <orderEntry type="module" module-name="swing" /> + <orderEntry type="library" name="Project ant library" level="project" /> + <orderEntry type="library" name="Project Scala SDK" level="project" /> + <orderEntry type="library" name="ant" level="application" /> </component> </module> diff --git a/partest.iml b/partest.iml index 526b4dce67..addac88198 100644 --- a/partest.iml +++ b/partest.iml @@ -8,12 +8,11 @@ <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$/src/partest"> - <sourceFolder url="file://$MODULE_DIR$/src/partest" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/partest" isTestSource="false" /> </content> <content url="file://$MODULE_DIR$/test" /> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="lib1" level="project" /> <orderEntry type="module" module-name="actors" /> <orderEntry type="module" module-name="compiler" /> <orderEntry type="module" module-name="dbc" /> @@ -21,6 +20,9 @@ <orderEntry type="module" module-name="manual" /> <orderEntry type="module" module-name="scalap" /> <orderEntry type="module" module-name="swing" /> + <orderEntry type="library" name="Project ant library" level="project" /> + <orderEntry type="library" name="Project Scala SDK" level="project" /> + <orderEntry type="library" name="ant" level="application" /> </component> </module> diff --git a/scala-lang.ipr b/scala-lang.ipr index 90b39813fa..9233770e11 100644 --- a/scala-lang.ipr +++ b/scala-lang.ipr @@ -6,7 +6,7 @@ <additionalClassPath /> <antReference projectDefault="true" /> <customJdkName value="" /> - <maximumHeapSize value="1024" /> + <maximumHeapSize value="128" /> <maximumStackSize value="32" /> <properties /> </buildFile> @@ -1180,11 +1180,12 @@ <option name="myLocal" value="false" /> </profile> </profiles> - <list size="4"> - <item index="0" class="java.lang.String" itemvalue="SERVER PROBLEM" /> - <item index="1" class="java.lang.String" itemvalue="INFO" /> - <item index="2" class="java.lang.String" itemvalue="WARNING" /> - <item index="3" class="java.lang.String" itemvalue="ERROR" /> + <list size="5"> + <item index="0" class="java.lang.String" itemvalue="MISSPELLED" /> + <item index="1" class="java.lang.String" itemvalue="SERVER PROBLEM" /> + <item index="2" class="java.lang.String" itemvalue="INFO" /> + <item index="3" class="java.lang.String" itemvalue="WARNING" /> + <item index="4" class="java.lang.String" itemvalue="ERROR" /> </list> </component> <component name="JavacSettings"> @@ -1377,7 +1378,7 @@ <option name="ADDITIONAL_OPTIONS_STRING" value="" /> </component> <component name="ScalacSettings"> - <option name="MAXIMUM_HEAP_SIZE" value="512" /> + <option name="MAXIMUM_HEAP_SIZE" value="1024" /> <option name="DEPRECATION" value="false" /> <option name="UNCHECKED" value="false" /> </component> @@ -1397,6 +1398,19 @@ </SvnBranchConfiguration> </value> </entry> + <entry key="$PROJECT_DIR$/bin"> + <value> + <SvnBranchConfiguration> + <option name="branchUrls"> + <list> + <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/branches" /> + <option value="https://lampsvn.epfl.ch/svn-repos/scala/scala/tags" /> + </list> + </option> + <option name="trunkUrl" value="https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk" /> + </SvnBranchConfiguration> + </value> + </entry> <entry key="$PROJECT_DIR$/src"> <value> <SvnBranchConfiguration> @@ -1487,30 +1501,17 @@ </component> <component name="WebServicesPlugin" addRequiredLibraries="true" /> <component name="libraryTable"> - <library name="ant"> + <library name="Project ant library"> <CLASSES> <root url="jar://$PROJECT_DIR$/lib/ant/ant-contrib.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/ant/vizant.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/ant/maven-ant-tasks-2.0.9.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/ant/ant-dotnet-1.0.jar!/" /> - <root url="jar:///Users/ilya/work/perforce/IDEA/lib/ant/lib/ant.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> - <library name="lib"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/test/files/lib/enums.jar!/" /> - <root url="jar://$PROJECT_DIR$/test/files/lib/ScalaCheck.jar!/" /> - <root url="jar://$PROJECT_DIR$/test/files/lib/nest.jar!/" /> - <root url="jar://$PROJECT_DIR$/test/files/lib/genericNest.jar!/" /> - <root url="jar://$PROJECT_DIR$/test/files/lib/annotations.jar!/" /> - <root url="jar://$PROJECT_DIR$/test/files/lib/methvsfield.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - <library name="lib1"> + <library name="Project Scala SDK"> <CLASSES> <root url="jar://$PROJECT_DIR$/lib/scala-library.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/jline.jar!/" /> @@ -1524,22 +1525,6 @@ <JAVADOC /> <SOURCES /> </library> - <library name="mylib"> - <CLASSES> - <root url="jar:///Users/ilya/work/scala-2.7.4.final/lib/scala-library.jar!/" /> - <root url="jar:///Users/ilya/work/scala-2.7.4.final/lib/scala-compiler.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - <library name="testlib"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/dists/latest/lib/scalap.jar!/" /> - <root url="jar://$PROJECT_DIR$/dists/latest/lib/scala-partest.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> </component> </project> diff --git a/scalap.iml b/scalap.iml index 531cc854d3..388757f309 100644 --- a/scalap.iml +++ b/scalap.iml @@ -12,7 +12,8 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="lib1" level="project" /> + <orderEntry type="library" name="Project ant library" level="project" /> + <orderEntry type="library" name="Project Scala SDK" level="project" /> </component> </module> @@ -12,10 +12,11 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="lib1" level="project" /> <orderEntry type="module" module-name="actors" /> <orderEntry type="module" module-name="compiler" /> <orderEntry type="module" module-name="library" /> + <orderEntry type="library" name="Project ant library" level="project" /> + <orderEntry type="library" name="Project Scala SDK" level="project" /> </component> </module> |