Support ASDF instead of Mudballs.
Sun Dec 13 13:44:37 CET 2009 Tobias Rautenkranz <tobias@rautenkranz.ch>
* Support ASDF instead of Mudballs.
diff -rN -u old-qt.gui/qt.asd new-qt.gui/qt.asd
--- old-qt.gui/qt.asd 1970-01-01 01:00:00.000000000 +0100
+++ new-qt.gui/qt.asd 2014-10-15 20:21:07.000000000 +0200
@@ -0,0 +1,47 @@
+(defpackage qt-system
+ (:use :cl :asdf))
+
+(in-package qt-system)
+
+(asdf:defsystem :qt
+ :name :qt
+ :version (0 0 1)
+ :author "Tobias Rautenkranz"
+ :license "GPL with linking exception"
+ :description "Smoke Qt bindings."
+ :depends-on (:smoke :smoke :cffi :alexandria)
+
+ :components
+ ((:module "src"
+ :components
+ ((:file "package")
+ (:module "lib" :depends-on ("package"))
+ (:file "qt" :depends-on ("package" "lib"))
+ (:file "ownership" :depends-on ("qt"))
+ (:file "event" :depends-on ("qt"))
+ (:file "object" :depends-on ("qt" "signal-slot" "qstring" "event"))
+ (:file "operator" :depends-on ("qt" "object"))
+ (:file "application" :depends-on ("qt" "properties"))
+ (:file "qstring" :depends-on ("qt"))
+ (:file "list" :depends-on ("qt"))
+ (:file "msg-handler" :depends-on ("lib" "qt"))
+ (:file "painter" :depends-on ("qt"))
+ (:file "timer" :depends-on ("qt"))
+ (:file "i18n" :depends-on ("qt"))
+ (:file "lisp-object" :depends-on ("qt" "lib"))
+ (:module "signal-slot"
+ :serial t
+ :depends-on ("lisp-object")
+ :components
+ ((:file "signal-slot")
+ (:file "translate" :depends-on ("signal-slot"))
+ (:file "signal" :depends-on ("translate"))
+ (:file "slot" :depends-on ("signal"))
+ (:file "connect" :depends-on ("slot"))))
+ (:file "string-list" :depends-on ("qt" "lib" "qstring"))
+ (:file "variant" :depends-on ("qt" "qstring" "lisp-object"))
+ (:file "properties" :depends-on ("variant"))))))
+
+(defmethod asdf:perform ((operation test-op) (c (eql (find-system :qt))))
+ (operate 'asdf:load-op :qt.tests)
+ (operate 'asdf:test-op :qt.tests))
diff -rN -u old-qt.gui/qt.mbd new-qt.gui/qt.mbd
--- old-qt.gui/qt.mbd 2014-10-15 20:21:07.000000000 +0200
+++ new-qt.gui/qt.mbd 1970-01-01 01:00:00.000000000 +0100
@@ -1,72 +0,0 @@
-;;;; -*- Mode: lisp; indent-tabs-mode: nil -*-
-
-;;; 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 SYSDEF.CMAKE
-
-(in-package :sysdef-user)
-(eval-when (:compile-toplevel :load-toplevel :execute)
- (use-package :sysdef.cmake))
-
-(define-system :qt ()
- (:version 0 0 1)
- (:documentation "Smoke Qt bindings.")
- (:keywords "GUI" "Qt")
- (:author "Tobias Rautenkranz")
- (:license "GPL with linking exception")
- (:components
- ("CMakeLists" sysdef.cmake:cmake-file)
- ("src" module
- (:needs "CMakeLists")
- (:components
- ("CMakeLists.txt" static-file)
- "package"
- ("lib" module
- (:needs "package")
- (:components
- ("libqt-smoke-extra" sysdef.cmake:cmake-library (:package :cl-smoke.qt-impl))
-
- ("CMakeLists.txt" static-file)
- ("qt-smoke.cpp" static-file)
- ("lisp-object.h" static-file)
- ("lisp-object.cpp" static-file)
- ("qstring.cpp" static-file)
- ("qstringlist.cpp" static-file)))
-
- ("qt" (:needs "package" "lib"))
- ("ownership" (:needs "qt"))
- ("event" (:needs "qt"))
- ("object" (:needs "qt" "signal-slot" "qstring" "event"))
- ("operator" (:needs "qt" "object"))
- ("application" (:needs "qt" "properties"))
- ("qstring" (:needs "qt"))
- ("list" (:needs "qt"))
- ("msg-handler" (:needs "lib" "qt"))
- ("painter" (:needs "qt"))
- ("timer" (:needs "qt"))
- ("i18n" (:needs "qt"))
- ("lisp-object" (:needs "qt" "lib"))
- ("signal-slot" module
- (:needs "lisp-object")
- (:serial t)
- (:components
- "signal-slot"
- "translate"
- "signal"
- "slot"
- "connect"))
- ("string-list" (:needs "qt" "lib" "qstring"))
- ("variant" (:needs "qt" "qstring" "lisp-object"))
- ("properties" (:needs "variant")))))
- (:uses-macros-from :smoke)
- (:needs :smoke :sysdef.cmake :cffi :alexandria))
diff -rN -u old-qt.gui/src/qt.lisp new-qt.gui/src/qt.lisp
--- old-qt.gui/src/qt.lisp 2014-10-15 20:21:07.000000000 +0200
+++ new-qt.gui/src/qt.lisp 2014-10-15 20:21:07.000000000 +0200
@@ -32,7 +32,6 @@
(init-qt-smoke "init_qt_Smoke"))
(eval-when (:load-toplevel :compile-toplevel :execute)
- #-mudballs
(define-foreign-library libqt-smoke-extra
(:unix "libqt-smoke-extra.so")
(t (:default "libqt-smoke-extra")))
diff -rN -u old-qt.gui/test.lisp new-qt.gui/test.lisp
--- old-qt.gui/test.lisp 2014-10-15 20:21:07.000000000 +0200
+++ new-qt.gui/test.lisp 2014-10-15 20:21:07.000000000 +0200
@@ -1,25 +1,9 @@
#|
exec -a "$0" sbcl --noinform --noprint --disable-debugger --load $0 --end-toplevel-options "$@"
-# 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 :qt)
-(mb:clean :qt)
-(mb:test :qt)
+(asdf:operate 'asdf:load-op :qt)
+(asdf:operate 'asdf:test-op :qt)
(sb-ext:quit)
diff -rN -u old-qt.gui/tests/test.lisp new-qt.gui/tests/test.lisp
--- old-qt.gui/tests/test.lisp 2014-10-15 20:21:07.000000000 +0200
+++ new-qt.gui/tests/test.lisp 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-(mb:test :qt.tests)