Commit b7bb9a94 authored by Dave Cooper's avatar Dave Cooper

fixed Issue #106, fixed several load order-dependencies which were causing...

fixed Issue #106, fixed several load order-dependencies which were causing occasional problems with building on SBCL.
parent a61f20b0
......@@ -2,9 +2,9 @@
(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 "20130406" :depends-on (:gwl-graphics)
:author "Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20130408" :depends-on (:gwl-graphics)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:file "source/package") (:file "source/parameters")
......
......@@ -2,9 +2,9 @@
(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 "20130406" :depends-on (:tree :gwl-graphics)
"Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20130408" :depends-on (:tree :gwl-graphics)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:file "source/package") (:file "source/parameters")
......
......@@ -2,9 +2,9 @@
(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 "20130406" :depends-on (:gwl)
:author "Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20130408" :depends-on (:gwl)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:file "xml/source/package") (:file "xml/source/genworks")
......
......@@ -2,9 +2,9 @@
(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 "20130406" :depends-on (:gwl-graphics)
:author "Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20130408" :depends-on (:gwl-graphics)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:file "source/package") (:file "source/parameters")
......
......@@ -2,9 +2,9 @@
(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 "20130406" :depends-on (:gwl-graphics)
"Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20130408" :depends-on (:gwl-graphics)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:file "source/package") (:file "source/genworks")
......@@ -13,5 +13,5 @@
(: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/publish") (:file "source/test-part")
(:file "source/variable-documentation") (:file "source/zzinit")))
;;;; -*- encoding: 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 "20130406" :depends-on nil
"The Gendl™ Base Core Kernel Engine" :author
"Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20130408" :depends-on nil
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:file "source/package") (:file "source/genworks")
......@@ -22,10 +23,9 @@
(: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/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")))
(:file "rest/source/sequence") (:file "zzinit/source/initialize")
(:file "zzinit/source/zzinit")))
;;;; -*- encoding: 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 "20130406" :depends-on (:glisp)
"The Gendl™ Compile-and-Load Lite Utility" :author
"Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20130408" :depends-on (:glisp)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:file "source/package") (:file "source/parameters")
......
......@@ -122,7 +122,8 @@ given as keyword args to this function)."
(pathname-root (the pathname))
(strings-for-display (format nil "~a" (the :local-name)))
(subdir-type 'directory-node)
(additional-parameters nil))
(additional-parameters nil)
(dry-run? nil))
:computed-slots
((device (pathname-device (the ppathname)))
......@@ -144,6 +145,7 @@ given as keyword args to this function)."
:pathname (make-pathname
:device (the :device)
:directory (nth (the-child :index) (the :subdir-pathnames)))
:pass-down (dry-run?)
:parameters (the :additional-parameters)))))
......@@ -253,7 +255,9 @@ Defaults to nil (i.e. we assume we are loading into a clean system and need all
:directory (append
(butlast base-dir)
(list "bin" (lastcar base-dir))))))
(ensure-directories-exist binary-directory)
(unless (the dry-run?)
(format t "~&*** Creating ~s~%" binary-directory)
(ensure-directories-exist binary-directory))
(pathname-directory binary-directory))))
(local-package-files (remove-if-not
#'(lambda (file)
......
;;;; -*- encoding: 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 "20130406" :depends-on (:gwl-graphics)
"The Gendl™ Wireframe School Bus Demo" :author
"Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20130408" :depends-on (:gwl-graphics)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:file "source/package") (:file "source/assembly")
......
;;;; -*- encoding: utf-8; -*-
(asdf:defsystem #:ledger :description
"The Gendl™ Ledger Bookkeeping Demo" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20130406" :depends-on (:gwl)
"The Gendl™ Ledger Bookkeeping Demo" :author
"Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20130408" :depends-on (:gwl)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:file "source/package") (:file "source/assembly")
......
......@@ -2,9 +2,9 @@
(asdf:defsystem #:robot :description
"The Gendl™ Simplified Android Robot example " :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20130406" :depends-on (:gwl-graphics)
"Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20130408" :depends-on (:gwl-graphics)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:file "source/package") (:file "source/assembly")
......
......@@ -2,8 +2,8 @@
(asdf:defsystem #:wire-world :description
"The Gendl™ Wire-World demo and test-case for wireframe tessellation and X3D output"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20130406" :depends-on (:gwl-graphics)
:author "Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20130408" :depends-on (:gwl-graphics)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components ((:file "source/package") (:file "source/assembly")))
;;;; -*- encoding: utf-8; -*-
(asdf:defsystem #:examples :description
"The Gendl™ examples Subsystem" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20130406" :depends-on (:gwl-graphics :surf)
"The Gendl™ examples Subsystem" :author
"Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20130408" :depends-on (:gwl-graphics :surf)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:gdl "source/primi-plane") (:gdl "source/ui-primi-plane")))
;;;; -*- encoding: utf-8; -*-
(asdf:defsystem #:geom-base :description
"The Gendl™ Wireframe Geometry" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20130406" :depends-on (:glisp)
"The Gendl™ Wireframe Geometry" :author
"Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20130408" :depends-on (:glisp)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:file "prereqs/source/presets")
......@@ -17,13 +18,12 @@
(:file "formats/source/raster")
(:file "formats/source/vector-graphics")
(:file "wire/source/base-object") (:file "wire/source/arc")
(:file "wire/source/cylinder")
(:file "wire/source/l-line") (:file "wire/source/circle")
(:file "wire/source/bezier-curve") (:file "wire/source/cylinder")
(:file "wire/source/global-polyline")
(:file "wire/source/global-filleted-polyline")
(:file "wire/source/global-polygon-projection")
(:file "wire/source/sphere") (:file "wire/source/l-line")
(:file "wire/source/circle") (:file "wire/source/arcoid-mixin")
(:file "wire/source/bezier-curve")
(:file "wire/source/sphere") (:file "wire/source/arcoid-mixin")
(:file "wire/source/bounding-box") (:file "wire/source/box")
(:file "wire/source/c-cylinder") (:file "wire/source/cone")
(:file "wire/source/directional-light")
......@@ -36,7 +36,7 @@
(:file "wire/source/primitives") (:file "wire/source/route-pipe")
(:file "wire/source/spherical-cap")
(:file "wire/source/spot-light") (:file "wire/source/torus")
(:file "wire/source/views")
(:file "wire/source/utilities") (:file "wire/source/views")
(:file "annotations/source/angular-dimension")
(:file "annotations/source/arrowhead")
(:file "annotations/source/center-line")
......
......@@ -1358,42 +1358,6 @@ of <b>point1</b> and <b>point2</b>.
(mapcar #'first (sort intersects #'< :key #'third)))))
(defun bounding-box-from-list (objects &key (local-objects))
(let ((object-boxes (remove nil (mapcar #'(lambda(object) (when (typep object 'base-object)
(the-object object bounding-box))) objects)))
(local-object-boxes (remove nil (mapcar #'(lambda(object) (when (typep object 'base-object)
(the-object object local-box)))
local-objects))))
(let (xmin ymin zmin xmax ymax zmax)
(mapcar #'(lambda(box)
(let ((min (first box)) (max (second box)))
(let ((x-min (get-x min)) (y-min (get-y min)) (z-min (get-z min))
(x-max (get-x max)) (y-max (get-y max)) (z-max (get-z max)))
(when (or (null xmin) (< x-min xmin)) (setq xmin x-min))
(when (or (null ymin) (< y-min ymin)) (setq ymin y-min))
(when (or (null zmin) (< z-min zmin)) (setq zmin z-min))
(when (or (null xmax) (> x-max xmax)) (setq xmax x-max))
(when (or (null ymax) (> y-max ymax)) (setq ymax y-max))
(when (or (null zmax) (> z-max zmax)) (setq zmax z-max)))))
(append local-object-boxes object-boxes))
(if xmin
(list (make-point xmin ymin zmin) (make-point xmax ymax zmax))
(list (make-point 0 0 0) (make-point 0 0 0))))))
(defun bounding-box-from-points (points)
(let (xmin ymin zmin xmax ymax zmax)
(mapcar #'(lambda(point)
(let ((x (get-x point)) (y (get-y point)) (z (get-z point)))
(when (or (null xmin) (< x xmin)) (setq xmin x))
(when (or (null ymin) (< y ymin)) (setq ymin y))
(when (or (null zmin) (< z zmin)) (setq zmin z))
(when (or (null xmax) (> x xmax)) (setq xmax x))
(when (or (null ymax) (> y ymax)) (setq ymax y))
(when (or (null zmax) (> z zmax)) (setq zmax z)))) points)
(list (make-point xmin ymin zmin) (make-point xmax ymax zmax))))
(defun apply-make-point (list)
"2D, 3D, or 4D point. This function takes a list of two, three, or four numbers rather
than multiple arguments as with the make-point and make-vector macro. This is equivalent
......
......@@ -19,4 +19,4 @@
;; <http://www.gnu.org/licenses/>.
;;
("base-object" "arc" "cylinder" "global-polyline" "global-filleted-polyline" "global-polygon-projection" "sphere" "l-line" "circle")
("base-object" "arc" "l-line" "circle" "bezier-curve" "cylinder" "global-polyline" "global-filleted-polyline" "global-polygon-projection" "sphere" "l-line" "circle")
;;
;; Copyright 2002-2011 Genworks International
;;
;; This source file is part of the General-purpose Declarative
;; Language project (GDL).
;;
;; This source file contains free software: you can redistribute it
;; and/or modify it under the terms of the GNU Affero General Public
;; License as published by the Free Software Foundation, either
;; version 3 of the License, or (at your option) any later version.
;;
;; This source file is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
;; Affero General Public License for more details.
;;
;; You should have received a copy of the GNU Affero General Public
;; License along with this source file. If not, see
;; <http://www.gnu.org/licenses/>.
;;
(in-package :geom-base)
(defun bounding-box-from-list (objects &key (local-objects))
(let ((object-boxes (remove nil (mapcar #'(lambda(object) (when (typep object 'base-object)
(the-object object bounding-box))) objects)))
(local-object-boxes (remove nil (mapcar #'(lambda(object) (when (typep object 'base-object)
(the-object object local-box)))
local-objects))))
(let (xmin ymin zmin xmax ymax zmax)
(mapcar #'(lambda(box)
(let ((min (first box)) (max (second box)))
(let ((x-min (get-x min)) (y-min (get-y min)) (z-min (get-z min))
(x-max (get-x max)) (y-max (get-y max)) (z-max (get-z max)))
(when (or (null xmin) (< x-min xmin)) (setq xmin x-min))
(when (or (null ymin) (< y-min ymin)) (setq ymin y-min))
(when (or (null zmin) (< z-min zmin)) (setq zmin z-min))
(when (or (null xmax) (> x-max xmax)) (setq xmax x-max))
(when (or (null ymax) (> y-max ymax)) (setq ymax y-max))
(when (or (null zmax) (> z-max zmax)) (setq zmax z-max)))))
(append local-object-boxes object-boxes))
(if xmin
(list (make-point xmin ymin zmin) (make-point xmax ymax zmax))
(list (make-point 0 0 0) (make-point 0 0 0))))))
(defun bounding-box-from-points (points)
(let (xmin ymin zmin xmax ymax zmax)
(mapcar #'(lambda(point)
(let ((x (get-x point)) (y (get-y point)) (z (get-z point)))
(when (or (null xmin) (< x xmin)) (setq xmin x))
(when (or (null ymin) (< y ymin)) (setq ymin y))
(when (or (null zmin) (< z zmin)) (setq zmin z))
(when (or (null xmax) (> x xmax)) (setq xmax x))
(when (or (null ymax) (> y ymax)) (setq ymax y))
(when (or (null zmax) (> z zmax)) (setq zmax z)))) points)
(list (make-point xmin ymin zmin) (make-point xmax ymax zmax))))
;;;; -*- encoding: utf-8; -*-
(asdf:defsystem #:glisp :description
"The Gendl™ Common Lisp Portability" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20130406" :depends-on
"The Gendl™ Common Lisp Portability" :author
"Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20130408" :depends-on
(:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel #-allegro :acl-compat)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:file "source/presets")(:file "source/parameters")
(:file "source/genworks")(:file "source/initialize")
((:file "source/presets") (:file "source/parameters")
(:file "source/genworks") (:file "source/initialize")
(:file "source/zzinit")))
;;;; -*- encoding: utf-8; -*-
(asdf:defsystem #:gwl-graphics :description
"The Gendl™ GWL embedded graphics support" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20130406" :depends-on (:geom-base :gwl)
"The Gendl™ GWL embedded graphics support" :author
"Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20130408" :depends-on (:geom-base :gwl)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:file "gwl/source/application-mixin")
......
;;;; -*- encoding: utf-8; -*-
(asdf:defsystem #:gwl :description
"The Gendl™ Generative Web Language (GWL)" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20130406" :depends-on (:glisp :aserve)
"The Gendl™ Generative Web Language (GWL)" :author
"Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20130408" :depends-on (:glisp :aserve)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:file "source/package") (:file "source/defparameters")
......@@ -18,15 +19,15 @@
(:file "source/new-urls") (:file "source/publish")
(:file "source/remote-object")
(:file "source/security-check-failed")
(:file "ajax/source/parameters") (:file "ajax/source/ajax")
(:file "ajax/source/base-ajax-sheet")
(:file "ajax/source/skeleton-ui-element")
(:file "form-elements/source/grid-form-element")
(:file "form-elements/source/macros")
(:file "form-elements/source/primitives")
(:file "form-elements/source/short-test")
(:file "form-elements/source/test-seq")
(:file "form-elements/source/validation-tests")
(:file "ajax/source/parameters") (:file "ajax/source/ajax")
(:file "ajax/source/base-ajax-sheet")
(:file "ajax/source/skeleton-ui-element")
(:file "gwl-session/source/parameters")
(:file "gwl-session/source/cleanup")
(:file "gwl-session/source/functions")
......
......@@ -201,7 +201,7 @@ instance at what time should the recovery instance expire?"
(when
(and (fboundp 'process-graphics-fields)
(typep (the-object requestor) 'base-html-graphics-sheet)
(typep (the-object requestor) (read-from-string "base-html-graphics-sheet"))
(the-object requestor (evaluate :view-object)))
(setq query-plist (funcall (read-from-string "gwl::process-graphics-fields")
query query-plist root-object requestor)))
......
......@@ -19,4 +19,4 @@
;; <http://www.gnu.org/licenses/>.
;;
("source" "ajax")
("source" "form-elements" "ajax")
;;;; -*- encoding: utf-8; -*-
(asdf:defsystem #:regression :description
"The Gendl™ regression Subsystem" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20130406" :depends-on (:lift :surf :tasty)
"The Gendl™ regression Subsystem" :author
"Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20130408" :depends-on (:lift :surf :tasty)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:file "utils/source/package") (:file "utils/source/genworks")
......
** cl-lite
*** Stop creating bin/ subdirectories if create-asd-file? or dry-run? is non-nil.
......@@ -2,9 +2,9 @@
(asdf:defsystem #:surf :description
"The Gendl™ NURBS Surface and Solids Geometry Primitives" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20130406" :depends-on (:geom-base)
"Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20130408" :depends-on (:geom-base)
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components
((:file "source/parameters") (:file "source/classes")
......
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