diff --git a/README.md b/README.md index baa8e6d..00f964e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Buildnode: A libary to ease interaction with cxml:dom documents and nodes +# Buildnode: A library to ease interaction with cxml:dom documents and nodes ## Examples @@ -25,31 +25,8 @@ Please see the examples directory for runable examples in each XML dialect * [Nathan Bird](http://the.unwashedmeme.com/blog) * [Ryan Davis](http://ryepup.unwashedmeme.com/blog) +## License + +For the licensing terms, please refer to the file named COPYING, located in the +root directory of this library's source distribution. -``` -;; Copyright (c) 2011 Russ Tyndall , Acceleration.net http://www.acceleration.net -;; All rights reserved. -;; -;; Redistribution and use in source and binary forms, with or without -;; modification, are permitted provided that the following conditions are -;; met: -;; -;; - Redistributions of source code must retain the above copyright -;; notice, this list of conditions and the following disclaimer. -;; -;; - Redistributions in binary form must reproduce the above copyright -;; notice, this list of conditions and the following disclaimer in the -;; documentation and/or other materials provided with the distribution. -;; -;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -;; "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -;; LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -;; A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -;; OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -;; SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -;; LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -;; DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -;; THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -``` \ No newline at end of file diff --git a/buildnode-excel.asd b/buildnode-excel.asd index 3ab84e4..03095c3 100644 --- a/buildnode-excel.asd +++ b/buildnode-excel.asd @@ -1,23 +1,16 @@ ;; -*- lisp -*- -(eval-when (:compile-toplevel :load-toplevel :execute) - (unless (find-package :net.acceleration.buildnode.system) - (defpackage :net.acceleration.buildnode.system - (:use :common-lisp :asdf)))) - -(in-package :net.acceleration.buildnode.system) - (defsystem :buildnode-excel :description "Tool for building up an xml dom of an excel spreadsheet nicely. Uses this XML format: http://msdn.microsoft.com/en-us/library/aa140066%28office.10%29.aspx " + :licence "BSD-3-Clause" :components ((:module :src - :serial T - :components - ((:module :tags - :serial T - :components - ((:file "excel")))))) + :serial T + :components + ((:module :tags + :serial T + :components ((:file "excel")))))) :depends-on (:buildnode)) diff --git a/buildnode-html5.asd b/buildnode-html5.asd index f218c83..92af720 100644 --- a/buildnode-html5.asd +++ b/buildnode-html5.asd @@ -1,20 +1,13 @@ ;; -*- lisp -*- -(eval-when (:compile-toplevel :load-toplevel :execute) - (unless (find-package :net.acceleration.buildnode.system) - (defpackage :net.acceleration.buildnode.system - (:use :common-lisp :asdf)))) - -(in-package :net.acceleration.buildnode.system) - (defsystem :buildnode-html5 :description "Tool for building up an xml dom of an html5 document" + :licence "BSD-3-Clause" :components ((:module :src - :serial T - :components - ((:module :tags - :serial T - :components - ((:file "html5-tags")))))) - :depends-on (:buildnode)) \ No newline at end of file + :serial T + :components + ((:module :tags + :serial T + :components ((:file "html5-tags")))))) + :depends-on (:buildnode)) diff --git a/buildnode-kml.asd b/buildnode-kml.asd index 8ff6e31..2fccfd4 100644 --- a/buildnode-kml.asd +++ b/buildnode-kml.asd @@ -1,20 +1,13 @@ ;; -*- lisp -*- -(eval-when (:compile-toplevel :load-toplevel :execute) - (unless (find-package :net.acceleration.buildnode.system) - (defpackage :net.acceleration.buildnode.system - (:use :common-lisp :asdf)))) - -(in-package :net.acceleration.buildnode.system) - (defsystem :buildnode-kml :description "Tool for building up an xml dom of an KML." + :licence "BSD-3-Clause" :components ((:module :src - :serial T - :components - ((:module :tags - :serial T - :components - ((:file "kml")))))) + :serial T + :components + ((:module :tags + :serial T + :components ((:file "kml")))))) :depends-on (:buildnode)) diff --git a/buildnode-xhtml.asd b/buildnode-xhtml.asd index 7ac68f8..b26e8a5 100644 --- a/buildnode-xhtml.asd +++ b/buildnode-xhtml.asd @@ -1,20 +1,13 @@ ;; -*- lisp -*- -(eval-when (:compile-toplevel :load-toplevel :execute) - (unless (find-package :net.acceleration.buildnode.system) - (defpackage :net.acceleration.buildnode.system - (:use :common-lisp :asdf)))) - -(in-package :net.acceleration.buildnode.system) - (defsystem :buildnode-xhtml :description "Tool for building up an xml dom of an excel spreadsheet nicely." + :licence "BSD-3-Clause" :components ((:module :src - :serial T - :components - ((:module :tags - :serial T - :components - ((:file "xhtml-tags")))))) - :depends-on (:buildnode)) \ No newline at end of file + :serial T + :components + ((:module :tags + :serial T + :components ((:file "xhtml-tags")))))) + :depends-on (:buildnode)) diff --git a/buildnode-xul.asd b/buildnode-xul.asd index 4846abb..8e3718c 100644 --- a/buildnode-xul.asd +++ b/buildnode-xul.asd @@ -1,20 +1,13 @@ ;; -*- lisp -*- -(eval-when (:compile-toplevel :load-toplevel :execute) - (unless (find-package :net.acceleration.buildnode.system) - (defpackage :net.acceleration.buildnode.system - (:use :common-lisp :asdf)))) - -(in-package :net.acceleration.buildnode.system) - (defsystem :buildnode-xul :description "Tool for building up an xml dom of a Mozilla xul document" + :licence "BSD-3-Clause" :components ((:module :src - :serial T - :components - ((:module :tags - :serial T - :components - ((:file "xul-tags")))))) - :depends-on (:buildnode)) \ No newline at end of file + :serial T + :components + ((:module :tags + :serial T + :components ((:file "xul-tags")))))) + :depends-on (:buildnode)) diff --git a/buildnode.asd b/buildnode.asd index c0ee56c..21dba4e 100644 --- a/buildnode.asd +++ b/buildnode.asd @@ -1,55 +1,48 @@ ;; -*- lisp -*- -(eval-when (:compile-toplevel :load-toplevel :execute) - (unless (find-package :net.acceleration.buildnode.system) - (defpackage :net.acceleration.buildnode.system - (:use :common-lisp :asdf)))) - -(in-package :net.acceleration.buildnode.system) - (defsystem :buildnode :description "Tool for building up an xml dom nicely." :author "http://www.acceleration.net" - :licence "BSD" + :licence "BSD-3-Clause" :components ((:module :src - :serial T - :components - ((:file "packages") - ;; should be removed once a patch doing the same thing makes its - ;; way upstream - (:file "dom-walker") - (:file "buildnode") - (:module :tags - :serial T - :components ((:file "tags" )))))) - :depends-on (:cxml :alexandria - :iterate :flexi-streams :split-sequence - :swank ;; for setting tag-indentation - :cl-interpol - :collectors - ;; TODO: - ;; for html-generation - probably not a dependancy of the whole library - :closure-html - :cl-ppcre - :symbol-munger - )) + :serial T + :components + ((:file "packages") + ;; should be removed once a patch doing the same thing makes its + ;; way upstream + (:file "dom-walker") + (:file "buildnode") + (:module :tags + :serial T + :components ((:file "tags" )))))) + :depends-on (:cxml + :alexandria + :iterate + :flexi-streams + :split-sequence + :swank ;; for setting tag-indentation + :cl-interpol + :collectors + ;; TODO: + ;; for html-generation - probably not a dependancy of the whole library + :closure-html + :cl-ppcre + :symbol-munger) + :in-order-to ((test-op (test-op :buildnode/test)))) -(defsystem :buildnode-test - :description ":buildnode-test: tests for buildnode library of code" +(defsystem :buildnode/test + :description ":buildnode/test: tests for buildnode library of code" :author "http://www.acceleration.net" - :licence "BSD" + :licence "BSD-3-Clause" :components ((:module :tests - :serial t - :components ((:file "setup") - (:file "basic-tests")))) - :depends-on (:buildnode :buildnode-xhtml :lisp-unit2)) - -(defmethod asdf:perform ((o asdf:test-op) (c (eql (find-system :buildnode)))) - (asdf:load-system :buildnode-test) - (let ((*package* (find-package :buildnode-test))) - (eval (read-from-string "(run-tests)")))) + :serial t + :components ((:file "setup") + (:file "basic-tests")))) + :depends-on (:buildnode :buildnode-xhtml :lisp-unit2) + :perform (test-op (o c) + (symbol-call :buildnode-test :run-tests))) ;; Copyright (c) 2011 Russ Tyndall , Acceleration.net http://www.acceleration.net ;; All rights reserved. @@ -75,4 +68,4 @@ ;; DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ;; THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -;; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +;; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.