diff options
author | Paul Phillips <paulp@improving.org> | 2011-11-13 01:55:40 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-11-13 01:55:40 +0000 |
commit | ea5aac152dab47e7e4aa37224a0b8a609b6d9a0c (patch) | |
tree | cb3723f21d91748bf83e98f124667e0a2d899c7f | |
parent | d917d7c8a176739f286b1453363606d890de2fc0 (diff) | |
download | scala-ea5aac152dab47e7e4aa37224a0b8a609b6d9a0c.tar.gz scala-ea5aac152dab47e7e4aa37224a0b8a609b6d9a0c.tar.bz2 scala-ea5aac152dab47e7e4aa37224a0b8a609b6d9a0c.zip |
Made windows less aggressive about failing.
There's no way to ever correctly check against a platform String and
then fail if it doesn't exactly match. You have to handle such things
gracefully, because even if you have omniscience and omnipotence at the
time you write it, you will become wrong later.
// example of a condition a vast distance from what should // be
tested before intentionally failing if "%OS%" NEQ "Windows_NT"
Closes SI-4800.
-rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-windows.tmpl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl index 27717100b6..19ea0bb677 100644 --- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl @@ -27,8 +27,7 @@ set _LINE_PARAMS=%_LINE_PARAMS% %1 goto param_loop
:param_afterloop
if "%OS%" NEQ "Windows_NT" (
- echo "Sorry, your version of Windows is too old to run Scala."
- goto :eof
+ echo "Warning, your version of Windows is not supported. Attempting to start scala anyway."
)
@@setlocal
|