Commit 3145f5ab authored by Teodor Gelu Chiciudean's avatar Teodor Gelu Chiciudean
Browse files

Merge remote-tracking branch 'upstream/master'

parents be747030 12530406
(:gdl-base)
(:cl-fad :gdl-base :gdl-cl-lite :gdl-geom-base)
......@@ -4,7 +4,7 @@
:author
"Genworks and Dave Cooper unless otherwise indicated"
:license "AGPL unless otherwise indicated" :serial t
:version "2011101800" :depends-on (:gdl-base)
:version "2011101800" :depends-on (:cl-fad :gdl-base :gdl-cl-lite :gdl-geom-base)
:components
((:file "source/package") (:file "source/genworks")
(:file "source/app") (:file "source/distro")))
\ No newline at end of file
......@@ -127,7 +127,9 @@ temporary directory, returned by <tt>(glisp:temporary-folder)</tt>."
(let ((destination-directory
(let ((implementation-identifier (glisp:implementation-identifier))
;;(prefix (merge-pathnames "../../staging/" glisp:*genworks-source-home*))
(prefix (merge-pathnames #+mswindows "c:/staging/" #-mswindows "~/share/staging/")))
(prefix (merge-pathnames #+mswindows (or (probe-file "e:/staging/")
(probe-file "z:/staging/"))
#-mswindows "~/share/staging/")))
(merge-pathnames
(make-pathname :directory
(list :relative
......
......@@ -128,30 +128,14 @@
;; smlib shared library
;;
(ensure-directories-exist (merge-pathnames "SMLib8.40/" (the target-parent)))
(let ((smlib-name (if (find-package :smlib) (funcall (read-from-string "glisp:smlib-name"))
(error "smlib-name not known (smlib module probably not loaded)."))))
(glisp:copy-file (merge-pathnames (format nil "../../common/SMLib8.40/~a" smlib-name)
glisp:*genworks-source-home*)
(merge-pathnames (format nil "SMLib8.40/~a" smlib-name)
(the target-parent))))
;;
#+nil
(ensure-directories-exist (merge-pathnames "SMLib8.40/" (the target-parent)))
#+nil
(let ((smlib-name (if (find-package :smlib) (funcall (read-from-string "glisp:smlib-name"))
(error "smlib-name not known (smlib module probably not loaded)."))))
(glisp:copy-file (merge-pathnames (format nil "../../common/SMLib8.40/libs/~a/~a"
#+linux "linux"
#+mswindows "windows"
#+macosx "macos" smlib-name)
glisp:*genworks-source-home*)
(merge-pathnames (format nil "SMLib8.40/~a" smlib-name)
(the target-parent))))
(let ((smlib-version "8.45"))
(ensure-directories-exist (merge-pathnames (format nil "SMLib~a/" smlib-version) (the target-parent)))
(let ((smlib-name (if (find-package :smlib) (funcall (read-from-string "glisp:smlib-name"))
(error "smlib-name not known (smlib module probably not loaded)."))))
(glisp:copy-file (merge-pathnames (format nil "../../common/SMLib~a/~a" smlib-version smlib-name)
glisp:*genworks-source-home*)
(merge-pathnames (format nil "SMLib~a/~a" smlib-version smlib-name)
(the target-parent)))))
;;
;; gpl on windows
;;
......
(:gdl-surf :gdl-gwl-graphics)
\ No newline at end of file
......@@ -4,7 +4,7 @@
:author
"Genworks and Ke-Works unless otherwise indicated"
:license "AGPL unless otherwise indicated" :serial t
:version "2011111800" :depends-on nil :components
:version "2011111800" :depends-on (:gdl-surf :gdl-gwl-graphics) :components
((:file "source/package")
(:file "source/interior-ref-surf")
(:file "source/material")
......
......@@ -2,6 +2,6 @@
(defparameter *data-pathname*
(make-pathname :directory (append (butlast (pathname-directory excl:*source-pathname*))
(make-pathname :directory (append (pathname-directory (asdf:system-source-directory :gdl-aero-demo-1))
(list "data"))
:device (pathname-device excl:*source-pathname*)))
:device (pathname-device (asdf:system-source-directory :gdl-aero-demo-1))))
(:gdl-gwl-graphics)
\ No newline at end of file
(asdf:defsystem #:gdl-site :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 "2011102900" :depends-on nil :components
((:file "source/package") (:file "source/assembly")
(:file "source/contact") (:file "source/demos")
(:file "source/glossary") (:file "source/index")
(:file "source/landing") (:file "source/licensing")
(:file "source/maintenance") (:file "source/mixins")
(:file "source/new") (:file "source/opportunities")
(:file "source/options") (:file "source/people")
(:file "source/pricing") (:file "source/products")
(:file "source/publish") (:file "source/security")))
\ No newline at end of file
(asdf:defsystem #:gdl-site
: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
"2012030600"
:depends-on
(:gdl-gwl-graphics)
:components
((:file "source/package") (:file "source/assembly")
(:file "source/contact") (:file "source/demos")
(:file "source/glossary") (:file "source/index")
(:file "source/landing") (:file "source/licensing")
(:file "source/maintenance") (:file "source/make")
(:file "source/mixins") (:file "source/new")
(:file "source/opportunities") (:file "source/options")
(:file "source/people") (:file "source/pricing")
(:file "source/products") (:file "source/publish")
(:file "source/security")))
\ No newline at end of file
(asdf:defsystem #:gdl-tree :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 "2011102000" :depends-on (:gdl-gwl)
:components
((:file "source/package") (:file "source/parameters")
(:file "source/ajax") (:file "source/assembly")
(:file "source/newertree")))
\ No newline at end of file
(asdf:defsystem #:gdl-tree
: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
"2012030600"
:depends-on
(:gdl-gwl-graphics)
:components
((:file "source/package") (:file "source/parameters")
(:file "source/ajax") (:file "source/assembly")
(:file "source/newertree")))
\ No newline at end of file
......@@ -179,7 +179,7 @@
#:read-safe-string
#:read-snapshot
#:readable-expression
#:record-source-file
;;#:record-source-file
#:register-asdf-systems
#:remote-object
#:remove-plist-key
......
......@@ -118,9 +118,8 @@
`(unless nil #+nil (and (fboundp ',(glisp:intern (symbol-name attr-sym) :gdl-inputs))
(find-method (symbol-function ',(glisp:intern (symbol-name attr-sym) :gdl-inputs))
nil (list (find-class 'gdl-basis) (find-class t) (find-class 'gdl-basis)) nil))
(defmethod ,(glisp:intern (symbol-name attr-sym) :gdl-inputs) ((,parent-arg gdl-basis)
,part-arg
(,self-arg gdl-basis))
(defmethod ,(glisp:intern (symbol-name attr-sym) :gdl-inputs)
((,parent-arg gdl-basis) ,part-arg (,self-arg gdl-basis))
(declare (ignore ,part-arg))
(let ((,val-arg (getf (the-object ,self-arg %parameters%)
,(make-keyword (symbol-name attr-sym)) 'gdl-rule:%not-handled%)))
......
......@@ -77,10 +77,25 @@
(lispworks:concatenate-system dest 'my-system)))
(defvar *wild-entry*
(make-pathname :name :wild :type :wild :version :wild))
(defun directory-list (pathspec)
#-allegro (ql-impl-util:directory-entries pathspec)
#+allegro (directory pathspec :directories-are-files nil))
"(derived from quicklisp ql-impl-util:directory-entries):
Return all directory entries of DIRECTORY as a
list, or NIL if there are no directory entries. Excludes the \".\"
and \"..\" entries."
#+allegro
(directory pathspec :directories-are-files nil)
#+lispworks
(directory (merge-pathnames *wild-entry* pathspec)
:directories t
:link-transparency nil)
#+sbcl
(directory (merge-pathnames *wild-entry* pathspec)
:resolve-symlinks nil))
;;
......
......@@ -161,6 +161,8 @@ in the applicable lens for html-format."
("String or nil. Names the value of class attribute for the body tag. Default is nil."
body-class nil)
(body-onload nil)
("String or nil. Contains the string for the doctype at the top of the document. Default is:
......@@ -326,7 +328,8 @@ UI specific jQuery Layout JavaScript."
(when (the additional-header-js-content)
(str (the additional-header-js-content))))
((:body :class (the body-class))
((:body :class (the body-class)
:onload (the body-onload))
(the reset-html-sections!)
((:div :id (the dom-id))
(str (the main-sheet-body)))))))
......
(:gdl-base :gdl-cl-lite :aserve :cl-pdf :cl-who :cl-ppcre :cl-base64 :trivial-backtrace)
(:gdl-base :gdl-cl-lite :aserve :cl-pdf :cl-who :cl-ppcre :cl-base64 :trivial-backtrace :cl-html-parse)
......@@ -12,7 +12,8 @@
"2012021100"
:depends-on
(:gdl-base :gdl-cl-lite :aserve :cl-pdf :cl-who :cl-ppcre
:cl-base64 :trivial-backtrace)
:cl-base64 :trivial-backtrace
:cl-html-parse)
:components
((:file "source/package") (:file "source/genworks")
(:file "source/defparameters") (:file "source/base-html-sheet")
......
......@@ -10,7 +10,6 @@
#:gc-full
#:get-backtrace
#:initialize-multiprocessing
#:load-html-parser
#:match-regexp
#:patches-dir
#:process-run-function
......@@ -61,10 +60,6 @@ the \"current\" error."
;;
)
(defun load-html-parser ()
#+allegro (require :phtml)
#-allegro (quicklisp:quickload :cl-html-parse))
(defun match-regexp (string-or-regexp string-to-match
&key newlines-special case-fold return
......
......@@ -80,7 +80,6 @@
(publish-images)
(publish-statics)
(publish-style)
(glisp:load-html-parser)
(start-gwl))
......
This diff is collapsed.
Supports Markdown
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