diff options
author | Geoffrey Washburn <geoffrey.washburn@epfl.ch> | 2008-01-13 11:32:11 +0000 |
---|---|---|
committer | Geoffrey Washburn <geoffrey.washburn@epfl.ch> | 2008-01-13 11:32:11 +0000 |
commit | d27d64aa3087f119b570116019891e8a4e50934f (patch) | |
tree | f712f85d647a1070d577a6635b924669ff835074 /src/compiler/scala/tools/nsc/ScriptRunner.scala | |
parent | a85358f76adc5d9346b78c8a1d8a189918a4e7f5 (diff) | |
download | scala-d27d64aa3087f119b570116019891e8a4e50934f.tar.gz scala-d27d64aa3087f119b570116019891e8a4e50934f.tar.bz2 scala-d27d64aa3087f119b570116019891e8a4e50934f.zip |
Moved the checks for executing JVM versus targe...
Moved the checks for executing JVM versus target JVM into better
locations.
Diffstat (limited to 'src/compiler/scala/tools/nsc/ScriptRunner.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/ScriptRunner.scala | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/compiler/scala/tools/nsc/ScriptRunner.scala b/src/compiler/scala/tools/nsc/ScriptRunner.scala index 6acccc14a2..46a59a0391 100644 --- a/src/compiler/scala/tools/nsc/ScriptRunner.scala +++ b/src/compiler/scala/tools/nsc/ScriptRunner.scala @@ -272,6 +272,13 @@ object ScriptRunner { { import Interpreter.deleteRecursively + /* If the script is running on pre-jvm-1.5 JVM, + it is necessary to force the target setting to jvm-1.4 */ + val major = System.getProperty("java.class.version").split("\\.")(0) + if (Integer.valueOf(major).intValue < 49) { + settings.target.value = "jvm-1.4" + } + /** Compiles the script file, and returns two things: * the directory with the compiled class files, * and a flag for whether the compilation succeeded. @@ -385,11 +392,6 @@ object ScriptRunner { return } - val major = System.getProperty("java.class.version").split("\\.")(0) - if (Integer.valueOf(major).intValue < 49) { - settings.target.value = "jvm-1.4" - } - withCompiledScript(settings, scriptFile){compiledLocation => runCompiled(settings, compiledLocation, scriptArgs) } @@ -410,11 +412,6 @@ object ScriptRunner { str.close() } - val major = System.getProperty("java.class.version").split("\\.")(0) - if (Integer.valueOf(major).intValue < 49) { - settings.target.value = "jvm-1.4" - } - withCompiledScript(settings, scriptFile.getPath){compiledLocation => scriptFile.delete() runCompiled(settings, compiledLocation, scriptArgs) |