diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2011-01-26 16:57:31 +0000 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2011-01-26 16:57:31 +0000 |
| commit | b961c9bdfbec7dd0d1ab7d43197780dfa83befca (patch) | |
| tree | 21b17bb45e97561d1e7fb268ff8c3ab87f5441b7 /src/intellij | |
| parent | a1d4d39c40c3ecc784ab667e28fbf6cfa3d06b6f (diff) | |
| download | scala-b961c9bdfbec7dd0d1ab7d43197780dfa83befca.tar.gz scala-b961c9bdfbec7dd0d1ab7d43197780dfa83befca.tar.bz2 scala-b961c9bdfbec7dd0d1ab7d43197780dfa83befca.zip | |
update intellij files, no review
Diffstat (limited to 'src/intellij')
| -rw-r--r-- | src/intellij/partest.iml.SAMPLE | 4 | ||||
| -rw-r--r-- | src/intellij/scala-lang.ipr.SAMPLE | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/intellij/partest.iml.SAMPLE b/src/intellij/partest.iml.SAMPLE index 98731d980d..7dcd868fe4 100644 --- a/src/intellij/partest.iml.SAMPLE +++ b/src/intellij/partest.iml.SAMPLE @@ -17,8 +17,12 @@ </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="actors" /> + <orderEntry type="module" module-name="scalap" /> + <orderEntry type="library" name="lib" level="project" /> + <orderEntry type="library" name="ant" level="application" /> </component> </module> diff --git a/src/intellij/scala-lang.ipr.SAMPLE b/src/intellij/scala-lang.ipr.SAMPLE index 6c5a49c644..4d32f0e2e1 100644 --- a/src/intellij/scala-lang.ipr.SAMPLE +++ b/src/intellij/scala-lang.ipr.SAMPLE @@ -30,6 +30,9 @@ <option name="SKIP_IMPORT_STATEMENTS" value="false" /> </component> <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" /> + <component name="EntryPointsManager"> + <entry_points version="2.0" /> + </component> <component name="InspectionProjectProfileManager"> <profiles> <profile version="1.0" is_locked="false"> @@ -212,9 +215,10 @@ <mapping directory="$PROJECT_DIR$/../.." vcs="Git" /> </component> <component name="libraryTable"> - <library name="lib"> + <library name="compiler-locker"> <CLASSES> - <root url="jar://$PROJECT_DIR$/../../lib/jline.jar!/" /> + <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!/" /> @@ -222,10 +226,9 @@ <JAVADOC /> <SOURCES /> </library> - <library name="compiler-locker"> + <library name="lib"> <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/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!/" /> |