Sun Dec 13 13:47:57 CET 2009 Tobias Rautenkranz * Support ASDF instead of Mudballs. diff -rN -u old-qt.examples/qt.examples.asd new-qt.examples/qt.examples.asd --- old-qt.examples/qt.examples.asd 1970-01-01 01:00:00.000000000 +0100 +++ new-qt.examples/qt.examples.asd 2014-10-30 07:36:48.000000000 +0100 @@ -0,0 +1,26 @@ +(defpackage qt.examples-system + (:use :cl :asdf)) + +(in-package qt.examples-system) + +(asdf:defsystem :qt.examples + :name :qt.examples + :version (0 0 1) + :author "Tobias Rautenkranz" + :license "X11" + :description "Qt examples." + :depends-on (:qt :qt.webkit :qt.uitools :qt.phonon) + + :components + ((:module "src" + :components + ((:file "package") + (:file "hello-world" :depends-on ("package")) + (:file "video" :depends-on ("package")) + (:file "hello-world-quit" :depends-on ("package")) + (:file "i18n-hello-world" :depends-on ("package")) + (:file "tick-tack-toe" :depends-on ("package")) + (:file "launcher" :depends-on ("package")) + (:file "ui" :depends-on ("package")) + (:file "repl" :depends-on ("package")) + (:file "class-browser" :depends-on ("package")))))) diff -rN -u old-qt.examples/qt.examples.mbd new-qt.examples/qt.examples.mbd --- old-qt.examples/qt.examples.mbd 2014-10-30 07:36:48.000000000 +0100 +++ new-qt.examples/qt.examples.mbd 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -;;;; -*- Mode: lisp; indent-tabs-mode: nil -*- -;;; -;;; Copyright 2009 Tobias Rautenkranz -;;; -;;; Permission is hereby granted, free of charge, to any person -;;; obtaining a copy of this software and associated documentation -;;; files (the "Software"), to deal in the Software without -;;; restriction, including without limitation the rights to use, -;;; copy, modify, merge, publish, distribute, sublicense, and/or sell -;;; copies of the Software, and to permit persons to whom the -;;; Software is furnished to do so, subject to the following -;;; conditions: -;;; -;;; The above copyright notice and this permission notice shall be -;;; included in all copies or substantial portions of the Software. -;;; -;;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -;;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -;;; OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -;;; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -;;; HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -;;; WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -;;; OTHER DEALINGS IN THE SOFTWARE. - - -;;; 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) - ()) -;;; end SYSDEF.CMAKE - -(in-package :sysdef-user) -(eval-when (:compile-toplevel :load-toplevel :execute) - (use-package :sysdef.cmake)) - -(define-system :qt.examples () - (:version 0 0 1) - (:documentation "Qt examples.") - (:author "Tobias Rautenkranz") - (:license "X11") - (:needs :qt :qt.webkit :qt.uitools :qt.phonon :sysdef.cmake) - (:components - ("src" module - (:components - ("CMakeLists" cmake-file) - "package" - ("hello-world" (:needs "package")) - ("video" (:needs "package")) - ("hello-world-quit" (:needs "package")) - ("i18n-hello-world" (:needs "package" "CMakeLists")) - ("tick-tack-toe" (:needs "package")) - ("launcher" (:needs "package")) - ("ui" (:needs "package")) - ("repl" (:needs "package")) - ("class-browser" (:needs "package")))))) diff -rN -u old-qt.examples/src/i18n-hello-world.lisp new-qt.examples/src/i18n-hello-world.lisp --- old-qt.examples/src/i18n-hello-world.lisp 2014-10-30 07:36:48.000000000 +0100 +++ new-qt.examples/src/i18n-hello-world.lisp 2014-10-30 07:36:48.000000000 +0100 @@ -8,12 +8,7 @@ (qt:with-app () ;; ensures that the message catalogs are found regardless ;; of the current directory. - (let ((source-path - #+mudballs (directory-namestring - (mb.sysdef:input-file - (mb.sysdef:find-component :qt.examples "src" - "i18n-hello-world"))) - #-mudballs *default-pathname-defaults*)) + (let ((source-path *default-pathname-defaults*)) (qt:with-translator ("hello-world" *default-pathname-defaults* source-path) diff -rN -u old-qt.examples/src/ui.lisp new-qt.examples/src/ui.lisp --- old-qt.examples/src/ui.lisp 2014-10-30 07:36:48.000000000 +0100 +++ new-qt.examples/src/ui.lisp 2014-10-30 07:36:48.000000000 +0100 @@ -12,10 +12,7 @@ (setf (cxx:file-name file) (namestring (qt:search-file "widget.ui" - *default-pathname-defaults* - #+mudballs (directory-namestring - (mb.sysdef:input-file - (mb.sysdef:find-component :qt.examples "src" "ui")))))) + *default-pathname-defaults*))) (assert (cxx:exists file) (file) "File ~A does not exists" (cxx:file-name file)) (unless (cxx:open file qt:iodevice.+read-only+) diff -rN -u old-qt.examples/test.lisp new-qt.examples/test.lisp --- old-qt.examples/test.lisp 2014-10-30 07:36:48.000000000 +0100 +++ new-qt.examples/test.lisp 2014-10-30 07:36:48.000000000 +0100 @@ -2,22 +2,7 @@ exec -a "$0" sbcl --noinform --noprint --disable-debugger --load $0 --end-toplevel-options "$@" |# - -(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.examples) -(mb:clean :qt.examples) -(mb:test :qt.examples) +(asdf:oos 'asdf:load-op :qt.examples) +(asdf:oos 'asdf:test-op :qt.examples) (sb-ext:quit)