diff options
author | James Iry <james.iry@typesafe.com> | 2012-12-05 12:43:34 -0800 |
---|---|---|
committer | James Iry <james.iry@typesafe.com> | 2012-12-05 14:36:50 -0800 |
commit | 06844ee821ae500c7485498cc2054e3cf765623f (patch) | |
tree | 9466d012307dcbe2fcb8c6226eaa05e938e51c4a /src/intellij | |
parent | 4b2330b3d3db4263a8b1e19b792596dd60d79045 (diff) | |
download | scala-06844ee821ae500c7485498cc2054e3cf765623f.tar.gz scala-06844ee821ae500c7485498cc2054e3cf765623f.tar.bz2 scala-06844ee821ae500c7485498cc2054e3cf765623f.zip |
SI-6769 Removes GenJVM backend
Get rid of GenJVM and everything that refers to it.
Also get rid of GenAndroid since it's dead code that refers to GenJVM.
Diffstat (limited to 'src/intellij')
-rw-r--r-- | src/intellij/compiler.iml.SAMPLE | 1 | ||||
-rw-r--r-- | src/intellij/fjbg.iml.SAMPLE | 12 | ||||
-rw-r--r-- | src/intellij/scala-lang.ipr.SAMPLE | 2 | ||||
-rw-r--r-- | src/intellij/test.iml.SAMPLE | 1 |
4 files changed, 0 insertions, 16 deletions
diff --git a/src/intellij/compiler.iml.SAMPLE b/src/intellij/compiler.iml.SAMPLE index 696c347b7b..a3ac93cc77 100644 --- a/src/intellij/compiler.iml.SAMPLE +++ b/src/intellij/compiler.iml.SAMPLE @@ -20,7 +20,6 @@ <orderEntry type="module" module-name="library" /> <orderEntry type="module" module-name="reflect" /> <orderEntry type="module" module-name="asm" /> - <orderEntry type="module" module-name="fjbg" /> <orderEntry type="module" module-name="msil" /> <orderEntry type="library" name="ant" level="application" /> <orderEntry type="library" name="jline" level="project" /> diff --git a/src/intellij/fjbg.iml.SAMPLE b/src/intellij/fjbg.iml.SAMPLE deleted file mode 100644 index 03eca69246..0000000000 --- a/src/intellij/fjbg.iml.SAMPLE +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$/../fjbg"> - <sourceFolder url="file://$MODULE_DIR$/../fjbg" isTestSource="false" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - </component> -</module> - diff --git a/src/intellij/scala-lang.ipr.SAMPLE b/src/intellij/scala-lang.ipr.SAMPLE index 37307c2029..a532d8c5c8 100644 --- a/src/intellij/scala-lang.ipr.SAMPLE +++ b/src/intellij/scala-lang.ipr.SAMPLE @@ -198,7 +198,6 @@ <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$/fjbg.iml" filepath="$PROJECT_DIR$/fjbg.iml" /> <module fileurl="file://$PROJECT_DIR$/forkjoin.iml" filepath="$PROJECT_DIR$/forkjoin.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" /> @@ -230,7 +229,6 @@ <root url="file://$PROJECT_DIR$/../../build/locker/classes/library" /> <root url="file://$PROJECT_DIR$/../../build/locker/classes/compiler" /> <root url="file://$PROJECT_DIR$/../../build/locker/classes/reflect" /> - <root url="file://$PROJECT_DIR$/../../build/libs/classes/fjbg" /> <root url="file://$PROJECT_DIR$/../../build/asm/classes" /> </CLASSES> <JAVADOC /> diff --git a/src/intellij/test.iml.SAMPLE b/src/intellij/test.iml.SAMPLE index 112fec428f..424872ccb6 100644 --- a/src/intellij/test.iml.SAMPLE +++ b/src/intellij/test.iml.SAMPLE @@ -12,7 +12,6 @@ <orderEntry type="module" module-name="swing" /> <orderEntry type="module" module-name="partest" /> <orderEntry type="module" module-name="asm" /> - <orderEntry type="module" module-name="fjbg" /> <orderEntry type="module" module-name="forkjoin" /> <orderEntry type="module" module-name="msil" /> </component> |