diff options
| author | Lex Spoon <lex@lexspoon.org> | 2007-06-12 15:28:59 +0000 |
|---|---|---|
| committer | Lex Spoon <lex@lexspoon.org> | 2007-06-12 15:28:59 +0000 |
| commit | f587ec7c8f616d80f1a115fdb21a5b7f7da8ebf7 (patch) | |
| tree | 1eaa615e35ddb369a361f42291d0be4843e7b4a3 /src/compiler/scala/tools/nsc/Global.scala | |
| parent | 5740c65d5f263ac67fa06c37bf18fec0fcf08a2e (diff) | |
| download | scala-f587ec7c8f616d80f1a115fdb21a5b7f7da8ebf7.tar.gz scala-f587ec7c8f616d80f1a115fdb21a5b7f7da8ebf7.tar.bz2 scala-f587ec7c8f616d80f1a115fdb21a5b7f7da8ebf7.zip | |
Replaced -Xscript by -script, so that script files
can be compiled into a user-specified object wrapper
Diffstat (limited to 'src/compiler/scala/tools/nsc/Global.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index afedea0b1a..0c7e18c2e9 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -593,11 +593,12 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable def compile(filenames: List[String]) { try { - if (settings.Xscript.value && filenames.length != 1) + val scriptMain = settings.script.value + if (scriptMain != "" && filenames.length != 1) error("can only compile one script at a time") val sources = filenames map ( - if (settings.Xscript.value) - (x => ScriptRunner.wrappedScript(x, getSourceFile _)) + if (scriptMain != "") + (x => ScriptRunner.wrappedScript(scriptMain, x, getSourceFile _)) else getSourceFile) compileSources(sources) |