Commit f257e4a3 authored by Dave Cooper's avatar Dave Cooper
Browse files

fixed conflicts

parents 947e713f fb8012a5
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:dom :description
"The Gendl dom Subsystem" :author "John McCarthy" :license
"The Gendl\" dom Subsystem" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20150122" :depends-on (:cl-who :yadd)
:version "20150330" :depends-on (:cl-who :yadd)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
;;;; -*- 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)"
"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 "20150122" :depends-on (:gwl-graphics)
:version "20150330" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:tasty :description
"The Gendl Web-based Development Environment (tasty)" :author
"The Gendl\" Web-based Development Environment (tasty)" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20150122" :depends-on (:tree :gwl-graphics)
:version "20150330" :depends-on (:tree :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
;;;; -*- coding: utf-8 -*-
(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
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20150122" :depends-on (:gwl)
:version "20150330" :depends-on (:gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
;;;; -*- coding: utf-8 -*-
(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
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20150122" :depends-on (:gwl-graphics)
:version "20150330" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:yadd :description
"The Gendl Yet Another Definition Documenter (yadd)" :author
"The Gendl\" Yet Another Definition Documenter (yadd)" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20150122" :depends-on
:version "20150330" :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"
"The Gendl\" Base Core Kernel Engine" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20150122" :depends-on nil
:serial t :version "20150330" :depends-on nil
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -22,7 +22,7 @@
(in-package :gdl)
(defparameter *gendl-version* "1588")
(defparameter *gendl-version* "1588r001")
(defparameter *gendl-patch-level* nil)
......@@ -190,12 +190,6 @@ values are a color indicator for the default foreground and background of graphi
in the base by itself, it requires the :gwl system as well.
Defaults to nil.")
#+nil
(defparameter *compile-for-dgdl?* t "Boolean. Determines whether
global methods are defined during compilation to allow calling any
message on a gdl remote-object. This functionality is not available
in the core GDL kernel and depends on additional web/networking
modules. Defaults to t.")
(defparameter *gs-path* nil)
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:cl-lite :description
"The Gendl Compile-and-Load Lite Utility" :author "John McCarthy"
"The Gendl\" Compile-and-Load Lite Utility" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20150122" :depends-on (:glisp)
:serial t :version "20150330" :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 #:bus :description
"The Gendl Wireframe School Bus Demo" :author "John McCarthy"
"The Gendl\" Wireframe School Bus Demo" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20150122" :depends-on (:gwl-graphics)
:serial t :version "20150330" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:ledger :description
"The Gendl Ledger Bookkeeping Demo" :author "John McCarthy"
"The Gendl\" Ledger Bookkeeping Demo" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20150122" :depends-on
:serial t :version "20150330" :depends-on
(#-gwl :gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:robot :description
"The Gendl Simplified Android Robot example " :author
"The Gendl\" Simplified Android Robot example " :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20150122" :depends-on (:gwl-graphics)
:version "20150330" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:wire-world :description
"The Gendl Wire-World demo and test-case for wireframe tessellation and X3D output"
"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 "20150122" :depends-on
:version "20150330" :depends-on
(#-gwl-graphics :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:examples :description
"The Gendl examples Subsystem" :author "John McCarthy" :license
"The Gendl\" examples Subsystem" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20150122" :depends-on (:gwl-graphics :surf)
:version "20150330" :depends-on (:gwl-graphics :surf)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:geom-base :description
"The Gendl Wireframe Geometry" :author "John McCarthy" :license
"The Gendl\" Wireframe Geometry" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20150122" :depends-on (:glisp)
:version "20150330" :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"
"The Gendl\" Common Lisp Portability" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20150122" :depends-on
:serial t :version "20150330" :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
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:gwl-graphics :description
"The Gendl GWL embedded graphics support" :author "John McCarthy"
"The Gendl\" GWL embedded graphics support" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20150122" :depends-on (:geom-base :gwl)
:serial t :version "20150330" :depends-on (:geom-base :gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -11,7 +11,7 @@
:serial
t
:version
"20150317"
"20150330"
:depends-on
(:bordeaux-threads :glisp :aserve)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
......
......@@ -5,13 +5,13 @@
:description
"The Gendl™ regression Subsystem"
:author
"Genworks International"
"Dave Cooper"
:license
"Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial
t
:version
"20150311"
"20150330"
:depends-on
(:lift :surf :tasty)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
......@@ -103,15 +103,20 @@
(:file "assembly-output/source/bracket-test")
(:file "assembly-output/source/bracket")
(:file "dgdl/source/remote")
(:file "gdl/source/syntax-checker")
(:file "geom-base/source/angle-between-vectors")
(:file "geom-base/source/box-matrix")
(:file "geom-base/source/drawing")
(:file "geom-base/source/general-note")
(:file "gwl/source/package")
(:file "gwl/source/ajax-json")
(:file "gwl/source/form-element-tests")
(:file "gwl/source/form-element-validation")
(:file "gwl/source/hey-now")
(:file "gwl/source/large-data")
(:file "gwl/source/short-form-element-test")
(:file "gwl/source/svg-error-handling")
(:file "gwl/source/test-seq")
(:file "issues/source/issue-65")
(:file "issues/source/issue-67")
(:file "issues/source/issue-68")
......
;;;; -*- coding: utf-8 -*-
(asdf:defsystem #:surf :description
"The Gendl NURBS Surface and Solids Geometry Primitives" :author
"The Gendl\" NURBS Surface and Solids Geometry Primitives" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20150122" :depends-on (:geom-base)
:version "20150330" :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