Commit 9f275e14 authored by Dave Cooper's avatar Dave Cooper

adjusted the restart-init-function to locate ghostscript and quicklisp

parent 5e40bf5f
......@@ -3,6 +3,8 @@
*.fasl
bin
*~
.DS_Store
# Ignore (generated) html files,
# *.html
......
......@@ -94,6 +94,10 @@ temporary directory, returned by <tt>(glisp:temporary-folder)</tt>."
))))
(defun app (&rest args)
(let ((self (apply #'make-object 'app args)))
(the make!)))
(defun gdl ()
(let ((destination-directory
(let ((implementation-identifier (glisp:implementation-identifier))
......@@ -109,7 +113,9 @@ temporary directory, returned by <tt>(glisp:temporary-folder)</tt>."
:restart-init-function '(lambda()
(setq glisp:*gdl-home* (glisp:current-directory))
(setq glisp:*genworks-source-home* (merge-pathnames "src/" glisp:*gdl-home*))
(gdl:start-gdl :edition :trial)))
(setq ql:*quicklisp-home* (merge-pathnames "quicklisp/" glisp:*gdl-home*))
(gdl:start-gdl :edition :trial)
(glisp:set-gs-path (merge-pathnames "gpl/gs/gs8.63/bin/gswin32c.exe" glisp:*gdl-home*))))
destination-directory))
......
......@@ -73,7 +73,7 @@
(error "Need implementation of dump-memory for currently running lisp."))
(defun implementation-identifier ()
(asdf-utilities:implementation-identifier))
(asdf::implementation-identifier))
#-allegro(warn "~&Please implement generate-application for the currently running lisp.~%")
(defun make-gdl-app (&rest args)
......
(require 'cl)
(defvar gdl:*gdl-home* (concat default-directory "../"))
(defvar gdl:*gdl-program-home* default-directory)
(defvar gdl:*gdl-toplevel-base* "*gdl toplevel*")
(defvar gdl:*mgdl-image-name* "gdl")
......@@ -11,8 +12,8 @@
(defun gdl-devo (image-name)
(interactive)
(let ((executable (or (fi::probe-file (concat default-directory image-name ".exe"))
(fi::probe-file (concat default-directory image-name)))))
(let ((executable (or (fi::probe-file (concat gdl:*gdl-program-home* image-name ".exe"))
(fi::probe-file (concat gdl:*gdl-program-home* image-name)))))
(setq gdl:*gdl-toplevel*
(concat gdl:*gdl-toplevel-base*
......
......@@ -306,7 +306,7 @@ If you are covered by a Genworks Proprietary License (Commercial or
Academic), then that license takes precedence.
This program also contains materials as listed in the accompanying
quicklisp/ directory, with respective copyrights and licenses.q
quicklisp/ directory, with respective copyrights and licenses.
"
))))
......
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