diff options
-rw-r--r-- | doc/man/man1/scala.1 | 2 | ||||
-rw-r--r-- | doc/man/man1/scalac.1 | 3 | ||||
-rw-r--r-- | doc/man/man1/scaladoc.1 | 1 | ||||
-rw-r--r-- | doc/man/man1/scalaint.1 | 1 | ||||
-rw-r--r-- | doc/man/man1/scalarun.1 | 1 | ||||
-rw-r--r-- | support/windows/scala_wrapper-footer.bat | 5 | ||||
-rw-r--r-- | support/windows/scala_wrapper-header.bat | 8 |
7 files changed, 20 insertions, 1 deletions
diff --git a/doc/man/man1/scala.1 b/doc/man/man1/scala.1 index 9dee330ddf..d6edccdf47 100644 --- a/doc/man/man1/scala.1 +++ b/doc/man/man1/scala.1 @@ -79,10 +79,12 @@ Print product version and exit. .SH EXAMPLES .TP Execute a Scala program generated in the current directory +.BR \fBscala\fR HelloWorld .PP .TP Execute a Scala program generated in a user-defined directory \fBclasses\fR +.BR \fBscala\fR \-classpath classes hello.HelloWorld .PP .\" diff --git a/doc/man/man1/scalac.1 b/doc/man/man1/scalac.1 index fd4748b2b1..068abb6ab4 100644 --- a/doc/man/man1/scalac.1 +++ b/doc/man/man1/scalac.1 @@ -251,13 +251,16 @@ matches all phases .SH EXAMPLES .TP Compile a Scala program +.BR \fBscalac\fR HelloWorld .TP Compile a Scala program to the destination directory \fBclasses\fR +.BR \fBscalac\fR \-d classes HelloWorld.scala .TP Compile all Scala files found in the source directory \fBsrc\fR to the destination directory \fBclasses\fR +.BR \fBscalac\fR \-d classes src/*.scala .\" .\" ############################# EXIT STATUS ################################ diff --git a/doc/man/man1/scaladoc.1 b/doc/man/man1/scaladoc.1 index 38dd96ddbc..5063c72918 100644 --- a/doc/man/man1/scaladoc.1 +++ b/doc/man/man1/scaladoc.1 @@ -79,6 +79,7 @@ Include title for the overview page. .SH EXAMPLES .TP Generate the Scala documentation in the specified directory \fB/tmp\fR +.BR \fBscaladoc\fR -d /tmp HelloWorld .PP .\" diff --git a/doc/man/man1/scalaint.1 b/doc/man/man1/scalaint.1 index b35a333076..5f67995723 100644 --- a/doc/man/man1/scalaint.1 +++ b/doc/man/man1/scalaint.1 @@ -87,6 +87,7 @@ semicolon-separate list of paths). .SH EXAMPLES .TP Run a Scala program located in the current directory +.BR \fBscalaint\fR -nologo HelloWorld.scala -- HelloWorld .PP .\" diff --git a/doc/man/man1/scalarun.1 b/doc/man/man1/scalarun.1 index 139829b370..14bc78faaf 100644 --- a/doc/man/man1/scalarun.1 +++ b/doc/man/man1/scalarun.1 @@ -83,6 +83,7 @@ Generate no warnings. .SH EXAMPLES .TP Run a Scala program located in the current directory +.BR \fBscalarun\fR HelloWorld.scala -- HelloWord .PP .\" diff --git a/support/windows/scala_wrapper-footer.bat b/support/windows/scala_wrapper-footer.bat index b86b3ba7e9..aa55f68a22 100644 --- a/support/windows/scala_wrapper-footer.bat +++ b/support/windows/scala_wrapper-footer.bat @@ -1,6 +1,6 @@ if "%SCALA_HOME%" == "" goto error1 -if not exist "%SCALA_HOME%\VERSION-%VERSION%" goto error2 +if not exist "%SCALA_HOME%\share\doc\scala-%VERSION%\VERSION-%VERSION%" goto error2 set ARGS= @@ -23,4 +23,7 @@ echo ERROR: environment variable SCALA_HOME points to the wrong directory "%SCAL goto end :end +set VERSION= +set COMMAND= +if "%OS%"=="Windows_NT" @endlocal diff --git a/support/windows/scala_wrapper-header.bat b/support/windows/scala_wrapper-header.bat index 5388813200..7166bb4006 100644 --- a/support/windows/scala_wrapper-header.bat +++ b/support/windows/scala_wrapper-header.bat @@ -1,2 +1,10 @@ @echo off +rem Copyright (C) 2002-2005 LAMP/EPFL +rem +rem This is free software; see the distribution for copying conditions. +rem There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A +rem PARTICULAR PURPOSE. + +if "%OS%"=="Windows_NT" @setlocal + |