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

cleaned up forbidden internal references to Quicklisp package, and newsite...

cleaned up forbidden internal references to Quicklisp package, and newsite modifications suggested by Dave Fox.
parent 61bbc509
......@@ -106,7 +106,14 @@ temporary directory, returned by <tt>(glisp:temporary-folder)</tt>."
(let ((self (apply #'make-object 'app args)))
(the make!)))
;;
;;
;; FLAG -- this is given as an example for how one might create a
;; standalone runtime executable. Note that its restart-init-function
;; modifies the Quicklisp environment, so you would only do this when
;; the user does not already have a known Quicklisp environment.
;;
;;
(defun gdl-runtime ()
(let ((destination-directory
(let ((implementation-identifier (glisp:implementation-identifier))
......@@ -124,7 +131,7 @@ temporary directory, returned by <tt>(glisp:temporary-folder)</tt>."
:restart-init-function '(lambda()
(setq glisp:*gdl-home* (glisp:current-directory))
(setq glisp:*genworks-source-home* (merge-pathnames "src/" glisp:*gdl-home*))
(setq ql:*quicklisp-home* (merge-pathnames "quicklisp/" glisp:*gdl-home*))
(setf (symbol-value (read-from-string "ql:*quicklisp-home*")) (merge-pathnames "quicklisp/" glisp:*gdl-home*))
(gdl:start-gdl :edition :trial)
(glisp:set-gs-path (merge-pathnames "gpl/gs/gs8.63/bin/gswin32c.exe" glisp:*gdl-home*))))
......
......@@ -26,7 +26,6 @@
(:file "newsite/source/news")
(:file "newsite/source/people")
(:file "newsite/source/product-descriptions")
(:file "newsite/source/product-licensing")
(:file "newsite/source/products")
(:file "newsite/source/publish")
(:file "twenty-four/source/infpre")
......
(:gdl-all)
\ No newline at end of file
(asdf:defsystem #:gdl-newsite :description
"Auto-generated asdf defsys from Genworks GDL cl-lite."
:author
"Genworks and Dave Cooper unless otherwise indicated"
:license "AGPL unless otherwise indicated" :serial t
:version "2012040900" :depends-on (:gdl-all)
:components
((:file "source/package") (:file "source/Services")
(:file "source/assembly")
(:file "source/configurator")
(:file "source/contact-us") (:file "source/demos")
(:file "source/index") (:file "source/mixins")
(:file "source/news") (:file "source/people")
(:file "source/products") (:file "source/publish")))
\ No newline at end of file
......@@ -32,7 +32,7 @@
(right-section-inner-html (with-cl-who-string ()
((:a :name "Top"))
(:h1 "Configure Your Weapon: $" (fmt "~:d" (ceiling (the current-price))))
(:h1 "Configure Your Future: $" (fmt "~:d" (ceiling (the current-price))))
(str (the current-choice-screen inner-html))
(str (the summary inner-html))
......
......@@ -80,9 +80,10 @@
(define-object cl-engine-choice (wizard-screen)
:computed-slots ((heading (locale-string :common-lisp-engine))
(default (case (the selected-gendl-license)
(:agpl (the none))
(:professional (the lw-32-base))
(otherwise (the acl-32))))
(lw-uplift 1)
......@@ -101,21 +102,39 @@
:objects
((none :type 'radio-price-choice
:string (string-append (locale-string :none) " ("
(locale-string :i-e) " "
(locale-string :i-e) (locale-string :space)
(locale-string :self-provided-or-third-party) ")")
:current-price (funcall (the discount-func) 0 (first (the-child root-path)))
:disabled? (or (eql (the selected-geometry-kernel) :smlib)
(eql (the selected-gendl-license) :trial))
:disabled-message (format nil "~a ~a~a~a ~a."
(eql (the selected-gendl-license) :trial)
(not (eql (the selected-support-level) :none)))
:disabled-message (format nil "~a ~a~a~a~a~a ~a."
(locale-string :please-select)
(if (eql (the selected-geometry-kernel) :smlib)
(locale-string :the-basic-geometry-kernel) "")
(cond ((and (eql (the selected-geometry-kernel) :smlib)
(eql (the selected-gendl-license) :trial))
(string-append " " (locale-string :and) " "))
(t " "))
(string-append (locale-string :space) (locale-string :and) (locale-string :space)))
(t (locale-string :space)))
(if (eql (the selected-gendl-license) :trial)
(locale-string :a-non-evaluation-gendl-license) "")
(cond ((and (not (eql (the selected-support-level) :none))
(or (eql (the selected-gendl-license) :trial)
(eql (the selected-geometry-kernel) :smlib)))
(string-append (locale-string :space) (locale-string :and) (locale-string :space)))
((not (eql (the selected-support-level) :none))
(locale-string :space))
(t ""))
(if (not (eql (the selected-support-level) :none))
(string-append "\"" (locale-string :none) "\""
(locale-string :space)
(locale-string :for)
(locale-string :space)
(locale-string :technical-support-level))
"")
(locale-string :to-enable-this-option )))
......@@ -145,17 +164,17 @@
(eql (the selected-gendl-license) :student))
:disabled-message (string-append
(locale-string :please-select)
" "
(locale-string :space)
(locale-string :a)
" "
(locale-string :space)
(locale-string :gendl-license)
" "
(locale-string :space)
(locale-string :other-than)
" "
(locale-string :space)
(locale-string :student)
" or "
(locale-string :evaluation)
" "
(locale-string :space)
(locale-string :to-enable-this-option))
......@@ -214,20 +233,20 @@
:disabled-message
(string-append
(locale-string :please-select) " "
(locale-string :please-select) (locale-string :space)
(cond ((and (eql (the selected-gendl-license) :agpl)
(eql (the selected-cl-engine) :none))
(string-append (locale-string :non-agpl-gendl)
" "
(locale-string :space)
(locale-string :and)
" "
(locale-string :space)
(locale-string :commercial-cl-engine)))
((and (eql (the selected-gendl-license) :trial)
(eql (the selected-cl-engine) :none))
(string-append (locale-string :a-non-evaluation-gendl-license)
" "
(locale-string :space)
(locale-string :and)
" "
(locale-string :space)
(locale-string :commercial-cl-engine)))
((eql (the selected-gendl-license) :agpl)
(locale-string :non-agpl-gendl))
......@@ -235,7 +254,7 @@
(locale-string :a-non-evaluation-gendl-license))
((eql (the selected-cl-engine) :none)
(locale-string :commercial-cl-engine)))
" " (locale-string :to-enable-this-option) ".")
(locale-string :space) (locale-string :to-enable-this-option) ".")
:current-price (if (eql (the selected-gendl-license) :student)
220 (funcall (the discount-func) 6900)))))
......@@ -245,16 +264,17 @@
:computed-slots
((heading (locale-string :technical-support-level))
(default (cond ((and (member (the selected-cl-engine) '(:acl-32 :acl-64 :lw-32-full :lw-64-full))
(default (cond ((and (member (the selected-cl-engine) '(:acl-32 :acl-64 :lw-32-full :lw-32-base :lw-64-full))
(eql (the selected-gendl-license) :enterprise))
(the production))
((and (member (the selected-cl-engine) '(:acl-32 :acl-64 :lw-32-full :lw-64-full))
((and (member (the selected-cl-engine) '(:acl-32 :acl-64 :lw-32-base :lw-32-full :lw-64-full))
(eql (the selected-gendl-license) :professional))
(the development))
((and (member (the selected-cl-engine) '(:acl-32 :acl-64 :lw-32-full :lw-64-full))
(the none))
((and (member (the selected-cl-engine) '(:acl-32 :acl-64 :lw-32-base :lw-32-full :lw-64-full))
(eql (the selected-gendl-license) :agpl))
(the production))
(the none))
(t (the none))))
......@@ -267,16 +287,25 @@
((:lw-32-base :lw-32-full :lw-64-full)
#'(lambda(num) (+ 3600 num)))))
(discount-func (cond ((and (the academic?)
(or (eql (the selected-gendl-license) :agpl)
(eql (the selected-gendl-license) :trial)
(eql (the selected-gendl-license) :student)))
#'identity)
((the academic?)
#'(lambda(num) (half num)))
(t #'identity)))
(money-saving-tip
(when (eql (the selected-cl-engine) :sbcl)
(with-cl-who-string ()
(str (locale-string :select))
" "
(str (locale-string :space))
(str (locale-string :a))
" "
(str (locale-string :space))
(str (locale-string :commercial))
" "
(str (locale-string :space))
((:span :class :clickme
:onclick (the (gdl-ajax-call :function-key :set-current-sheet
:arguments (list (the cl-engine)))))
......@@ -288,23 +317,24 @@
:string (string-append (locale-string :none)
" ("
(locale-string :i-e)
" "
(locale-string :self-provided-or-third-party))
(locale-string :space)
(locale-string :self-provided-or-third-party)
")")
:disabled? (member (the selected-cl-engine) '(:acl-32 :acl-64))
:disabled-message (string-append (locale-string :please-select)
" "
(locale-string :space)
(locale-string :a)
" "
(locale-string :space)
(locale-string :common-lisp-engine)
" "
(locale-string :space)
(locale-string :other-than)
" "
(locale-string :space)
(locale-string :franz-allegro-cl-32)
" "
(locale-string :space)
(locale-string :or)
" "
(locale-string :space)
(locale-string :franz-allegro-cl-64)
" "
(locale-string :space)
(locale-string :to-enable-this-option) ".")
:current-price (funcall (the discount-func) 0))
......@@ -344,17 +374,17 @@
"")
(string-append
(locale-string :a)
" "
(locale-string :space)
(locale-string :common-lisp-engine)
" "
(locale-string :space)
(locale-string :other-than)
" "
(locale-string :space)
(locale-string :franz-allegro-cl-32)
" "
(locale-string :space)
(locale-string :or)
" "
(locale-string :space)
(locale-string :franz-allegro-cl-64))))
(t " "))
(t (locale-string :space)))
(locale-string :to-enable-this-option))))
......@@ -389,7 +419,7 @@
(locale-string :a)
(locale-string :known)
(locale-string :common-lisp-engine))
" ")
(locale-string :space))
(locale-string :to-enable-this-option))))
......@@ -425,7 +455,7 @@
(locale-string :a)
(locale-string :known)
(locale-string :common-lisp-engine))
" ")
(locale-string :space))
(locale-string :to-enable-this-option))))
......@@ -449,7 +479,7 @@
(locale-string :gendl-license)
(if (member (the selected-cl-engine) '(:acl-32 :acl-64 :lw-32-base :lw-32-full :lw-64-full))
" "
(locale-string :space)
(format nil " ~a ~a ~a ~a "
(locale-string :and)
(locale-string :a)
......@@ -484,13 +514,13 @@
(remote-3-day :type 'radio-price-choice
:string (string-append (locale-string :remote)
" "
(locale-string :space)
(locale-string :three-day))
:current-price (funcall (the discount-func) (* (the fraction) 2400)))
(onsite-3-day :type 'radio-price-choice
:string (string-append (locale-string :onsite)
" "
(locale-string :space)
(locale-string :three-day)
" ("
(locale-string :excl-travel-and-exp)
......@@ -499,7 +529,7 @@
(onsite-10-day :type 'radio-price-choice
:string (string-append (locale-string :onsite)
" "
(locale-string :space)
(locale-string :ten-day)
" ("
(locale-string :excl-travel-and-exp)
......
......@@ -29,14 +29,7 @@
((title "Genworks International - Demos")
(link-title "Demos")
#+nil
(right-section-inner-html
(with-cl-who-string ()
(:h2 "Our Products") ((:div :id "welcome"))
(:ul
(:li ((:a :href (the descriptions url)) "Descriptions"))
(:li ((:a :href (the licensing url)) "Licensing"))
(:li ((:a :href (the configurator url)) "Configurator"))))))
)
:objects
......@@ -44,36 +37,5 @@
:pass-down (respondent))))
#+nil
(define-object demos (base-site-sheet)
:computed-slots
((title "Genworks International - Demos")
(link-title "Demos")
(right-section-inner-html
(with-cl-who-string ()
(:H2 "Demos") (:H3 "Aerospace")
((:DIV :ID "profile")
((:DIV :ID "d-corp")
((:DIV :ID "d-corp-img") "
Aero Demo 1")
(:P "Under construction "))
((:DIV :ID "d-indu")
((:DIV :ID "d-indu-img") "
Aero Demo 2")
(:P "Under construction "))
((:P :CLASS "more") ((:A :HREF "") "View Details")))
(:H3 "Wind Energy")
((:DIV :ID "profile")
((:DIV :ID "d-corp")
((:DIV :ID "d-corp-img") "
Wind Demo 1")
(:P "Under construction"))
((:DIV :ID "d-indu")
((:DIV :ID "d-indu-img") "
Wind Demo 2")
(:P "Under construction"))
((:DIV :CLASS "clear"))
((:P :CLASS "more") ((:A :HREF "") "View Details")))))))
......@@ -34,7 +34,7 @@
(:h3 "Lecture and Tutorial Videos")
((:div :class "profile")
((:div :class "people")
(:h4 "G102: Gendl Quickstart")
(:h4 "G102: GenDL Quickstart")
(:p "Note: Slides are available " ((:a :href "http://www.genworks.com/downloads/training-g102/" :target "g102-slides") "here") ", "
"Exercise skeletons " ((:a :href "https://github.com/genworks/Genworks-GDL/blob/master/documentation/training/g102/examples/source/g102-exercises.lisp?raw=true" :target "gendl-code") "here") ", and "
"Sample code from the slides " ((:a :href "https://github.com/genworks/Genworks-GDL/blob/master/documentation/training/g102/examples/source/section-2-examples.lisp?raw=true" :target "gendl-code") "here") ".")
......@@ -44,7 +44,7 @@
(:ol
(:li ((:a :href "http://www.youtube.com/watch?v=WC3B7ztMRcE&hd=1" :target "gdl-videos")
"Installation of Gendl (Windows version) from simple Zipfile distribution (4:21)"))
"Installation of GenDL (Windows version) from simple Zipfile distribution (4:21)"))
(:li ((:a :href "http://www.youtube.com/watch?v=9QSzuBeYHPE&hd=1" :target "gdl-videos")
"Section 1: Introduction (3:34)"))
(:li ((:a :href "http://www.youtube.com/watch?v=z0jSK3RyVIM&hd=1" :target "gdl-videos")
......@@ -62,12 +62,12 @@
(:li ((:a :href "http://www.youtube.com/watch?v=ZuYOZ33PiDI&hd=1" :target "gdl-videos")
"Section 2.11: Child Objects (5:02)"))
(:li ((:a :href "http://www.youtube.com/watch?v=bIu_AywMMQU&hd=1" :target "gdl-videos")
"Section 2.12: Gendl Object Sequences (4:44)")))))
"Section 2.12: GenDL Object Sequences (4:44)")))))
(:h3 "Manuals and Tutorials")
((:div :class "profile")
((:div :class "people")
(:h4 "Gendl full Documentaion")
(:h4 "GenDL full Documentaion")
(:p (:ul (:li ((:a :href "https://github.com/genworks/Genworks-GDL/blob/master/documentation/gdl-documentation.pdf?raw=true") "GDL Unified Documentation"))))))
......
......@@ -154,38 +154,42 @@
:computed-slots
((inner-html (with-cl-who-string ()
(:h2 "CL Engines Explained")
(:p ((:a :href "http://en.wikipedia.com/Common_Lisp"r)
"Common Lisp")
" (CL) is an industry-standard programming
((:div :class "profile")
((:div :class "people")
(:p ((:a :href "http://en.wikipedia.com/Common_Lisp"r)
"Common Lisp")
" (CL) is an industry-standard programming
language, available today in several commercial as
well as community-supported Open Source
implementations. It is a goal of the Gendl project
implementations. It is a goal of the GenDL project
to run on all major CL implementations, and as of
today, Gendl builds are available for three: "
today, GenDL builds are available for three: "
((:a :href "http://www.franz.com/products/allegro-common-lisp/")
"Allegro CL")
((:a :href "http://www.franz.com/products/allegro-common-lisp/")
"Allegro CL")
" from "
" from "
((:a :href "http://www.franz.com") "Franz Inc")
((:a :href "http://www.franz.com") "Franz Inc")
", "
((:a :href "http://www.lispworks.com/products/index.html")
"LispWorks")
((:a :href "http://www.lispworks.com/products/index.html")
"LispWorks")
" from "
" from "
((:a :href "http://www.lispworks.com") "LispWorks Ltd")
((:a :href "http://www.lispworks.com") "LispWorks Ltd")
" and "
", and "
((:a :href "http://www.sbcl.org") "SBCL")
((:a :href "http://www.sbcl.org") "SBCL")
", an Open Source implementation supported
", an Open Source implementation supported
by the community and by several third-party firms.")
(:p "It is possible to obtain Gendl seats bundled
(:p "It is possible to obtain GenDL seats bundled
with one of the commercial CL engines, with one of
our supported Open Source CL engines, or with no CL
engine at all. The selection of a commercial CL
......@@ -198,7 +202,7 @@
The selection of no CL engine at all results in no
availability of Technical Support from
Genworks (third-party technical support may be a
possibility in this case)")
possibility in this case)")))
((:a :name "cl-none"))
((:a :href "#Top") (:h3 "No CL Engine"))
......@@ -209,7 +213,7 @@
Technical Support. This option may be appropriate
if you already have an existing CL infrastructure
in place, and you are equipped to handle your own
Gendl technical support.")))
GenDL technical support.")))
((:a :name "cl-sbcl"))
......@@ -218,14 +222,15 @@
((:div :class "people")
(:p "By choosing this option explicitly, you enable
Genworks to offer Technical Support, because we do
have experience running Gendl with SBCL
have experience running GenDL with SBCL
ourselves. The Technical Support prices are higher
than with a commercial CL engine, because the SBCL
price (zero) includes no support. In order to
support Gendl on SBCL, Genworks will from time to
support GenDL on SBCL, Genworks will from time to
time have to become more familiar with SBCL
internals, or contract with a third-party such as "
((:a :href "") "Steel Bank Studios")
((:a :href "http://sb-studio.net") "Steel Bank
Studio")
".")))
......@@ -238,13 +243,13 @@
((:a :href "http://www.franz.com/products/allegro-common-lisp/")
"Allegro CL")
" 32-bit has been the primary deployment platform
for Gendl for over 10 years and remains a trusty
for GenDL for over 10 years and remains a trusty
workhorse for small to medium sized applications
and models. Allegro CL also ships with a wide
array of supported add-on products, some of which
are available with standard Allegro CL Gendl at no
are available with standard Allegro CL GenDL at no
extra charge. The Professional and Enterprise
editions of Gendl correspond to the Professional
editions of GenDL correspond to the Professional
and Enterprise editions of Allegro CL.")
(:p "Allegro CL is supported on Windows, Linux,
FreeBSD, MacOS, and several commercial Unix
......@@ -253,11 +258,11 @@
of technical support, so selecting Allegro CL will
result in a reduction of Genworks' listed support
prices relative to the other CL choices
available. As with Gendl, Allegro CL's pricing
available. As with GenDL, Allegro CL's pricing
model carries license/support fees or royalties for
delivery of runtime applications. These fees are
included in the quoted runtime license/royalty fees
for a Gendl package configured with Allegro as the
for a GenDL package configured with Allegro as the
CL Engine.")))
((:a :name "cl-acl-64"))
......@@ -274,12 +279,12 @@
limits of the host machine. This results in the
ability to retain computed object trees with vast
amounts of detailed information during a running
Gendl session. All attributes of Allegro CL
GenDL session. All attributes of Allegro CL
32-bit described above also apply to 64-bit.")))
((:a :name "lw-32-pro"))
((:a :href "#Top") (:h3 "LispWorks 32-bit Basic"))
((:a :href "#Top") (:h3 "LispWorks 32-bit Professional"))
((:div :class "profile")
((:div :class "people")
(:p "Common Lisp has long been the standard for
......@@ -293,40 +298,39 @@
(:p "The pricing model for LispWorks is exclusive
of technical support, so selecting LispWorks will
result in an increase of Genworks' listed support
prices (relative to Allegro CL). Unlike Gendl,
prices (relative to Allegro CL). Unlike GenDL,
LispWorks' pricing model for most platforms carries
no license/support fees or royalties for
delivery. This results in a reduction in the quoted
runtime license/royalty fees for a Gendl package
runtime license/royalty fees for a GenDL package
configured with LispWorks as the CL Engine.")
(:p "What we refer to as \"LispWorks 32-bit Basic\"
(:p "What we refer to as \"LispWorks 32-bit Professional\"
corresponds to "
((:a :href "http://www.lispworks.com/products/lispworks.html")
"LispWorks Professional")
" Edition. Unlike the Allegro CL Professional
Edition, LispWorks Professional Edition is capable
of generating runtime applications. Therefore it is
possible to configure an Enterprise Gendl seat with
possible to configure an Enterprise GenDL seat with
this edition of LispWorks, but not with the
Professional Edition of Allegro CL. The LispWorks
Professional (\"Basic\") Edition is a complete
Common Lisp development environment, but lacks
certain add-on features which are available in the
Enterprise (\"Expanded\") Edition (described as
\"Expanded Edition\" below).")))
Professional Edition is a complete Common Lisp
development environment, but lacks certain add-on
features which are available in the LispWorks
Enterprise Edition.")))
((:a :name "lw-32-exp"))
((:a :href "#Top") (:h3 "LispWorks 32-bit Expanded"))
((:a :href "#Top") (:h3 "LispWorks 32-bit Enterprise"))
((:div :class "profile")
((:div :class "people")
(:p "What we refer to as \"LispWorks 32-bit
Expanded\" corresponds to "
Enterprise\" corresponds to "