From 2f5f1578061a0a9867277901209eead929d69c40 Mon Sep 17 00:00:00 2001 From: michelou Date: Wed, 11 Oct 2006 20:08:10 +0000 Subject: [PATCH] corrected copyright notice in script templates git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@8948 5e8d7ff9-d8ef-0310-90f0-a4852d11357a --- build.xml | 2 +- src/actors/scala/actors/Actor.scala | 12 ++---------- .../scala/tools/ant/templates/generic-unix.tmpl | 1 + .../scala/tools/ant/templates/generic-windows.tmpl | 4 +++- .../scala/tools/ant/templates/tool-unix.tmpl | 1 + .../scala/tools/ant/templates/tool-windows.tmpl | 4 +++- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/build.xml b/build.xml index 88fbccfe7..3cdba8834 100644 --- a/build.xml +++ b/build.xml @@ -29,7 +29,7 @@ PROPERTIES - + diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala index c3f2f2d40..319f1d4bb 100644 --- a/src/actors/scala/actors/Actor.scala +++ b/src/actors/scala/actors/Actor.scala @@ -491,16 +491,8 @@ case class Exit(from: Actor, reason: String) /** - *

- * This class is used by our efficient message queue - * implementation. - *

- *
- *
Direct Known Subclasses:
- *
- * MessageQueue - *
- *
+ * This class is used by our efficient message queue + * implementation. */ private[actors] abstract class MessageQueueResult[Msg] { def msg: Msg diff --git a/src/compiler/scala/tools/ant/templates/generic-unix.tmpl b/src/compiler/scala/tools/ant/templates/generic-unix.tmpl index 2c6148fdf..008036c85 100644 --- a/src/compiler/scala/tools/ant/templates/generic-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/generic-unix.tmpl @@ -4,6 +4,7 @@ # Scala runtime @version@ ############################################################################## # @copyright@ +# # This is free software; see the distribution for copying conditions. # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. diff --git a/src/compiler/scala/tools/ant/templates/generic-windows.tmpl b/src/compiler/scala/tools/ant/templates/generic-windows.tmpl index acf368512..22fb9faf3 100644 --- a/src/compiler/scala/tools/ant/templates/generic-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/generic-windows.tmpl @@ -1,7 +1,9 @@ @@echo off rem ########################################################################## -rem # Copyright @copyright@ +rem # Scala runtime @version@ +rem ########################################################################## +rem # @copyright@ 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 diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl index a60295aa2..3e38b8970 100644 --- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl @@ -4,6 +4,7 @@ # @name@ @version@ ############################################################################## # @copyright@ +# # This is free software; see the distribution for copying conditions. # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl index e558c34bf..b86aa851c 100644 --- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl @@ -1,7 +1,9 @@ @@echo off rem ########################################################################## -rem # Copyright @copyright@ +rem # @name@ @version@ +rem ########################################################################## +rem # @copyright@ 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