Changeset 12112


Ignore:
Timestamp:
May 22, 2009, 10:59:21 AM (10 years ago)
Author:
gb
Message:

Use the value of CCL:*SVN-PROGRAM* to find the "svn" binary (and
indirectly the "svnversion" binary.)

Export CCL:*SVN-PROGRAM*.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/lib/misc.lisp

    r12102 r12112  
    813813
    814814
     815(defparameter *svn-program* "svn")
     816
    815817(defloadvar *use-cygwin-svn*
    816818    #+windows-target (not (null (getenv "CYGWIN")))
     
    822824      (multiple-value-bind (status exit-code)
    823825          (external-process-status
    824            (run-program "svn"  (list "info" (native-translated-namestring "ccl:")) :output s :error :output))
     826           (run-program *svn-program*  (list "info" (native-translated-namestring "ccl:")) :output s :error :output))
    825827        (when (and (eq :exited status) (zerop exit-code))
    826828          (with-input-from-string (output (get-output-stream-string s))
     
    860862
    861863
    862 
     864(defun svnversion-program ()
     865  (or (ignore-errors
     866        (native-translated-namestring
     867         (merge-pathnames "svnversion" *svn-program*)))
     868      "svnversion"))
     869       
     870                     
    863871       
    864872                         
     
    870878    (multiple-value-bind (status exit-code)
    871879        (external-process-status
    872          (run-program "svnversion"  (list  (native-translated-namestring "ccl:") (or (svn-url) "")) :output s :error :output))
     880         (run-program (svnversion-program)  (list  (native-translated-namestring "ccl:") (or (svn-url) "")) :output s :error :output))
    873881      (when (and (eq :exited status) (zerop exit-code))
    874882        (with-input-from-string (output (get-output-stream-string s))
Note: See TracChangeset for help on using the changeset viewer.