Changeset 361

Timestamp:

Jan 21, 2004, 10:11:04 PM (21 years ago)

Author:

Gary Byers

Message:

New --version command-line argument; new APPLICATION-VERSION-STRING method.

File:

• trunk/ccl/level-1/l1-readloop.lisp (modified) (4 diffs)

trunk/ccl/level-1/l1-readloop.lisp

@@ -232 +232 @@
    :long-name "help"))
 
+(defvar *standard-version-argument*
+  (make-command-line-argument
+   :keyword :version
+   :help-string "print (LISP-APPLICATION-VERSION) and exit"
+   :option-char #\V
+   :long-name "version"))
+
 (defclass application ()
     ((command-line-arguments
       :initform
-      (list *standard-help-argument*))))
+      (list *standard-help-argument* *standard-version-argument*))))
        
                              
@@ -307 +314 @@
   (if (null error-flag)
     (if (assoc :help opts)
-      (%usage-exit "" 0 (summarize-option-syntax a)))
+      (%usage-exit "" 0 (summarize-option-syntax a))
+      (if (assoc :version opts)
+        (progn
+          (format t "~&~a~&" (application-version-string a))
+          (force-output t)
+          (#_exit 0))))
     (%usage-exit
      (format nil
@@ -327 +339 @@
     (process-application-arguments a error-flag options args)))
 
+(defmethod application-version-string ((a application))
+  "Return a string which (arbitrarily) represents the application version.
+Default version returns OpenMCL version info."
+  (format nil "~&~d.~d~@[.~d~]~@[-~a~]~&"
+          *openmcl-major-version*
+          *openmcl-minor-version*
+          (unless (zerop *openmcl-revision*)
+            *openmcl-revision*)
+          *openmcl-suffix*))
 
 
@@ -356 +377 @@
     :initform
     (list *standard-help-argument*
-                       (make-command-line-argument
-                        :option-char #\n
-                        :long-name "no-init"
-                        :keyword :noinit
-                        :help-string "suppress loading of init file")
-                       (make-command-line-argument
-                        :option-char #\e
-                        :long-name "eval"
-                        :keyword :eval
-                        :help-string "evaluate <form> (may need to quote <form> in shell)"
-                        :may-take-operand t
-                        :allow-multiple t)
-                       (make-command-line-argument
-                        :option-char #\l
-                        :long-name "load"
-                        :keyword :load
-                        :help-string "load <file>"
-                        :may-take-operand t
-                        :allow-multiple t)
-                       (make-command-line-argument
-                        :option-char #\T
-                        :long-name "set-lisp-heap-gc-threshold"
-                        :help-string "set lisp-heap-gc-threshold to <n>"
-                        :keyword :gc-threshold
-                        :may-take-operand t
-                        :allow-multiple nil)))))
+          *standard-version-argument*
+          (make-command-line-argument
+           :option-char #\n
+           :long-name "no-init"
+           :keyword :noinit
+           :help-string "suppress loading of init file")
+          (make-command-line-argument
+           :option-char #\e
+           :long-name "eval"
+           :keyword :eval
+           :help-string "evaluate <form> (may need to quote <form> in shell)"
+           :may-take-operand t
+           :allow-multiple t)
+          (make-command-line-argument
+           :option-char #\l
+           :long-name "load"
+           :keyword :load
+           :help-string "load <file>"
+           :may-take-operand t
+           :allow-multiple t)
+          (make-command-line-argument
+           :option-char #\T
+           :long-name "set-lisp-heap-gc-threshold"
+           :help-string "set lisp-heap-gc-threshold to <n>"
+           :keyword :gc-threshold
+           :may-take-operand t
+           :allow-multiple nil)))))
 
 (defparameter *application*