Commit 942a392c authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Merge branch 'master' of gitlab.common-lisp.net:asdf/asdf

parents d805373e d18e1ffc

test/test-program.script

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


(assert (find-system :hello-world-example))



(trace run-program)

(trace run-program #+(and sbcl os-windows) sb-ext:run-program)



#+allegro

(defparameter *lisp*

test/test-run-program.script

+10 −6
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
  (trace uiop:run-program uiop/run-program::%run-program uiop/run-program::%system

         ext:shell ext:run-shell-command ext:run-program))



#+(and sbcl os-windows) (trace sb-ext:run-program)



;; On Windows, normalize away CRLF into jut the unixy LF.

(defun dewindowize (x)

  (block ()
@@ -21,9 +23,14 @@ 
(assert-equal "ok 1"

              (dewindowize (run-program '("echo" "ok" "1") :output '(:string :stripped t))))



#+(and sbcl os-windows)

(leave-test "SBCL won't let us pass unquoted arguments to cmd.exe" 0)



#-(and sbcl os-windows)

(progn

 (DBG "Testing echo ok 1 via run-program as a string")

 (assert-equal "ok 1"

              (dewindowize (run-program "echo ok 1" :output '(:string :stripped t))))

               (dewindowize (run-program "echo ok 1" :output '(:string :stripped t)))))



;;; test asdf run-shell-command function

(setf *verbose-out* nil)
@@ -81,9 +88,6 @@ 
             (error "Didn't get good exit status.")))))))

   ok1))



;; NB1: run-shell-command is deprecated. Use run-program instead.

;; NB2: we do NOT support stderr capture to *verbose-out* anymore in run-shell-command.

;; If you want 2>&1 redirection, you know where to find it.

(assert-equal '(:ok 1) (run-program "echo :ok  1" :output :forms))

(assert-equal "ok" (dewindowize (stripln

                                 (with-output-to-string (*standard-output*)

test/test-utilities.script

100644 → 100755
+7 −1
Original line number Diff line number Diff line 
;;; -*- Lisp -*-



#+(and sbcl os-windows) (trace sb-ext:run-program)



(defun getcwd-from-run-program ()

  (uiop:parse-native-namestring

   (nest

    ;; TODO: fix run-program to use POWERSHELL.EXE rather than CMD, and remove this kluge.

    #+os-windows (string-trim " ")

    (run-program

     (os-cond ((os-unix-p) '("pwd" "-P")) ((os-windows-p) "echo %cd%"))

     (os-cond

       ((os-unix-p) '("pwd" "-P"))

       ((os-windows-p) "cd"))

     :output '(:string :stripped t)))

   :ensure-directory t))



(let ((asdf-directory (truename *asdf-directory*)))

  (chdir asdf-directory)

  (assert-pathname-equal asdf-directory (getcwd))

  #-(and sbcl os-windows)

  (assert-pathname-equal asdf-directory (getcwd-from-run-program))

  (assert (probe-file* "asdf.asd")))



(let ((test-directory (truename *test-directory*)))

  (chdir test-directory)

  (assert-pathname-equal test-directory (getcwd))

  #-(and sbcl os-windows)

  (assert-pathname-equal test-directory (getcwd-from-run-program))

  (assert (probe-file* "test-utilities.script")))

uiop/filesystem.lisp

+1 −0
Original line number Diff line number Diff line
@@ -584,6 +584,7 @@ in an atomic way if the implementation allows." 
    #+clisp ;; in recent enough versions of CLISP, :if-exists :overwrite would make it atomic

    (progn (funcall 'require "syscalls")

           (symbol-call :posix :copy-file source target :method :rename))

    #+(and sbcl os-windows) (delete-file-if-exists target) ;; not atomic

    #-clisp

    (rename-file source target

                 #+(or clasp clozure ecl) :if-exists #+clozure :rename-and-delete #+(or clasp ecl) t))

uiop/run-program.lisp

+19 −7
Original line number Diff line number Diff line
@@ -332,6 +332,15 @@ Programmers are encouraged to define their own methods for this generic function 
                       (subprocess-error-command condition)

                       (subprocess-error-code condition)))))



  ;;; find CMD.exe on windows

  (defun %cmd-shell-pathname ()

    (os-cond

     ((os-windows-p)

      (strcat (native-namestring (getenv-absolute-directory "WINDIR"))

              "System32\\cmd.exe"))

     (t

      (error "CMD.EXE is not the command shell for this OS."))))



  ;;; Internal helpers for run-program

  (defun %normalize-command (command)

    "Given a COMMAND as a list or string, transform it in a format suitable
@@ -341,17 +350,18 @@ for the implementation's underlying run-program function" 
      #+os-unix (list command)

      #+os-windows

      (string

       #+mkcl (list "cmd" '#:/c command)

       #+mkcl (list "cmd" "/c" command)

       ;; NB: We do NOT add cmd /c here. You might want to.

       #+(or allegro clisp) command

       ;; On ClozureCL for Windows, we assume you are using

       ;; r15398 or later in 1.9 or later,

       ;; so that bug 858 is fixed http://trac.clozure.com/ccl/ticket/858

       #+clozure (cons "cmd" (strcat "/c " command))

       #+sbcl (list (%cmd-shell-pathname) "/c" command)

       ;; NB: On other Windows implementations, this is utterly bogus

       ;; except in the most trivial cases where no quoting is needed.

       ;; Use at your own risk.

       #-(or allegro clisp clozure mkcl) (list "cmd" "/c" command))

       #-(or allegro clisp clozure mkcl sbcl) (list "cmd" "/c" command))

      #+os-windows

      (list

       #+allegro (escape-windows-command command)
@@ -740,15 +750,17 @@ It returns a process-info plist with possible keys: 
      (string

       (os-cond

        ((os-windows-p)

         #+allegro

         (concatenate 'string "cmd /c " command)

         #-allegro command)

         #+(or allegro clisp)

         (strcat (%cmd-shell-pathname) " /c " command)

         #-(or allegro clisp) command)

        (t command)))

      (list (escape-shell-command

             (os-cond

              ((os-unix-p) (cons "exec" command))

              ((os-windows-p) #+allegro (append '("cmd" "/c") command)

                              #-allegro command)

              ((os-windows-p)

               #+(or allegro sbcl clisp)

               (cons (%cmd-shell-pathname) (cons "/c" command))

               #-(or allegro sbcl clisp) command)

              (t command))))))



  (defun %redirected-system-command (command in out err directory) ;; helper for %USE-SYSTEM