diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2009-10-06 16:22:11 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2009-10-06 16:22:11 +0000 |
| commit | 43ce7fbc82f68f971ed3ddce3401e933f87686d2 (patch) | |
| tree | 8e1f272467378baf3313dadfe81ed5e3f5c71270 | |
| parent | fe8658350be10057c5794ab3ccfa32894a46c710 (diff) | |
| download | scala-43ce7fbc82f68f971ed3ddce3401e933f87686d2.tar.gz scala-43ce7fbc82f68f971ed3ddce3401e933f87686d2.tar.bz2 scala-43ce7fbc82f68f971ed3ddce3401e933f87686d2.zip | |
Restored original project files
| -rw-r--r-- | compiler.iml | 12 | ||||
| -rw-r--r-- | scala-lang.ipr | 14 |
2 files changed, 8 insertions, 18 deletions
diff --git a/compiler.iml b/compiler.iml index fe440df844..a41887aa3b 100644 --- a/compiler.iml +++ b/compiler.iml @@ -2,23 +2,17 @@ <module relativePaths="true" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <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" /> - </configuration> + <configuration /> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/build/quick/classes/compiler" /> - <output-test url="file://$MODULE_DIR$/out/test/compiler" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$/src/compiler"> <sourceFolder url="file://$MODULE_DIR$/src/compiler" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="Locker Lib" 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" /> diff --git a/scala-lang.ipr b/scala-lang.ipr index 40e134b243..eaf94edb96 100644 --- a/scala-lang.ipr +++ b/scala-lang.ipr @@ -1337,7 +1337,6 @@ </component> <component name="ProjectDictionaryState"> <dictionary name="odersky" /> - <dictionary name="dragos" /> </component> <component name="ProjectFileVersion" converted="true" /> <component name="ProjectKey"> @@ -1345,10 +1344,14 @@ </component> <component name="ProjectModuleManager"> <modules> + <module fileurl="file://$PROJECT_DIR$/actors.iml" filepath="$PROJECT_DIR$/actors.iml" /> <module fileurl="file://$PROJECT_DIR$/compiler.iml" filepath="$PROJECT_DIR$/compiler.iml" /> + <module fileurl="file://$PROJECT_DIR$/dbc.iml" filepath="$PROJECT_DIR$/dbc.iml" /> <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$/scalap.iml" filepath="$PROJECT_DIR$/scalap.iml" /> + <module fileurl="file://$PROJECT_DIR$/swing.iml" filepath="$PROJECT_DIR$/swing.iml" /> </modules> </component> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK"> @@ -1488,7 +1491,7 @@ <option name="mySupportsUserInfoFilter" value="true" /> </component> <component name="VcsDirectoryMappings"> - <mapping directory="" vcs="Git" /> + <mapping directory="" vcs="svn" /> </component> <component name="WebServicesPlugin" addRequiredLibraries="true" /> <component name="libraryTable"> @@ -1516,13 +1519,6 @@ <JAVADOC /> <SOURCES /> </library> - <library name="Locker Lib"> - <CLASSES> - <root url="file://$PROJECT_DIR$/build/locker/classes/library" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> </component> </project> |