Commit 073babde authored by Dave Cooper's avatar Dave Cooper

added *quicklisp-home* to support (load-quicklisp), disable brep validation...

added *quicklisp-home* to support (load-quicklisp), disable brep validation for now, update smlib regression tests, fixed double-submit bug in tasty inspector, removed :defaulting from respondent in base-ajax-sheet.
parent 42d3dc8c
......@@ -4,7 +4,7 @@
"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 "20140904" :depends-on (:gwl-graphics)
:version "20140913" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl\" Web-based Development Environment (tasty)" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140904" :depends-on (:tree :gwl-graphics)
:version "20140913" :depends-on (:tree :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"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 "20140904" :depends-on (:gwl)
:version "20140913" :depends-on (:gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"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 "20140904" :depends-on (:gwl-graphics)
:version "20140913" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl\" Yet Another Definition Documenter (yadd)" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140904" :depends-on
:version "20140913" :depends-on
(:gwl-graphics #-allegro :cl-html-parse)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -3,7 +3,7 @@
(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 "20140904" :depends-on nil
:serial t :version "20140913" :depends-on nil
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -27,7 +27,8 @@
;;(defparameter *gendl-version* "1587p004")
;;(defparameter *gendl-version* "1587p005")
;;(defparameter *gendl-version* "1587p006")
(defparameter *gendl-version* "1587p007")
;;(defparameter *gendl-version* "1587p007")
(defparameter *gendl-version* "1587p008")
;;(defparameter *gendl-version* "ql-2013-12")
(defparameter *gendl-patch-level* nil)
......
......@@ -384,11 +384,14 @@ You have a dependency on caffeine. Your children are your dependants.
(defun load-quicklisp (&key (path *quicklisp-home*))
"Void. This is intended for pre-built Gendl or GDL images. If the
preconfigured quicklisp load file exists, load it.
preconfigured quicklisp load file exists, load it. You can customize
quicklisp location by setting global *quicklisp-home* or passing :path
keyword argument to this function.
:&key ((path *quicklisp-home*) \"Pathname or string. Quicklisp location.\")
"
(let ((ql-loader (merge-pathnames "program/load-ql.lisp" glisp:*gendl-home*)))
(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 ((*quicklisp-home* path)) (load ql-loader))
(warn "~s does not exist.~%" ql-loader))))
......
......@@ -30,7 +30,8 @@
:directory (butlast (pathname-directory glisp:*gdl-program-home*))
:defaults glisp:*gdl-program-home*))
(setq glisp:*gendl-home* glisp:*gdl-home*)
(setq *quicklisp-home* (merge-pathnames "quicklisp/" glisp:*gendl-home*))
(setq *quicklisp-home* (or (probe-file (merge-pathnames "quicklisp/" glisp:*gendl-home*))
(probe-file (merge-pathnames "genworks/quicklisp/" glisp:*gendl-home*))))
(pushnew (make-keyword (format nil "gendl-~a" *gendl-version*)) *features*)
(glisp:set-genworks-source-home-if-known)
(glisp:set-default-float-format)
......
......@@ -3,7 +3,7 @@
(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 "20140904" :depends-on (:glisp)
:serial t :version "20140913" :depends-on (:glisp)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -3,7 +3,7 @@
(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 "20140904" :depends-on (:gwl-graphics)
:serial t :version "20140913" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -3,7 +3,7 @@
(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 "20140904" :depends-on
:serial t :version "20140913" :depends-on
(#-gwl :gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -4,7 +4,7 @@
"The Gendl\" Simplified Android Robot example " :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140904" :depends-on (:gwl-graphics)
:version "20140913" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"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 "20140904" :depends-on
:version "20140913" :depends-on
(#-gwl-graphics :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:examples :description
"The Gendl\" examples Subsystem" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140904" :depends-on (:gwl-graphics :surf)
:version "20140913" :depends-on (:gwl-graphics :surf)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -127,7 +127,6 @@
(defun gendl (&optional exe) (interactive)
(add-hook 'slime-connected-hook 'load-and-or-start-gendl t)
;;(add-hook 'slime-connected-hook 'load-base-ql)
(add-to-list 'auto-mode-alist '("\\.cl\\'" . lisp-mode))
(add-to-list 'auto-mode-alist '("\\.gdl\\'" . lisp-mode))
(add-to-list 'auto-mode-alist '("\\.gendl\\'" . lisp-mode))
......@@ -248,12 +247,16 @@
(defun load-user-emacs-glime ()
(when (file-exists-p "~/.emacs-glime") (load-file "~/.emacs-glime"))
(when (file-exists-p "~/.emacs-glime.el") (load-file "~/.emacs-glime.el"))
(when (file-exists-p "~/.emacs-gendl") (load-file "~/.emacs-gendl"))
(when (file-exists-p "~/.emacs-gendl.el") (load-file "~/.emacs-gendl.el")))
(dolist (file (list "~/.emacs-glime" "~/.emacs-glime.el"))
(when (file-exists-p file) (load-file file))))
(defun load-user-emacs-gendl ()
(dolist (file (list "~/.emacs-gendl" "~/.emacs-gdl"
"~/.emacs-gendl.el" "~/.emacs-gdl.el"))
(when (file-exists-p file) (load-file file))))
(load-user-emacs-glime)
(ignore-errors
(require 'package)
......@@ -330,18 +333,19 @@
(fi:inferior-lisp-newline)
(end-of-buffer)))
;;
;; Establish input methodf I.A.S.T diacritics
;; Establish input method for I.A.S.T diacritics
;;
(load-file (concat *gendl-home* "emacs/sa-translit.el"))
(register-input-method
(let ((file (concat *gendl-home* "emacs/sa-translit.el")))
(when (file-exists-p file)
(load-file file)
(register-input-method
"sa-translit" "Sanskrit Transliteration" 'quail-use-package
"sa-translit" "Converts Harvard-Kyoto and ITRANS scheme to IAST diacritics."
(concat *gendl-home* "emacs/sa-translit.el"))
file)))
(load-user-emacs-gendl)
;; A. REFERENCES
;;
......
......@@ -3,7 +3,7 @@
(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 "20140904" :depends-on (:glisp)
:version "20140913" :depends-on (:glisp)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -3,7 +3,7 @@
(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 "20140904" :depends-on
:serial t :version "20140913" :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
......
......@@ -3,7 +3,7 @@
(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 "20140904" :depends-on (:geom-base :gwl)
:serial t :version "20140913" :depends-on (:geom-base :gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -3,7 +3,7 @@
(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 "20140904" :depends-on (:glisp :aserve)
:serial t :version "20140913" :depends-on (:glisp :aserve)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
This diff is collapsed.
......@@ -3,7 +3,7 @@
(asdf:defsystem #:regression :description
"The Gendl\" regression Subsystem" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140904" :depends-on (:lift :surf :tasty)
:version "20140913" :depends-on (:lift :surf :tasty)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -181,10 +181,6 @@ for merged-solid where we default this to nil." sew-and-orient? t)
(print-variables count length)
(let ((try-manifold? (= count (1- length))))
(format t "Merging ~s into merge object ~s, ~a~%"
(cons 'the (reverse (the-object other-brep root-path)))
(cons 'the (reverse (the root-path)))
(if try-manifold? ", trying to make manifold..." ""))
(setq current-brep (do-boolean-merge-operation *geometry-kernel* merge-container
(the operation) try-manifold?
:make-manifold? try-manifold?
......@@ -240,7 +236,11 @@ This occured in:
:sew-and-orient? (the sew-and-orient?)
:manifold? (the manifold?))))
;;
;; FLAG - try to put this back in on a more selective basis. It's too slow with SMLib8.69 and later.
;;
;;(brep-assert-valid *geometry-kernel* result :warn? (not (the error-on-invalid?)))
;;
result)))))
......
......@@ -4,7 +4,7 @@
"The Gendl\" NURBS Surface and Solids Geometry Primitives" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140904" :depends-on (:geom-base)
:version "20140913" :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