Commit 46e50d25 by Dave Cooper

Merge tag '1592' into devo

Merging release 1592 with devo and master.
parents 2f8349cc 3ecc4eba
......@@ -4,6 +4,7 @@
*.fas
*.xfasl
*.dx64fsl
*.wx64fsl
*.64xfasl
*.lib
bin
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:dom :description
"The Gendl\" dom Subsystem" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20160828" :depends-on (:cl-who :yadd)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "base/source/package") (:file "base/source/assembly")
(:file "writers/source/package")
(:file "writers/source/dom-writer") (:file "writers/source/html")
(:file "writers/source/latex") (:file "writers/source/plain-text")
(:file "html/source/package") (:file "html/source/lenses")
(:file "latex/source/package") (:file "latex/source/lenses")
(:file "latex/source/utilities")
(:file "test-parts/source/assembly")))
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:dom :description
"The Gendl® dom Subsystem" :author "Genworks International" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20170524" :depends-on (:cl-who :yadd)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "base/source/package") (:file "base/source/assembly")
(:file "writers/source/package")
(:file "writers/source/dom-writer") (:file "writers/source/html")
(:file "writers/source/latex") (:file "writers/source/plain-text")
(:file "html/source/package") (:file "html/source/lenses")
(:file "latex/source/package") (:file "latex/source/lenses")
(:file "latex/source/utilities")
(:file "test-parts/source/assembly")))
;;;; -*- coding: utf-8 -*-
(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
: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 nil
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/package") (:file "source/base-framework")
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:graphs :description
"The Gendl™ graphs Subsystem" :author "Dave Cooper" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20160110" :depends-on (:gwl-graphics)
"The Gendl® graphs Subsystem" :author "Genworks International"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20170524" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/package") (:file "source/assembly")
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:ta2 :description
"The Gendl\" (legacy) Testing and Tracking Utility, version 2 (using Ajax but pre-gdlAjax, and no JQuery or CSS)"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20160828" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/package") (:file "source/parameters")
(:file "source/javascript") (:file "source/action-object")
(:file "source/ajax") (:file "source/assembly")
(:file "source/click-mode") (:file "source/inspector")
(:file "source/object-tree") (:file "source/part-type-form")
(:file "source/publish") (:file "source/viewport")))
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:ta2 :description
"The Gendl® (legacy) Testing and Tracking Utility, version 2 (using Ajax but pre-gdlAjax, and no JQuery or CSS)"
:author "Genworks International" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20170524" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/package") (:file "source/parameters")
(:file "source/javascript") (:file "source/action-object")
(:file "source/ajax") (:file "source/assembly")
(:file "source/click-mode") (:file "source/inspector")
(:file "source/object-tree") (:file "source/part-type-form")
(:file "source/publish") (:file "source/viewport")))
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:tasty :description
"The Gendl\" Web-based Development Environment (tasty)" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20160828" :depends-on (:tree :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/package") (:file "source/parameters")
(:file "source/assembly") (:file "source/initialize")
(:file "source/inspector") (:file "source/menu")
(:file "source/new-inspector") (:file "source/newer-inspector")
(:file "source/part-type-form") (:file "source/publish")
(:file "source/status-object") (:file "source/test-part")
(:file "source/test-part2") (:file "source/two-viewports")
(:file "source/viewport") (:file "source/zzinit")))
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:tasty :description
"The Gendl® Web-based Development Environment (tasty)" :author
"Genworks International" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20170524" :depends-on (:tree :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/package") (:file "source/parameters")
(:file "source/assembly") (:file "source/initialize")
(:file "source/inspector") (:file "source/menu")
(:file "source/new-inspector") (:file "source/newer-inspector")
(:file "source/part-type-form") (:file "source/publish")
(:file "source/status-object") (:file "source/test-part")
(:file "source/test-part2") (:file "source/two-viewports")
(:file "source/viewport") (:file "source/zzinit")))
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:timer :description
"The Gendl™ timer Subsystem" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20151024" :depends-on (:cl-smtp :gwl)
"The Gendl® timer Subsystem" :author "Genworks International"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
: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 nil
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/package") (:file "source/parameters")
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:translators :description
"The Gendl\" Translators to/from XML and potentially other high-level KBE and Knowledge formats"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20160828" :depends-on (:gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "xml/source/package") (:file "xml/source/genworks")
(:file "xml/source/definition-tree") (:file "xml/source/gdl2xml")
(:file "xml/source/xml2gdl")))
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:translators :description
"The Gendl® Translators to/from XML and potentially other high-level KBE and Knowledge formats"
:author "Genworks International" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20170524" :depends-on (:gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "xml/source/package") (:file "xml/source/genworks")
(:file "xml/source/definition-tree") (:file "xml/source/gdl2xml")
(:file "xml/source/xml2gdl")))
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:tree :description
"The Gendl\" Tree component used by Tasty and potentially as a UI component on its own"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20160828" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/package") (:file "source/parameters")
(:file "source/ajax") (:file "source/assembly")
(:file "source/newertree")))
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:tree :description
"The Gendl® Tree component used by Tasty and potentially as a UI component on its own"
:author "Genworks International" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20170524" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/package") (:file "source/parameters")
(:file "source/ajax") (:file "source/assembly")
(:file "source/newertree")))
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:yadd :description
"The Gendl\" Yet Another Definition Documenter (yadd)" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20160828" :depends-on
(:gwl-graphics #-allegro :cl-html-parse)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/package") (:file "source/genworks")
(:file "source/parameters") (:file "source/mixins")
(:file "source/define-object-documentation")
(:file "source/assembly") (:file "source/ass")
(:file "source/format-documentation")
(:file "source/function-documentation") (:file "source/initialize")
(:file "source/publish") (:file "source/test-part")
(:file "source/variable-documentation") (:file "source/zzinit")))
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:yadd :description
"The Gendl® Yet Another Definition Documenter (yadd)" :author
"Genworks International" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20170524" :depends-on
(:gwl-graphics #-allegro :cl-html-parse)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/package") (:file "source/genworks")
(:file "source/parameters") (:file "source/mixins")
(:file "source/define-object-documentation")
(:file "source/assembly") (:file "source/ass")
(:file "source/format-documentation")
(:file "source/function-documentation") (:file "source/initialize")
(:file "source/publish") (:file "source/test-part")
(:file "source/variable-documentation") (:file "source/zzinit")))
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:base :description
"The Gendl\" Base Core Kernel Engine" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20160828" :depends-on (:bordeaux-threads)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/package") (:file "source/genworks")
(:file "source/presets") (:file "source/parameters")
(:file "source/metaclasses") (:file "source/utilities")
(:file "source/start") (:file "source/syntax-checker")
(:file "expanders/source/inputs")
(:file "expanders/source/computed-slots")
(:file "expanders/source/functions")
(:file "expanders/source/methods")
(:file "expanders/source/objects")
(:file "macros/source/reference")
(:file "macros/source/message-utils")
(:file "macros/source/define-object")
(:file "macros/source/defaulting")
(:file "macros/source/define-format")
(:file "rest/source/parameters")
(:file "rest/source/quantification")
(:file "rest/source/aggregate") (:file "rest/source/utilities")
(:file "rest/source/null-part") (:file "rest/source/vanilla-mixin")
(:file "rest/source/base-rule-object") (:file "rest/source/bodies")
(:file "rest/source/ignore-errors-with-backtrace")
(:file "rest/source/init") (:file "rest/source/make-part")
(:file "rest/source/sequence") (:file "zzinit/source/initialize")
(:file "zzinit/source/zzinit")))
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:base :description
"The Gendl® Base Core Kernel Engine" :author
"Genworks International" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20170524" :depends-on (:bordeaux-threads)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/package") (:file "source/genworks")
(:file "source/presets") (:file "source/parameters")
(:file "source/metaclasses") (:file "source/utilities")
(:file "source/start") (:file "source/syntax-checker")
(:file "expanders/source/inputs")
(:file "expanders/source/computed-slots")
(:file "expanders/source/functions")
(:file "expanders/source/methods")
(:file "expanders/source/objects")
(:file "macros/source/reference")
(:file "macros/source/message-utils")
(:file "macros/source/define-object")
(:file "macros/source/defaulting")
(:file "macros/source/define-format")
(:file "rest/source/parameters")
(:file "rest/source/quantification")
(:file "rest/source/aggregate") (:file "rest/source/utilities")
(:file "rest/source/null-part") (:file "rest/source/vanilla-mixin")
(:file "rest/source/base-rule-object") (:file "rest/source/bodies")
(:file "rest/source/ignore-errors-with-backtrace")
(: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>.
(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)
"Returns a list of n numbers equally spaced between bounds num1 and num2, inclusive."
(let ((increment (/ (- num2 num1) (- n 1)))
......@@ -154,10 +131,7 @@ was contributed by Reinier van Dijk.
(dotimes (i (- n 1) (nreverse (cons num2 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))
"List of Numbers. Returns a list of incrementing numbers starting from
<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.
(nreverse (rflatten lst))))
</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\")
:see-also <tt>remove</tt>"
......@@ -761,7 +748,7 @@ file.
(let ((package-form (read in)))
(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)))
(when (or (null root-form)
(not (eql (class-of (find-class (first root-form))) (find-class 'gdl-class))))
......
......@@ -21,7 +21,12 @@
;;
(in-package :com.genworks.lisp)
(defparameter *external-text-format* :default)
#+nil
(defparameter *external-text-format*
#+(and mswindows allegro) (excl:crlf-base-ef :1252)
#-(and mswindows allegro) :default)
......@@ -35,11 +40,12 @@
(ignore-errors (funcall (read-from-string "asdf:system-source-directory") "base"))
(if (typep error 'error)
(warn "~&ASDF is loaded, but :base is not registered. glisp:*genworks-source-home* remains unknown and set to nil.~%")
(setq *genworks-source-home*
(make-pathname :name nil
:type nil
:directory (butlast (butlast (pathname-directory base-home)))
:defaults base-home)))))))
(when base-home
(setq *genworks-source-home*
(make-pathname :name nil
:type nil
:directory (butlast (butlast (pathname-directory base-home)))
:defaults base-home))))))))
(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
#:run-command
#:temporary-folder
#:*temporary-folder-function*
#:*utf-16-ef*
#:temporary-file
#:find-gs-path
......@@ -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-line-sphere
#:inter-line-plane
#:inter-line-line
#:translate
#:create-obliqueness
#: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
(:export
#:define-package
#:remote-object
#:*aserver-port*
#:*aserve-listeners*
#:*aserve-start-args*
#:*req*
#:*ent*
#:*html-referrer*
......@@ -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?*
#:*process-cookies?*
#:*static-home*
#:announce-server-port
#:encode-root-path
#:base-html-sheet
#:skeleton-ui-element
......
......@@ -23,7 +23,7 @@
(defparameter *gendl-version* "1591")
(defparameter *gendl-version* "1592")
(defparameter *gendl-patch-level* nil)
......
......@@ -94,14 +94,14 @@ respective authors:
Gendl® Free Edition, version ~a
Within ~a ~a
Copyright© 2016, Genworks International, Birmingham MI, USA.
Copyright© 2017, Genworks International, Birmingham MI, USA.
All Rights Reserved.
~a
Welcome to Gendl®
Copyright© 2016, Genworks® International, Birmingham MI, USA.
Copyright© 2017, Genworks® International, Birmingham MI, USA.
All Rights Reserved.
This program contains free software: you can redistribute it and/or
......
......@@ -437,11 +437,12 @@ keyword argument to this function.
:&key ((path *quicklisp-home*) \"Pathname or string. Quicklisp location.\")
"
(let ((ql-loader (or (probe-file (merge-pathnames "program/load-ql.lisp" glisp:*gendl-home*))
(probe-file (merge-pathnames "../load-ql.lisp" *quicklisp-home*)))))
(if (probe-file ql-loader)
(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" glisp:*gendl-home*)) ;; Mac prebuilt image
(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))
(warn "~s does not exist.~%" ql-loader))))
(warn "load-ql.lisp was not found in ~a.~%" ql-loader))))
(defun load-glime ()
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:cl-lite :description
"The Gendl\" Compile-and-Load Lite Utility" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20160828" :depends-on (:glisp)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/package") (:file "source/parameters")
(:file "source/cl-lite") (:file "source/initialize")
(:file "source/zzinit")))
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:cl-lite :description
"The Gendl® Compile-and-Load Lite Utility" :author
"Genworks International" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20170524" :depends-on (:glisp)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/package") (:file "source/parameters")
(:file "source/cl-lite") (:file "source/initialize")
(:file "source/zzinit")))
......@@ -70,7 +70,7 @@ given as keyword args to this function)."
(remf args :show-redefinition-warnings? )
(with-compilation-unit ()
(let ((object (apply #'make-object 'codebase-directory-node :pathname pathname args)))
(unless (the-object object dry-run?)
(unless nil ;;(the-object object dry-run?)
(the-object object (compile-and-load :package-file-ht package-file-ht)))
(when (the-object object create-asd-file?)
(the-object object (write-asd-file))))))))
......@@ -173,7 +173,7 @@ given as keyword args to this function)."
"The Gendl® "
(or (the (read-isc-file "description"))
(format nil "~a Subsystem" (the local-name)))))
(author (or (the (read-isc-file "author")) "John McCarthy"))
(author (or (the (read-isc-file "author")) "Genworks International"))
(version (or (the (read-isc-file "version"))
(replace-substring (iso-8601-date (get-universal-time)) "-" "")))
(license (or (the (read-isc-file "license"))
......@@ -308,12 +308,14 @@ Defaults to nil (i.e. we assume we are loading into a clean system and need all
(if (stringp sexpr)
(format nil "%%remove%%~a%%remove%%" sexpr) sexpr)))
(asdf-defsystem-depends-on (let ((sexpr (glisp:sexpr-from-file
(merge-pathnames (make-pathname :name "defsystem-depends-on"
:type "isc")
(the ppathname)))))
(if (stringp sexpr) sexpr (format nil "\"~s\"" sexpr))))
(asdf-defsystem-depends-on
(let ((sexpr (glisp:sexpr-from-file (merge-pathnames (make-pathname :name "defsystem-depends-on"
:type "isc")
(the ppathname)))))
(if (and sexpr (not (stringp sexpr)))
(error "defsystem-depends-on.isc should be either nil or a string containing the expression
to go inside the actual list form in the asdf file. It came in as ~s instead.~%" sexpr)
sexpr)))
(additional-asd-code (let ((asd-code-file
......@@ -356,9 +358,13 @@ Defaults to nil (i.e. we assume we are loading into a clean system and need all
:version ,(the version)
:depends-on ,(the asdf-depends-on)
,(format nil "%%remove%%#-asdf-unicode :defsystem-depends-on #-asdf-unicode ~a%%remove%%"
(format nil "(:asdf-encodings ~a)" (subseq (the asdf-defsystem-depends-on) 1 (1- (length (the asdf-defsystem-depends-on))))))
,(format nil "%%remove%%#+asdf-unicode :defsystem-depends-on #+asdf-unicode ~a%%remove%%" (the asdf-defsystem-depends-on))
(format nil "(:asdf-encodings~a~a)"
(if (the asdf-defsystem-depends-on) " " "")
(or (the asdf-defsystem-depends-on) "")))
,(format nil "%%remove%%#+asdf-unicode :defsystem-depends-on #+asdf-unicode ~a%%remove%%"
(format nil "(~a)" (or (the asdf-defsystem-depends-on) "")))
"%%remove%%#+asdf-encodings :encoding #+asdf-encodings :utf-8%%remove%%"
;;
;; FLAG -- maybe can get rid of binaries and need to call (the compile-and-load)
;;
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:4bar :description
"The Gendl™ 4bar Subsystem" :author
"Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20131030" :depends-on (:bus)
"The Gendl® 4bar Subsystem" :author "Genworks International"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20170524" :depends-on (:bus)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components ((:gdl "source/4bar") (:gdl "source/bus")))
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:bus :description
"The Gendl\" Wireframe School Bus Demo" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20160828" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/package") (:file "source/assembly")
(:file "source/body") (:file "source/chassis")
(:file "source/interior") (:file "source/rule-ackermann")
(:file "source/axle") (:file "source/fleet")
(:file "source/frame-rail") (:file "source/frame")
(:file "source/html-writer-assembly")
(:file "source/html-writer-body")
(:file "source/html-writer-chassis")
(:file "source/html-writer-interior")
(:file "source/html-writer-rule-ackermann")
(:file "source/inter-seat-clearance-check")
(:file "source/inter-seat-spacing") (:file "source/knuckle")
(:file "source/parameters") (:file "source/publish")
(:file "source/rear-axle") (:file "source/seat")
(:file "source/seating-section") (:file "source/seating-side")
(:file "source/wheel")))
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:bus :description
"The Gendl® Wireframe School Bus Demo" :author
"Genworks International" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20170524" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/package") (:file "source/assembly")
(:file "source/body") (:file "source/chassis")
(:file "source/interior") (:file "source/rule-ackermann")
(:file "source/axle") (:file "source/fleet")
(:file "source/frame-rail") (:file "source/frame")
(:file "source/html-writer-assembly")
(:file "source/html-writer-body")
(:file "source/html-writer-chassis")
(:file "source/html-writer-interior")
(:file "source/html-writer-rule-ackermann")
(:file "source/inter-seat-clearance-check")
(:file "source/inter-seat-spacing") (:file "source/knuckle")
(:file "source/parameters") (:file "source/publish")
(:file "source/rear-axle") (:file "source/seat")
(:file "source/seating-section") (:file "source/seating-side")
(:file "source/wheel")))
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:ledger :description
"The Gendl\" Ledger Bookkeeping Demo" :author "John McCarthy"
:licens