diff options
| author | Paul Phillips <paulp@improving.org> | 2012-12-06 12:20:31 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-12-06 12:20:31 -0800 |
| commit | 6ee2ce50a56237eed07bcc6b6198f97779208a02 (patch) | |
| tree | df7a9386e892beafff42bddcc0347f9337cfd3df /test/attic/files/cli/test3/Main.check.scalac | |
| parent | 330c77b097782ed389a83175302379ea72d22c41 (diff) | |
| parent | 96fa31d0a3cf7ff401f9197cd0e12acd296e55b1 (diff) | |
| download | scala-6ee2ce50a56237eed07bcc6b6198f97779208a02.tar.gz scala-6ee2ce50a56237eed07bcc6b6198f97779208a02.tar.bz2 scala-6ee2ce50a56237eed07bcc6b6198f97779208a02.zip | |
Merge commit 'refs/pull/1718/head' into merge-msil-genjvm-delete
* commit 'refs/pull/1718/head':
Expunged the .net backend.
Conflicts:
build.detach.xml
build.examples.xml
build.xml
project/Build.scala
src/compiler/scala/tools/ant/Scalac.scala
src/compiler/scala/tools/nsc/Global.scala
src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala
src/compiler/scala/tools/nsc/transform/Mixin.scala
src/intellij/compiler.iml.SAMPLE
tools/buildcp
Diffstat (limited to 'test/attic/files/cli/test3/Main.check.scalac')
| -rw-r--r-- | test/attic/files/cli/test3/Main.check.scalac | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test/attic/files/cli/test3/Main.check.scalac b/test/attic/files/cli/test3/Main.check.scalac index 8465810d0b..5561cc1ead 100644 --- a/test/attic/files/cli/test3/Main.check.scalac +++ b/test/attic/files/cli/test3/Main.check.scalac @@ -1,7 +1,7 @@ scalac error: bad option: '-dd' scalac -help gives more information Usage: scalac <options | source files> -where possible options include: +where possible options include: -doc Generate documentation -g:<g> Generate debugging info (none,source,line,vars,notc) -nowarn Generate no warnings @@ -15,10 +15,8 @@ where possible options include: -encoding <encoding> Specify character encoding used by source files -windowtitle <windowtitle> Specify window title of generated HTML documentation -documenttitle <documenttitle> Specify document title of generated HTML documentation - -target:<target> Specify which backend to use (jvm-1.5,msil) + -target:<target> Specify which backend to use (jvm-1.5) -migrate Assist in migrating from Scala version 1.0 - -o <file> Name of the output assembly (only relevant with -target:msil) - -r <path> List of assemblies referenced by the program (only relevant with -target:msil) -debug Output debugging messages -deprecation enable detailed deprecation warnings -unchecked enable detailed unchecked warnings |