Commit 15a6cc91 authored by Dave Cooper's avatar Dave Cooper
Browse files

Merge branch 'slime-devel'

parents 93b0fed1 2a2571bb
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
(asdf:defsystem #:geom-base :description (asdf:defsystem #:geom-base :description
"The Gendl™ Wireframe Geometry" :author "John McCarthy" :license "The Gendl™ Wireframe Geometry" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20130430" :depends-on (:glisp) :version "20130501" :depends-on (:glisp)
#+asdf-encoding :encoding #+asdf-encoding :utf-8 #+asdf-encoding :encoding #+asdf-encoding :utf-8
:components :components
((:file "prereqs/source/presets") ((:file "prereqs/source/presets")
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
(asdf:defsystem #:glisp :description (asdf:defsystem #:glisp :description
"The Gendl™ Common Lisp Portability" :author "John McCarthy" "The Gendl™ Common Lisp Portability" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)" :license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20130430" :depends-on :serial t :version "20130501" :depends-on
(:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel #-allegro :acl-compat) (:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel #-allegro :acl-compat)
#+asdf-encoding :encoding #+asdf-encoding :utf-8 #+asdf-encoding :encoding #+asdf-encoding :utf-8
:components :components
......
...@@ -231,13 +231,39 @@ and \"..\" entries." ...@@ -231,13 +231,39 @@ and \"..\" entries."
#+win32 ((ext:getenv "PID")) ; where does that come from? #+win32 ((ext:getenv "PID")) ; where does that come from?
(t -1)))) (t -1))))
#-(and mswindows lispworks)
(defun run-gs (command) (defun run-gs (command)
"Shell out a ghostscript command and handle errors." "Shell out a ghostscript command and handle errors."
(let ((result (let ((result
(run-program command))) (run-program command)))
(unless (zerop result) (error "Ghostscript threw error")))) (unless (zerop result) (error "Ghostscript threw error"))))
#+(and mswindows lispworks)
(defun run-gs (command)
"Shell out a ghostscript command and handle errors."
(let ((result
(system:run-shell-command command)))
(unless (zerop result) (error "Ghostscript threw error"))))
#+nil
(defun run-gs (command)
"Shell out a ghostscript command and handle errors."
(format t "~a" command)
(let ((result (#+allegro
excl:run-shell-command
#-allegro
acl-compat.excl:run-shell-command
command
;;:show-window :hide
)))
(when result
(unless (zerop result) (error "Ghostscript threw error")))))
(defun run-program (command &key output ignore-error-status force-shell (defun run-program (command &key output ignore-error-status force-shell
(element-type uiop:*default-stream-element-type*) (element-type uiop:*default-stream-element-type*)
(external-format :default) (external-format :default)
...@@ -592,6 +618,7 @@ please find implementation for the currently running lisp.~%") ...@@ -592,6 +618,7 @@ please find implementation for the currently running lisp.~%")
dry-run? dry-run?
(options (list "a")) (options (list "a"))
long-form-options) long-form-options)
#+mswindows (declare (ignore source dest directory print-command? dry-run? options long-form-options))
#+mswindows (error "~&Sorry, glisp:rsync is not yet implemented for MS Windows.~%") #+mswindows (error "~&Sorry, glisp:rsync is not yet implemented for MS Windows.~%")
#-mswindows #-mswindows
(labels ((expanded-pathname-string (pathname) (labels ((expanded-pathname-string (pathname)
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
(asdf:defsystem #:gwl-graphics :description (asdf:defsystem #:gwl-graphics :description
"The Gendl™ GWL embedded graphics support" :author "John McCarthy" "The Gendl™ GWL embedded graphics support" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)" :license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20130430" :depends-on (:geom-base :gwl) :serial t :version "20130501" :depends-on (:geom-base :gwl)
#+asdf-encoding :encoding #+asdf-encoding :utf-8 #+asdf-encoding :encoding #+asdf-encoding :utf-8
:components :components
((:file "gwl/source/application-mixin") ((:file "gwl/source/application-mixin")
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
(asdf:defsystem #:gwl :description (asdf:defsystem #:gwl :description
"The Gendl™ Generative Web Language (GWL)" :author "John McCarthy" "The Gendl™ Generative Web Language (GWL)" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)" :license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20130430" :depends-on (:glisp :aserve) :serial t :version "20130501" :depends-on (:glisp :aserve)
#+asdf-encoding :encoding #+asdf-encoding :utf-8 #+asdf-encoding :encoding #+asdf-encoding :utf-8
:components :components
((:file "source/package") (:file "source/defparameters") ((:file "source/package") (:file "source/defparameters")
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
(asdf:defsystem #:regression :description (asdf:defsystem #:regression :description
"The Gendl™ regression Subsystem" :author "John McCarthy" :license "The Gendl™ regression Subsystem" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20130430" :depends-on (:lift :surf :tasty) :version "20130501" :depends-on (:lift :surf :tasty)
#+asdf-encoding :encoding #+asdf-encoding :utf-8 #+asdf-encoding :encoding #+asdf-encoding :utf-8
:components :components
((:file "utils/source/package") (:file "utils/source/genworks") ((:file "utils/source/package") (:file "utils/source/genworks")
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"The Gendl™ NURBS Surface and Solids Geometry Primitives" :author "The Gendl™ NURBS Surface and Solids Geometry Primitives" :author
"John McCarthy" :license "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20130430" :depends-on (:geom-base) :version "20130501" :depends-on (:geom-base)
#+asdf-encoding :encoding #+asdf-encoding :utf-8 #+asdf-encoding :encoding #+asdf-encoding :utf-8
:components :components
((:file "source/parameters") (:file "source/classes") ((:file "source/parameters") (:file "source/classes")
......
gendl.asd gendl.asd
gwl/gwl.asd gwl/gwl.asd
surf/surf.asd
base/base.asd base/base.asd
surf/surf.asd
glisp/glisp.asd glisp/glisp.asd
apps/ta2/ta2.asd apps/ta2/ta2.asd
demos/bus/bus.asd demos/bus/bus.asd
apps/yadd/yadd.asd
apps/tree/tree.asd apps/tree/tree.asd
apps/yadd/yadd.asd
cl-lite/cl-lite.asd cl-lite/cl-lite.asd
apps/tasty/tasty.asd apps/tasty/tasty.asd
demos/robot/robot.asd demos/robot/robot.asd
geom-base/geom-base.asd
demos/ledger/ledger.asd demos/ledger/ledger.asd
geom-base/geom-base.asd
regression/regression.asd regression/regression.asd
gwl-graphics/gwl-graphics.asd gwl-graphics/gwl-graphics.asd
demos/wire-world/wire-world.asd demos/wire-world/wire-world.asd
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment