~ chicken-core (chicken-5) edea9d61d6019ac826cf9195ab6c587f524f56dd


commit edea9d61d6019ac826cf9195ab6c587f524f56dd
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Mon Feb 6 09:16:25 2012 +0100
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Mon Feb 6 09:16:25 2012 +0100

    deprecated -v/-V for -version which is consistent across all core tools

diff --git a/chicken-install.scm b/chicken-install.scm
index f8c39589..f1eceb9c 100644
--- a/chicken-install.scm
+++ b/chicken-install.scm
@@ -752,7 +752,7 @@
 usage: chicken-install [OPTION | EXTENSION[:VERSION]] ...
 
   -h   -help                    show this message and exit
-  -v   -version                 show version and exit
+       -version                 show version and exit
        -force                   don't ask, install even if versions don't match
   -k   -keep                    keep temporary files
   -x   -keep-installed          install only if not already installed
@@ -908,7 +908,8 @@ EOF
                         (set! *keep* #t)
                         (set! *no-install* #t)
                         (loop (cdr args) eggs))
-                       ((or (string=? arg "-v") (string=? arg "-version"))
+                       ((or (string=? arg "-v") ; DEPRECATED
+			    (string=? arg "-version"))
                         (print (chicken-version))
                         (exit 0))
                        ((or (string=? arg "-u") (string=? arg "-update-db"))
diff --git a/chicken-profile.scm b/chicken-profile.scm
index 5a28eb36..1b001aca 100644
--- a/chicken-profile.scm
+++ b/chicken-profile.scm
@@ -61,6 +61,7 @@ Usage: chicken-profile [FILENAME | OPTION] ...
  the highest modification time, in case multiple profiles exist.
 
 EOF
+;|
 )
  (exit 64) )
 
@@ -91,7 +92,8 @@ EOF
 	      (if (and n (> n 0)) n (error "invalid argument to option" arg))))
 	  (cond 
 	   [(member arg '("-h" "-help" "--help")) (print-usage)]
-	   [(member arg '("-v" "-version"))
+	   [(member arg '("-v" 		; DEPRECATED
+			  "-version"))
 	    (print "chicken-profile - Version " (chicken-version))
 	    (exit) ]
 	   [(string=? arg "-release")
diff --git a/chicken-status.scm b/chicken-status.scm
index 2d456def..6afe72fa 100644
--- a/chicken-status.scm
+++ b/chicken-status.scm
@@ -114,7 +114,7 @@
 usage: chicken-status [OPTION | PATTERN] ...
 
   -h   -help                    show this message
-  -v   -version                 show version and exit
+       -version                 show version and exit
   -f   -files                   list installed files
        -exact                   treat PATTERN as exact match (not a pattern)
        -host                    when cross-compiling, show status of host extensions only
@@ -175,7 +175,8 @@ EOF
 		    ((or (string=? arg "-f") (string=? arg "-files"))
 		     (set! files #t)
 		     (loop (cdr args) pats))
-		    ((or (string=? arg "-v") (string=? arg "-version"))
+		    ((or (string=? arg "-v") ; DEPRECATED
+			 (string=? arg "-version"))
 		     (print (chicken-version))
 		     (exit 0))
 		    ((and (positive? (string-length arg))
diff --git a/chicken-uninstall.scm b/chicken-uninstall.scm
index 309a9d81..3c86026b 100644
--- a/chicken-uninstall.scm
+++ b/chicken-uninstall.scm
@@ -98,7 +98,7 @@
 usage: chicken-uninstall [OPTION | PATTERN] ...
 
   -h   -help                    show this message and exit
-  -v   -version                 show version and exit
+       -version                 show version and exit
        -force                   don't ask, delete whatever matches
        -exact                   treat PATTERN as exact match (not a pattern)
   -s   -sudo                    use sudo(1) for deleting files
@@ -129,7 +129,8 @@ EOF
 			    (string=? arg "-h")
 			    (string=? arg "--help"))
 			(usage 0))
-		       ((or (string=? arg "-v") (string=? arg "-version"))
+		       ((or (string=? arg "-v") ; DEPRECATED
+			    (string=? arg "-version"))
 			(print (chicken-version))
 			(exit 0))
 		       ((string=? arg "-target")
diff --git a/csc.scm b/csc.scm
index 6572b67f..0b2dabbe 100644
--- a/csc.scm
+++ b/csc.scm
@@ -160,7 +160,7 @@
     (-S "-scrutinize")
     (-M "-module")
     (|-P| "-check-syntax")
-    (|-V| "-version")
+    (|-V| "-version")			; DEPRECATED
     (-f "-fixnum-arithmetic")
     (|-D| "-feature")
     (-i "-case-insensitive")
@@ -310,7 +310,7 @@ Usage: #{csc} FILENAME | OPTION ...
                                     progress
     -vvv                           display information about all compilation
                                     stages
-    -V  -version                   display Scheme compiler version and exit
+    -version                       display Scheme compiler version and exit
     -release                       display release number and exit
 
   File and pathname options:
diff --git a/csi.scm b/csi.scm
index 8846dd47..c06aeb28 100644
--- a/csi.scm
+++ b/csi.scm
@@ -91,7 +91,7 @@ usage: csi [FILENAME | OPTION ...]
   one of the following:
 
     -h  -help  --help             display this text and exit
-    -v  -version                  display version and exit
+        -version                  display version and exit
         -release                  print release number and exit
     -i  -case-insensitive         enable case-insensitive reading
     -e  -eval EXPRESSION          evaluate given expression
@@ -1030,7 +1030,9 @@ EOF
       (when (member* '("-h" "-help" "--help") args)
 	(print-usage)
 	(exit 0) )
-      (when (member* '("-v" "-version") args)
+      (when (member* '("-v"		; DEPRECATED
+		       "-version") 
+		     args)
 	(print-banner)
 	(exit 0) )
       (when (member "-setup-mode" args)
Trap