Sun Dec 13 13:43:58 CET 2009 Tobias Rautenkranz * Support ASDF instead of Mudballs. diff -rN -u old-smoke/smoke.asd new-smoke/smoke.asd --- old-smoke/smoke.asd 1970-01-01 01:00:00.000000000 +0100 +++ new-smoke/smoke.asd 2014-10-30 08:09:40.000000000 +0100 @@ -0,0 +1,63 @@ +(defpackage smoke-system + (:use :cl :asdf)) + +(in-package smoke-system) + +(asdf:defsystem :smoke + :name :smoke + :version (0 0 1) + :author "Tobias Rautenkranz" + :license "GPL with linking exception" + :description "Smoke bindings. Provides the base functionality to +implement bindings using the various Smoke modules." + :depends-on + (:cffi :closer-mop :alexandria :trivial-garbage :bordeaux-threads) + + :components + ((:module :src :components + ((:file "package") + (:file "using-type" :depends-on ("package")) + (:file "overload-resolution" :depends-on ("package" "smoke" "using-type")) + #+sbcl (:file "sb-optimize" :depends-on ("overload-resolution")) + (:file "smoke" :depends-on (:smoke-c :objects "clos")) + (:file "object-map" :depends-on (:objects :utils)) + (:file "class-map" :depends-on ("package")) + (:file "bindings" :depends-on ("package")) + (:file "cxx-method" :depends-on ("package")) + (:file "clos" :depends-on + (:smoke-c "cxx-method" :objects "object-map" "class-map" "bindings")) + (:file "smoke-to-clos" :depends-on ("clos" "overload-resolution")) + (:module :objects + :serial t + :depends-on (:smoke-c :utils "bindings") + :components + ((:file "object") (:file "enum" :depends-on ("object")) + (:file "type" :depends-on ("enum")) + (:file "method" :depends-on ("type")) + (:file "class" :depends-on ("method")) + (:file "instance" :depends-on ("class")) + (:file "stack" :depends-on ("instance")))) + (:module :smoke-c + :depends-on ("package") + :components + ((:file "smoke-c") (:file "class" :depends-on ("smoke-c")) + (:file "stack" :depends-on ("class")) + (:file "method" :depends-on ("stack")) + (:file "type" :depends-on ("method")))) + (:module :utils + :depends-on ("package") + :components + ((:file "get-value") + #+sbcl (:file "sbcl-bundle") + (:module :image :components + ((:file "image" :depends-on (:impl)) + (:module :impl + :components + (#+sbcl (:file "sbcl") + #+openmcl (:file "ccl") + #+(not (or sbcl openmcl)) + (:file "not-implemented"))))))))))) + +(defmethod asdf:perform ((operation test-op) (c (eql (find-system :smoke)))) + (operate 'asdf:load-op :qt) + (operate 'asdf:test-op :qt)) diff -rN -u old-smoke/smoke.mbd new-smoke/smoke.mbd --- old-smoke/smoke.mbd 2014-10-30 08:09:40.000000000 +0100 +++ new-smoke/smoke.mbd 1970-01-01 01:00:00.000000000 +0100 @@ -1,78 +0,0 @@ -;;;; -*- Mode: lisp; indent-tabs-mode: nil -*- - -;;; Allow this file to compile even when sysdef.cmake is not loaded. -;;; You can not add a (MB:LOAD :SYSDEF.CMAKE) on top since when Mudballs -;;; loads this file it might not know yet about :SYSDEF.CMAKE. -(defpackage :sysdef.cmake - (:use :cl :sysdef) - (:export :cmake-file :cmake-library)) -(in-package :sysdef.cmake) - -(defclass sysdef.cmake:cmake-file (source-file) - () - (:default-initargs :type "txt")) - -(defclass sysdef.cmake:cmake-library (component) - ((package :initarg :package))) -;;; end SYDDEF.CMAKE - -(in-package :sysdef-user) -(eval-when (:compile-toplevel :load-toplevel :execute) - (use-package :sysdef.cmake)) - -(define-system :smoke () - (:version 0 0 1) - (:documentation "Smoke bindings. Provides the base functionality to -implement bindings using the various Smoke modules.") - (:author "Tobias Rautenkranz") - (:license "GPL with linking exception") - (:components - ("CMakeLists" cmake-file) - (:src module - (:needs "CMakeLists") - (:components - "package" - ("using-type" (:needs "package")) - ("overload-resolution" (:needs "package" "smoke" "using-type")) - ("sb-optimize" (:for :sbcl) (:needs "overload-resolution")) - ("smoke" (:needs "smoke-c" "objects" "clos")) - ("object-map" (:needs "objects" :utils)) - ("class-map" (:needs "package")) - ("bindings" (:needs "package")) - ("cxx-method" (:needs "package")) - ("clos" (:needs "smoke-c" "cxx-method" "objects" "object-map" "class-map" "bindings")) - ("smoke-to-clos" (:needs "clos" "overload-resolution")) - (:objects module - (:needs "smoke-c" "utils" "bindings") - (:serial t) - (:components "object" "enum" "type" "method" "class" - "instance" "stack")) - (:smoke-c module - (:needs "package") - (:components ("libsmoke-c" cmake-library) - ("libsmoke-c-util" cmake-library) - - ("smoke-c" (:needs "libsmoke-c" - "libsmoke-c-util")) - ("class" (:needs "smoke-c")) - ("stack" (:needs "class")) - ("method" (:needs "stack")) - ("type" (:needs "method")))) - - (:utils module - (:needs "package") - (:requires (:sb-posix (:for :sbcl))) - (:components - "get-value" - ("sbcl-bundle" (:for :sbcl)) - (:image module - (:components - ("image" (:needs "impl")) - (:impl module - (:components - ("sbcl" (:for :sbcl)) - ("ccl" (:for :openmcl)) - ("not-implemented" (:for (:not - (:or :sbcl :openmcl))))))))))))) - (:needs :sysdef.cmake :cffi :closer-mop - :alexandria :trivial-garbage :bordeaux-threads)) diff -rN -u old-smoke/src/smoke-c/smoke-c.lisp new-smoke/src/smoke-c/smoke-c.lisp --- old-smoke/src/smoke-c/smoke-c.lisp 2014-10-30 08:09:40.000000000 +0100 +++ new-smoke/src/smoke-c/smoke-c.lisp 2014-10-30 08:09:40.000000000 +0100 @@ -5,11 +5,9 @@ (define-foreign-library libsmokeqt (:unix "libsmokeqt.so.3") (t (:default "libsmokeqt"))) - #-mudballs (define-foreign-library libsmoke-c (:unix "libsmoke-c.so") (t (:default "libsmoke-c"))) - #-mudballs (define-foreign-library libsmoke-c-util (:unix "libsmoke-c-util.so") (t (:default "libsmoke-c-util"))) diff -rN -u old-smoke/test-bundle.sh new-smoke/test-bundle.sh --- old-smoke/test-bundle.sh 2014-10-30 08:09:40.000000000 +0100 +++ new-smoke/test-bundle.sh 2014-10-30 08:09:40.000000000 +0100 @@ -5,7 +5,7 @@ exit 1 fi -MALLOC_CHECK_=3 sbcl --eval '(mb:load :qt.tests)' \ +MALLOC_CHECK_=3 sbcl --eval '(require :qt.tests)' \ --eval '(smoke:save-bundle "qt.test.run")' \ --eval '(quit)' || exit 1 diff -rN -u old-smoke/test.lisp new-smoke/test.lisp --- old-smoke/test.lisp 2014-10-30 08:09:40.000000000 +0100 +++ new-smoke/test.lisp 2014-10-30 08:09:40.000000000 +0100 @@ -15,29 +15,11 @@ ################" ccl --batch --quiet --load $0 || exit 3 exit 0 -# do not use --script to allow loading mudballs with ${HOME}/.sbclrc # Used for testing on darcs record. |# - -(in-package :sysdef-user) - -(defun load-sysdef (pathname system) - (load pathname) - (setf (mb.sysdef::pathname-of (find-system system)) pathname)) - -(defun load-sysdef-file (system-name) - "Loads a mbd file in the current directory." - (load-sysdef (make-pathname :defaults *default-pathname-defaults* - :name (string-downcase system-name) - :type "mbd") - system-name)) - -(load-sysdef-file :smoke) -;(mb:load :FiveAm) -;(setf 5am:*debug-on-failure* t) -;(setf 5am:*debug-on-error* t) -(mb:test :smoke) +(asdf:operate 'asdf:load-op :smoke) +(asdf:operate 'asdf:test-op :smoke) #+sbcl (sb-ext:quit) #+ccl (ccl:quit)