Commit 46e50d25 authored by Dave Cooper's avatar Dave Cooper

Merge tag '1592' into devo

Merging release 1592 with devo and master.
parents 2f8349cc 3ecc4eba
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
*.fas *.fas
*.xfasl *.xfasl
*.dx64fsl *.dx64fsl
*.wx64fsl
*.64xfasl *.64xfasl
*.lib *.lib
bin bin
......
;;;; -*- coding: utf-8 -*- ;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:dom :description (asdf:defsystem #:dom :description
"The Gendl\" dom Subsystem" :author "John McCarthy" :license "The Gendl® dom Subsystem" :author "Genworks International" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20160828" :depends-on (:cl-who :yadd) :version "20170524" :depends-on (:cl-who :yadd)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
:components #+asdf-encodings :encoding #+asdf-encodings :utf-8
((:file "base/source/package") (:file "base/source/assembly") :components
(:file "writers/source/package") ((:file "base/source/package") (:file "base/source/assembly")
(:file "writers/source/dom-writer") (:file "writers/source/html") (:file "writers/source/package")
(:file "writers/source/latex") (:file "writers/source/plain-text") (:file "writers/source/dom-writer") (:file "writers/source/html")
(:file "html/source/package") (:file "html/source/lenses") (:file "writers/source/latex") (:file "writers/source/plain-text")
(:file "latex/source/package") (:file "latex/source/lenses") (:file "html/source/package") (:file "html/source/lenses")
(:file "latex/source/utilities") (:file "latex/source/package") (:file "latex/source/lenses")
(:file "test-parts/source/assembly"))) (:file "latex/source/utilities")
(:file "test-parts/source/assembly")))
;;;; -*- coding: utf-8 -*- ;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:gorg :description (asdf:defsystem #:gorg :description
"The Gendl gorg Subsystem" :author "Xinyue (Cherie) Yang" :license "The Gendl® gorg Subsystem" :author "Xinyue (Cherie) Yang" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20150613" :depends-on (:html-template :gwl-graphics) :version "20170524" :depends-on (:html-template :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-encodings :encoding #+asdf-encodings :utf-8
:components :components
((:file "source/package") (:file "source/base-framework") ((:file "source/package") (:file "source/base-framework")
......
;;;; -*- coding: utf-8 -*- ;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:graphs :description (asdf:defsystem #:graphs :description
"The Gendl™ graphs Subsystem" :author "Dave Cooper" :license "The Gendl® graphs Subsystem" :author "Genworks International"
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t :license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:version "20160110" :depends-on (:gwl-graphics) :serial t :version "20170524" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-encodings :encoding #+asdf-encodings :utf-8
:components :components
((:file "source/package") (:file "source/assembly") ((:file "source/package") (:file "source/assembly")
......
;;;; -*- coding: utf-8 -*- ;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:ta2 :description (asdf:defsystem #:ta2 :description
"The Gendl\" (legacy) Testing and Tracking Utility, version 2 (using Ajax but pre-gdlAjax, and no JQuery or CSS)" "The Gendl® (legacy) Testing and Tracking Utility, version 2 (using Ajax but pre-gdlAjax, and no JQuery or CSS)"
:author "John McCarthy" :license :author "Genworks International" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20160828" :depends-on (:gwl-graphics) :version "20170524" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
:components #+asdf-encodings :encoding #+asdf-encodings :utf-8
((:file "source/package") (:file "source/parameters") :components
(:file "source/javascript") (:file "source/action-object") ((:file "source/package") (:file "source/parameters")
(:file "source/ajax") (:file "source/assembly") (:file "source/javascript") (:file "source/action-object")
(:file "source/click-mode") (:file "source/inspector") (:file "source/ajax") (:file "source/assembly")
(:file "source/object-tree") (:file "source/part-type-form") (:file "source/click-mode") (:file "source/inspector")
(:file "source/publish") (:file "source/viewport"))) (:file "source/object-tree") (:file "source/part-type-form")
(:file "source/publish") (:file "source/viewport")))
;;;; -*- coding: utf-8 -*- ;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:tasty :description (asdf:defsystem #:tasty :description
"The Gendl\" Web-based Development Environment (tasty)" :author "The Gendl® Web-based Development Environment (tasty)" :author
"John McCarthy" :license "Genworks International" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20160828" :depends-on (:tree :gwl-graphics) :version "20170524" :depends-on (:tree :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
:components #+asdf-encodings :encoding #+asdf-encodings :utf-8
((:file "source/package") (:file "source/parameters") :components
(:file "source/assembly") (:file "source/initialize") ((:file "source/package") (:file "source/parameters")
(:file "source/inspector") (:file "source/menu") (:file "source/assembly") (:file "source/initialize")
(:file "source/new-inspector") (:file "source/newer-inspector") (:file "source/inspector") (:file "source/menu")
(:file "source/part-type-form") (:file "source/publish") (:file "source/new-inspector") (:file "source/newer-inspector")
(:file "source/status-object") (:file "source/test-part") (:file "source/part-type-form") (:file "source/publish")
(:file "source/test-part2") (:file "source/two-viewports") (:file "source/status-object") (:file "source/test-part")
(:file "source/viewport") (:file "source/zzinit"))) (:file "source/test-part2") (:file "source/two-viewports")
(:file "source/viewport") (:file "source/zzinit")))
;;;; -*- coding: utf-8 -*- ;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:timer :description (asdf:defsystem #:timer :description
"The Gendl™ timer Subsystem" :author "John McCarthy" :license "The Gendl® timer Subsystem" :author "Genworks International"
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t :license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:version "20151024" :depends-on (:cl-smtp :gwl) :serial t :version "20170524" :depends-on (:cl-smtp :gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-encodings :encoding #+asdf-encodings :utf-8
:components :components
((:file "source/package") (:file "source/parameters") ((:file "source/package") (:file "source/parameters")
......
;;;; -*- coding: utf-8 -*- ;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:translators :description (asdf:defsystem #:translators :description
"The Gendl\" Translators to/from XML and potentially other high-level KBE and Knowledge formats" "The Gendl® Translators to/from XML and potentially other high-level KBE and Knowledge formats"
:author "John McCarthy" :license :author "Genworks International" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20160828" :depends-on (:gwl) :version "20170524" :depends-on (:gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
:components #+asdf-encodings :encoding #+asdf-encodings :utf-8
((:file "xml/source/package") (:file "xml/source/genworks") :components
(:file "xml/source/definition-tree") (:file "xml/source/gdl2xml") ((:file "xml/source/package") (:file "xml/source/genworks")
(:file "xml/source/xml2gdl"))) (:file "xml/source/definition-tree") (:file "xml/source/gdl2xml")
(:file "xml/source/xml2gdl")))
;;;; -*- coding: utf-8 -*- ;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:tree :description (asdf:defsystem #:tree :description
"The Gendl\" Tree component used by Tasty and potentially as a UI component on its own" "The Gendl® Tree component used by Tasty and potentially as a UI component on its own"
:author "John McCarthy" :license :author "Genworks International" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20160828" :depends-on (:gwl-graphics) :version "20170524" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
:components #+asdf-encodings :encoding #+asdf-encodings :utf-8
((:file "source/package") (:file "source/parameters") :components
(:file "source/ajax") (:file "source/assembly") ((:file "source/package") (:file "source/parameters")
(:file "source/newertree"))) (:file "source/ajax") (:file "source/assembly")
(:file "source/newertree")))
;;;; -*- coding: utf-8 -*- ;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:yadd :description (asdf:defsystem #:yadd :description
"The Gendl\" Yet Another Definition Documenter (yadd)" :author "The Gendl® Yet Another Definition Documenter (yadd)" :author
"John McCarthy" :license "Genworks International" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20160828" :depends-on :version "20170524" :depends-on
(:gwl-graphics #-allegro :cl-html-parse) (:gwl-graphics #-allegro :cl-html-parse)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
:components #+asdf-encodings :encoding #+asdf-encodings :utf-8
((:file "source/package") (:file "source/genworks") :components
(:file "source/parameters") (:file "source/mixins") ((:file "source/package") (:file "source/genworks")
(:file "source/define-object-documentation") (:file "source/parameters") (:file "source/mixins")
(:file "source/assembly") (:file "source/ass") (:file "source/define-object-documentation")
(:file "source/format-documentation") (:file "source/assembly") (:file "source/ass")
(:file "source/function-documentation") (:file "source/initialize") (:file "source/format-documentation")
(:file "source/publish") (:file "source/test-part") (:file "source/function-documentation") (:file "source/initialize")
(:file "source/variable-documentation") (:file "source/zzinit"))) (:file "source/publish") (:file "source/test-part")
(:file "source/variable-documentation") (:file "source/zzinit")))
;;;; -*- coding: utf-8 -*- ;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:base :description (asdf:defsystem #:base :description
"The Gendl\" Base Core Kernel Engine" :author "John McCarthy" "The Gendl® Base Core Kernel Engine" :author
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)" "Genworks International" :license
:serial t :version "20160828" :depends-on (:bordeaux-threads) "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings) :version "20170524" :depends-on (:bordeaux-threads)
#+asdf-encodings :encoding #+asdf-encodings :utf-8 #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
:components #+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
((:file "source/package") (:file "source/genworks") #+asdf-encodings :encoding #+asdf-encodings :utf-8
(:file "source/presets") (:file "source/parameters") :components
(:file "source/metaclasses") (:file "source/utilities") ((:file "source/package") (:file "source/genworks")
(:file "source/start") (:file "source/syntax-checker") (:file "source/presets") (:file "source/parameters")
(:file "expanders/source/inputs") (:file "source/metaclasses") (:file "source/utilities")
(:file "expanders/source/computed-slots") (:file "source/start") (:file "source/syntax-checker")
(:file "expanders/source/functions") (:file "expanders/source/inputs")
(:file "expanders/source/methods") (:file "expanders/source/computed-slots")
(:file "expanders/source/objects") (:file "expanders/source/functions")
(:file "macros/source/reference") (:file "expanders/source/methods")
(:file "macros/source/message-utils") (:file "expanders/source/objects")
(:file "macros/source/define-object") (:file "macros/source/reference")
(:file "macros/source/defaulting") (:file "macros/source/message-utils")
(:file "macros/source/define-format") (:file "macros/source/define-object")
(:file "rest/source/parameters") (:file "macros/source/defaulting")
(:file "rest/source/quantification") (:file "macros/source/define-format")
(:file "rest/source/aggregate") (:file "rest/source/utilities") (:file "rest/source/parameters")
(:file "rest/source/null-part") (:file "rest/source/vanilla-mixin") (:file "rest/source/quantification")
(:file "rest/source/base-rule-object") (:file "rest/source/bodies") (:file "rest/source/aggregate") (:file "rest/source/utilities")
(:file "rest/source/ignore-errors-with-backtrace") (:file "rest/source/null-part") (:file "rest/source/vanilla-mixin")
(:file "rest/source/init") (:file "rest/source/make-part") (:file "rest/source/base-rule-object") (:file "rest/source/bodies")
(:file "rest/source/sequence") (:file "zzinit/source/initialize") (:file "rest/source/ignore-errors-with-backtrace")
(:file "zzinit/source/zzinit"))) (:file "rest/source/init") (:file "rest/source/make-part")
(:file "rest/source/sequence") (:file "zzinit/source/initialize")
(:file "zzinit/source/zzinit")))
...@@ -124,29 +124,6 @@ object in <b>object-list</b>. ...@@ -124,29 +124,6 @@ object in <b>object-list</b>.
(the-object object (evaluate message))) object-list))) (the-object object (evaluate message))) object-list)))
(defun list-of-numbers (num1 num2 &optional (increment 1) (tolerance (/ increment 10)))
"List of Numbers. Returns a list of incrementing numbers starting
from <b>num1</b> and ending with <b>num2</b>, inclusive. Increment can
be positive for num1 < num2, or negative for num1 > num2. This version
was contributed by Reinier van Dijk.
:arguments (num1 \"Number\"
num2 \"Number\")
:&optional ((increment 1) \"Number. The distance between the returned listed numbers.\"
(tolerance (/ increment 10)) \"Number. tolerance for increment.\")"
(cond ((zerop increment) (error "increment of zero is not allowed"))
((and (< increment 0.0) (> num2 num1))
(unless *allow-nil-list-of-numbers?* (error "increment is negative, while difference between num2 and num1 is positive.")))
((and (> increment 0.0) (< num2 num1))
(unless *allow-nil-list-of-numbers?* (error "increment is positive, while difference between num2 and num1 is negative.")))
(t (let ((predicate (if (> increment 0.0) #'>= #'<=))
(result-list nil))
(do ((num num1 (+ num increment)))
((or (funcall predicate num num2) (< (abs (- num2 num)) tolerance)) (nreverse (cons num2 result-list)))
(push num result-list))))))
(defun list-of-n-numbers (num1 num2 n) (defun list-of-n-numbers (num1 num2 n)
"Returns a list of n numbers equally spaced between bounds num1 and num2, inclusive." "Returns a list of n numbers equally spaced between bounds num1 and num2, inclusive."
(let ((increment (/ (- num2 num1) (- n 1))) (let ((increment (/ (- num2 num1) (- n 1)))
...@@ -154,10 +131,7 @@ was contributed by Reinier van Dijk. ...@@ -154,10 +131,7 @@ was contributed by Reinier van Dijk.
(dotimes (i (- n 1) (nreverse (cons num2 result-list))) (dotimes (i (- n 1) (nreverse (cons num2 result-list)))
(push (+ num1 (* i increment)) result-list)))) (push (+ num1 (* i increment)) result-list))))
;;
;; FLAG -- remove this when above version is fully tested.
;;
#+nil
(defun list-of-numbers (num1 num2 &optional (increment 1)) (defun list-of-numbers (num1 num2 &optional (increment 1))
"List of Numbers. Returns a list of incrementing numbers starting from "List of Numbers. Returns a list of incrementing numbers starting from
<b>num1</b> and ending with <b>num2</b>, inclusive. <b>num1</b> and ending with <b>num2</b>, inclusive.
...@@ -223,6 +197,19 @@ removing nil values from a list, consider using <tt>remove nil ...</tt> instead. ...@@ -223,6 +197,19 @@ removing nil values from a list, consider using <tt>remove nil ...</tt> instead.
(nreverse (rflatten lst)))) (nreverse (rflatten lst))))
</pre> </pre>
:note This will not work with dotted lists, only with actual lists. If
you need dotted lists, use the old definition of flatten, from Paul
Graham On Lisp:
<pre>
(defun flatten (tree)
(if (atom tree)
(ensure-list tree)
(nconc (flatten (car tree))
(if (cdr tree) (flatten (cdr tree))))))
</pre>
:arguments (list \"List\") :arguments (list \"List\")
:see-also <tt>remove</tt>" :see-also <tt>remove</tt>"
...@@ -761,7 +748,7 @@ file. ...@@ -761,7 +748,7 @@ file.
(let ((package-form (read in))) (let ((package-form (read in)))
(when (or (null package-form) (not (find-package (second package-form)))) (when (or (null package-form) (not (find-package (second package-form))))
(error "Invalid package specification at beginning of ~a.~%" filename)) (error "Invalid package specification at beginning of stream ~s.~%" in))
(let* ((*package* (find-package (second package-form))) (root-form (read in))) (let* ((*package* (find-package (second package-form))) (root-form (read in)))
(when (or (null root-form) (when (or (null root-form)
(not (eql (class-of (find-class (first root-form))) (find-class 'gdl-class)))) (not (eql (class-of (find-class (first root-form))) (find-class 'gdl-class))))
......
...@@ -21,7 +21,12 @@ ...@@ -21,7 +21,12 @@
;; ;;
(in-package :com.genworks.lisp) (in-package :com.genworks.lisp)
(defparameter *external-text-format* :default)
#+nil
(defparameter *external-text-format* (defparameter *external-text-format*
#+(and mswindows allegro) (excl:crlf-base-ef :1252) #+(and mswindows allegro) (excl:crlf-base-ef :1252)
#-(and mswindows allegro) :default) #-(and mswindows allegro) :default)
...@@ -35,11 +40,12 @@ ...@@ -35,11 +40,12 @@
(ignore-errors (funcall (read-from-string "asdf:system-source-directory") "base")) (ignore-errors (funcall (read-from-string "asdf:system-source-directory") "base"))
(if (typep error 'error) (if (typep error 'error)
(warn "~&ASDF is loaded, but :base is not registered. glisp:*genworks-source-home* remains unknown and set to nil.~%") (warn "~&ASDF is loaded, but :base is not registered. glisp:*genworks-source-home* remains unknown and set to nil.~%")
(setq *genworks-source-home* (when base-home
(make-pathname :name nil (setq *genworks-source-home*
:type nil (make-pathname :name nil
:directory (butlast (butlast (pathname-directory base-home))) :type nil
:defaults base-home))))))) :directory (butlast (butlast (pathname-directory base-home)))
:defaults base-home))))))))
(set-genworks-source-home-if-known) (set-genworks-source-home-if-known)
......
...@@ -377,6 +377,7 @@ If you are interested in this effort we would love to hear from you at open-sour ...@@ -377,6 +377,7 @@ If you are interested in this effort we would love to hear from you at open-sour
#:run-command #:run-command
#:temporary-folder #:temporary-folder
#:*temporary-folder-function* #:*temporary-folder-function*
#:*utf-16-ef*
#:temporary-file #:temporary-file
#:find-gs-path #:find-gs-path
...@@ -504,6 +505,7 @@ If you are interested in this effort we would love to hear from you at open-sour ...@@ -504,6 +505,7 @@ If you are interested in this effort we would love to hear from you at open-sour
#:inter-circle-sphere #:inter-circle-sphere
#:inter-line-sphere #:inter-line-sphere
#:inter-line-plane #:inter-line-plane
#:inter-line-line
#:translate #:translate
#:create-obliqueness #:create-obliqueness
#:proj-point-on-line #:proj-point-on-line
...@@ -854,6 +856,9 @@ If you are interested in this effort we would love to hear from you at open-sour ...@@ -854,6 +856,9 @@ If you are interested in this effort we would love to hear from you at open-sour
(:export (:export
#:define-package #:define-package
#:remote-object #:remote-object
#:*aserver-port*
#:*aserve-listeners*
#:*aserve-start-args*
#:*req* #:*req*
#:*ent* #:*ent*
#:*html-referrer* #:*html-referrer*
...@@ -872,6 +877,7 @@ If you are interested in this effort we would love to hear from you at open-sour ...@@ -872,6 +877,7 @@ If you are interested in this effort we would love to hear from you at open-sour
#:*jump-to-toplevel-on-set-self?* #:*jump-to-toplevel-on-set-self?*
#:*process-cookies?* #:*process-cookies?*
#:*static-home* #:*static-home*
#:announce-server-port
#:encode-root-path #:encode-root-path
#:base-html-sheet #:base-html-sheet
#:skeleton-ui-element #:skeleton-ui-element
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
(defparameter *gendl-version* "1591") (defparameter *gendl-version* "1592")
(defparameter *gendl-patch-level* nil) (defparameter *gendl-patch-level* nil)
......
...@@ -94,14 +94,14 @@ respective authors: ...@@ -94,14 +94,14 @@ respective authors:
Gendl® Free Edition, version ~a Gendl® Free Edition, version ~a
Within ~a ~a Within ~a ~a
Copyright© 2016, Genworks International, Birmingham MI, USA. Copyright© 2017, Genworks International, Birmingham MI, USA.
All Rights Reserved. All Rights Reserved.
~a ~a
Welcome to Gendl® Welcome to Gendl®
Copyright© 2016, Genworks® International, Birmingham MI, USA. Copyright© 2017, Genworks® International, Birmingham MI, USA.
All Rights Reserved. All Rights Reserved.
This program contains free software: you can redistribute it and/or This program contains free software: you can redistribute it and/or
......
...@@ -437,11 +437,12 @@ keyword argument to this function. ...@@ -437,11 +437,12 @@ keyword argument to this function.
:&key ((path *quicklisp-home*) \"Pathname or string. Quicklisp location.\") :&key ((path *quicklisp-home*) \"Pathname or string. Quicklisp location.\")
" "
(let ((ql-loader (or (probe-file (merge-pathnames "program/load-ql.lisp" glisp:*gendl-home*)) (let ((ql-loader (or (probe-file (merge-pathnames "program/load-ql.lisp" glisp:*gendl-home*)) ;; linux, windows prebuilt image
(probe-file (merge-pathnames "../load-ql.lisp" *quicklisp-home*))))) (probe-file (merge-pathnames "load-ql.lisp" glisp:*gendl-home*)) ;; Mac prebuilt image
(if (probe-file ql-loader) (probe-file (merge-pathnames "../load-ql.lisp" *quicklisp-home*))))) ;; loading from source
(if (and ql-loader (probe-file ql-loader))
(let ((*quicklisp-home* path)) (load ql-loader)) (let ((*quicklisp-home* path)) (load ql-loader))
(warn "~s does not exist.~%" ql-loader)))) (warn "load-ql.lisp was not found in ~a.~%" ql-loader))))
(defun load-glime () (defun load-glime ()
......
;;;; -*- coding: utf-8 -*- ;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:cl-lite :description (asdf:defsystem #:cl-lite :description
"The Gendl\" Compile-and-Load Lite Utility" :author "John McCarthy"