Commit d08b67be authored by Dave Cooper's avatar Dave Cooper

cleaning up toward merging with master

parent 849ee807
......@@ -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 "20131015" :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 "20131023" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -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 "20131015" :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 "20131023" :depends-on (:tree :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -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 "20131015" :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 "20131023" :depends-on (:gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -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 "20131015" :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 "20131023" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -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 "20131015" :depends-on
"Dave Cooper and Genworks International" :license
"Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
:serial t :version "20131023" :depends-on
(:gwl-graphics #-allegro :cl-html-parse)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
;;;; -*- 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 "20131015" :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 "20131023" :depends-on nil
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
;;;; -*- 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 "20131015" :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 "20131023" :depends-on (:glisp)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -3,6 +3,6 @@
(asdf:defsystem #:4bar :description
"The Gendl™ 4bar Subsystem" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20130730" :depends-on nil
:version "20130730" :depends-on ()
#+asdf-encoding :encoding #+asdf-encoding :utf-8
:components ((:gdl "source/4bar")))
(:gwl-graphics)
\ No newline at end of file
()
\ No newline at end of file
......@@ -222,7 +222,7 @@
:computed-slots ((datum (the edge-1 end))
(direction-vector (subtract-vectors (the end) (the start)))
(vertex-list (list (the start) (the end) (the edge-1 end))))
(vertex-list (list (the start) (the end) (the edge-1 end) (the start))))
:hidden-objects
((baseline :type 'line
......
;;;; -*- 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 "20131015" :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 "20131023" :depends-on nil
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
(:gwl-graphics)
\ No newline at end of file
()
\ No newline at end of file
;;;; -*- coding: 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 "20131015" :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 "20131023" :depends-on (:gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
(:gwl-graphics)
\ No newline at end of file
()
\ No newline at end of file
......@@ -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 "20131015" :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 "20131023" :depends-on nil
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -2,9 +2,9 @@
(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 "20131015" :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 "20131023" :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")))
;;;; -*- coding: 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 "20131015" :depends-on (: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 "20131023" :depends-on (:surf)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -186,16 +186,16 @@
(slime-repl)
(insert "(unless (find-package :gendl) (load (merge-pathnames \".load-gendl.lisp\" (user-homedir-pathname))))")
(slime-repl-return)
(insert (format "(load (compile-file \"%semacs/glime.lisp\"))" *gendl-home*))
(insert (format "(when (find-package :gendl) (load (compile-file \"%semacs/glime.lisp\")))" *gendl-home*))
(slime-repl-return)
(insert "(gdl::startup-banner)")
(insert "(when (find-package :gendl) (funcall (symbol-function (read-from-string \"gendl::startup-banner\"))))")
(slime-repl-return)
(insert "(let ((gendl-loaded? (find-package :gendl)) (genworks-gdl-loaded? (find-package :genworks-gdl)))
(cond (genworks-gdl-loaded? (funcall (symbol-function (read-from-string \"gdl:start-gdl!\"))))
(gendl-loaded? (funcall (symbol-function (read-from-string \"gendl:start-gendl!\"))))
(t (error \"Gendl or GDL is not loaded and did not load successfully from .load-gendl.lisp in your home directory.~%\"))))")
(t (format t \"~%~%***~%Gendl or GDL is not loaded and did not load successfully from .load-gendl.lisp in your home directory.~%***~%~%\"))))")
(slime-repl-return)
(insert "(in-package gdl-user)")
(insert "(when (find-package :gendl) (in-package :gdl-user))")
(slime-repl-return)
(end-of-buffer))
......
......@@ -144,6 +144,10 @@
(write-the-object cache lines-and-curves))))))))
;;
;; FLAG - update this lens to be like Raphael so the fill will work for closed shapes.
;;
(define-lens (pdf view-object-cache)()
:output-functions
((lines-and-curves
......@@ -196,6 +200,10 @@
(pdf:stroke)))))))))
;;
;; FLAG - update this lens to be like Raphael so the fill will work for closed shapes.
;;
(define-lens (dxf view-object-cache)()
:output-functions
((lines-and-curves
......
;;;; -*- coding: 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 "20131015" :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 "20131023" :depends-on (:glisp)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
;;;; -*- coding: 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 "20131015" :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 "20131023" :depends-on
(:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel #-allegro :acl-compat)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -234,9 +234,11 @@ and \"..\" entries."
#-(and mswindows lispworks)
(defun run-gs (command)
"Shell out a ghostscript command and handle errors."
(let ((result
(run-program command)))
(unless (zerop result) (error "Ghostscript threw error"))))
(gdl:print-variables command)
(multiple-value-bind (output error result)
(run-program command)
(declare (ignore output))
(unless (zerop result) (error "Ghostscript threw error: ~a~%" error))))
#+(and mswindows lispworks)
(defun run-gs (command)
......
;;;; -*- coding: 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 "20131015" :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 "20131023" :depends-on (:geom-base :gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
;;;; -*- coding: 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 "20131015" :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 "20131023" :depends-on (:glisp :aserve)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -45,9 +45,7 @@
:computed-slots
(;;(type (class-name (class-of self)))
(remote-object-args (append (list :type (format nil "~a::~a"
((remote-object-args (append (list :type (format nil "~a::~a"
(package-name (symbol-package (the remote-type)) )
(symbol-name (the remote-type)))
:package *package*
......@@ -81,6 +79,7 @@
:remote-id (the remote-id)
:remote-root-path (the remote-root-path)
:package *package*)))))
(multiple-value-bind
(result length)
......@@ -88,11 +87,6 @@
(net.aserve.client:do-http-request (format nil "http://~a:~a/fetch-remote-input?args=~a"
(the host) (the port) encoded-args)))
#+nil
(read-safe-string
(base64-decode-safe
(net.aserve.client:do-http-request (format nil "http://~a:~a/fetch-remote-input?args=~a"
(the host) (the port) encoded-args))))
(declare (ignore length))
(if (listp result)
......
;;;; -*- coding: 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 "20131015" :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 "20131023" :depends-on (:lift :surf :tasty)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -229,7 +229,7 @@ brep in each direction (on the brep itself, not necessarily on the bounding box)
:min-y (least #'get-y points)
:max-y (most #'get-y points)
:min-z (least #'get-z points)
p :max-z (most #'get-z points))))
:max-z (most #'get-z points))))
(%triangle-data% (let ((result (the (tessellation :in-memory? t))))
......
......@@ -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 "20131015" :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 "20131023" :depends-on (:geom-base)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
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