diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-05-11 14:03:00 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-05-11 14:25:31 +0200 |
commit | 9c1d5cedecd8d367c50533b09c543844f1c0d314 (patch) | |
tree | 98704118da314e347afcdecd6653225d1659a779 /src/intellij | |
parent | 1ca2a12f68f1d7b2eae8b951febca4bb7149b8a9 (diff) | |
download | scala-9c1d5cedecd8d367c50533b09c543844f1c0d314.tar.gz scala-9c1d5cedecd8d367c50533b09c543844f1c0d314.tar.bz2 scala-9c1d5cedecd8d367c50533b09c543844f1c0d314.zip |
intellij project files for ASM removal
ij fix
Diffstat (limited to 'src/intellij')
-rw-r--r-- | src/intellij/compiler.iml.SAMPLE | 2 | ||||
-rw-r--r-- | src/intellij/partest-extras.iml.SAMPLE | 2 | ||||
-rw-r--r-- | src/intellij/partest-javaagent.iml.SAMPLE | 2 | ||||
-rw-r--r-- | src/intellij/repl.iml.SAMPLE | 2 | ||||
-rw-r--r-- | src/intellij/scala.ipr.SAMPLE | 11 | ||||
-rw-r--r-- | src/intellij/test-junit.iml.SAMPLE | 2 | ||||
-rw-r--r-- | src/intellij/test.iml.SAMPLE | 2 |
7 files changed, 15 insertions, 8 deletions
diff --git a/src/intellij/compiler.iml.SAMPLE b/src/intellij/compiler.iml.SAMPLE index 00f732e255..0e121925e6 100644 --- a/src/intellij/compiler.iml.SAMPLE +++ b/src/intellij/compiler.iml.SAMPLE @@ -8,10 +8,10 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="asm" /> <orderEntry type="module" module-name="library" /> <orderEntry type="module" module-name="reflect" /> <orderEntry type="library" name="starr" level="project" /> <orderEntry type="library" name="ant" level="project" /> + <orderEntry type="library" name="asm" level="project" /> </component> </module>
\ No newline at end of file diff --git a/src/intellij/partest-extras.iml.SAMPLE b/src/intellij/partest-extras.iml.SAMPLE index d352f9ebc3..1cd712184b 100644 --- a/src/intellij/partest-extras.iml.SAMPLE +++ b/src/intellij/partest-extras.iml.SAMPLE @@ -7,12 +7,12 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="asm" /> <orderEntry type="module" module-name="compiler" /> <orderEntry type="module" module-name="library" /> <orderEntry type="module" module-name="reflect" /> <orderEntry type="module" module-name="repl" /> <orderEntry type="library" name="partest" level="project" /> <orderEntry type="library" name="starr" level="project" /> + <orderEntry type="library" name="asm" level="project" /> </component> </module>
\ No newline at end of file diff --git a/src/intellij/partest-javaagent.iml.SAMPLE b/src/intellij/partest-javaagent.iml.SAMPLE index c6081a2a4b..ffc540cdb9 100644 --- a/src/intellij/partest-javaagent.iml.SAMPLE +++ b/src/intellij/partest-javaagent.iml.SAMPLE @@ -7,6 +7,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="asm" /> + <orderEntry type="library" name="asm" level="project" /> </component> </module>
\ No newline at end of file diff --git a/src/intellij/repl.iml.SAMPLE b/src/intellij/repl.iml.SAMPLE index 896ec1dd5c..7476f30131 100644 --- a/src/intellij/repl.iml.SAMPLE +++ b/src/intellij/repl.iml.SAMPLE @@ -7,11 +7,11 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="asm" /> <orderEntry type="module" module-name="compiler" /> <orderEntry type="module" module-name="library" /> <orderEntry type="module" module-name="reflect" /> <orderEntry type="library" name="starr" level="project" /> <orderEntry type="library" name="repl-deps" level="project" /> + <orderEntry type="library" name="asm" level="project" /> </component> </module>
\ No newline at end of file diff --git a/src/intellij/scala.ipr.SAMPLE b/src/intellij/scala.ipr.SAMPLE index 07f366a302..47ac2be188 100644 --- a/src/intellij/scala.ipr.SAMPLE +++ b/src/intellij/scala.ipr.SAMPLE @@ -36,7 +36,6 @@ <component name="ProjectModuleManager"> <modules> <module fileurl="file://$PROJECT_DIR$/actors.iml" filepath="$PROJECT_DIR$/actors.iml" /> - <module fileurl="file://$PROJECT_DIR$/asm.iml" filepath="$PROJECT_DIR$/asm.iml" /> <module fileurl="file://$PROJECT_DIR$/compiler.iml" filepath="$PROJECT_DIR$/compiler.iml" /> <module fileurl="file://$PROJECT_DIR$/forkjoin.iml" filepath="$PROJECT_DIR$/forkjoin.iml" /> <module fileurl="file://$PROJECT_DIR$/interactive.iml" filepath="$PROJECT_DIR$/interactive.iml" /> @@ -73,6 +72,14 @@ <JAVADOC /> <SOURCES /> </library> + <library name="asm"> + <CLASSES> + <root url="file://$PROJECT_DIR$/../../build/deps/asm" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + <jarDirectory url="file://$PROJECT_DIR$/../../build/deps/asm" recursive="false" /> + </library> <library name="junit"> <CLASSES> <root url="file://$PROJECT_DIR$/../../build/deps/junit" /> @@ -118,4 +125,4 @@ <SOURCES /> </library> </component> -</project> +</project>
\ No newline at end of file diff --git a/src/intellij/test-junit.iml.SAMPLE b/src/intellij/test-junit.iml.SAMPLE index fe98fce60c..86dc39c175 100644 --- a/src/intellij/test-junit.iml.SAMPLE +++ b/src/intellij/test-junit.iml.SAMPLE @@ -8,7 +8,6 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="actors" /> - <orderEntry type="module" module-name="asm" /> <orderEntry type="module" module-name="compiler" /> <orderEntry type="module" module-name="forkjoin" /> <orderEntry type="module" module-name="library" /> @@ -19,5 +18,6 @@ <orderEntry type="library" name="scaladoc-deps" level="project" /> <orderEntry type="library" name="junit" level="project" /> <orderEntry type="library" name="starr" level="project" /> + <orderEntry type="library" name="asm" level="project" /> </component> </module>
\ No newline at end of file diff --git a/src/intellij/test.iml.SAMPLE b/src/intellij/test.iml.SAMPLE index 175a920771..5047967721 100644 --- a/src/intellij/test.iml.SAMPLE +++ b/src/intellij/test.iml.SAMPLE @@ -8,7 +8,6 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="actors" /> - <orderEntry type="module" module-name="asm" /> <orderEntry type="module" module-name="compiler" /> <orderEntry type="module" module-name="forkjoin" /> <orderEntry type="module" module-name="interactive" /> @@ -18,5 +17,6 @@ <orderEntry type="module" module-name="repl" /> <orderEntry type="library" name="partest" level="project" /> <orderEntry type="library" name="scaladoc-deps" level="project" /> + <orderEntry type="library" name="asm" level="project" /> </component> </module>
\ No newline at end of file |