Permalink
Browse files

Switch to Deploy, remove all remaining Qtools refs.

  • Loading branch information...
Shinmera committed Jun 7, 2017
1 parent 495c5b5 commit 9a3720add35891b58ab9a489b33ae322533b5d58
Showing with 19 additions and 35 deletions.
  1. +14 −26 deploy.lisp
  2. +0 −3 fullscreenable.lisp
  3. +0 −3 gamepad.lisp
  4. +1 −1 package.lisp
  5. +3 −1 toolkit.lisp
  6. +1 −1 trial.asd
View
@@ -6,31 +6,19 @@
(in-package #:org.shirakumo.fraf.trial)
(qtools:define-user-libs (libstem-gamepad cl-gamepad-cffi::*static*)
(cl-gamepad-cffi:libstem-gamepad))
(qtools:define-user-libs (libmonitors cl-monitors-cffi::*static*)
(cl-monitors-cffi:libmonitors))
(qtools:define-user-libs (libfond cl-fond-cffi::*static*)
(cl-fond-cffi:libfond))
(defun copy-dir-contents (dir to)
(let ((dir (pathname-utils:to-directory dir))
(to (pathname-utils:to-directory to)))
(ensure-directories-exist to)
(dolist (file (uiop:directory* (merge-pathnames pathname-utils:*wild-file* dir)))
(cond ((pathname-utils:directory-p file)
(copy-dir-contents file (pathname-utils:subdirectory to (pathname-utils:directory-name file))))
(T
(uiop:copy-file file (merge-pathnames (pathname-utils:to-file file) to)))))))
(defun deploy-resources ()
(let ((path qtools:*deployment-location*))
(dolist (pool (list-pools))
(qtools::status 1 "Copying pool ~a from ~a" (name pool) (base pool))
(copy-dir-contents (pool-path pool NIL)
(pathname-utils:subdirectory path "pool" (string-downcase (base pool))))))
(deploy:define-hook (:deploy trial) (target)
(dolist (pool (list-pools))
(deploy:status 1 "Copying pool ~a from ~a" (name pool) (base pool))
(deploy:copy-directory-tree
(pool-path pool NIL)
(pathname-utils:subdirectory target "pool" (string-downcase (base pool)))
:copy-root NIL))
(setf *standalone* T))
(pushnew 'deploy-resources qtools:*build-hooks*)
(deploy:define-hook (:build trial) ()
(cl-monitors:deinit)
(shutdown-gamepad-system))
(deploy:define-hook (:boot trial) ()
(cl-monitors:init)
(init-gamepad-system))
View
@@ -43,6 +43,3 @@
(show (context fullscreenable) :fullscreen fullscreen))
(cl-monitors:init)
(pushnew #'cl-monitors:deinit qtools:*build-hooks*)
(pushnew #'cl-monitors:init qtools:*boot-hooks*)
(pushnew #'cl-monitors:deinit qtools:*quit-hooks*)
View
@@ -40,9 +40,6 @@
(setf *gamepad-input-thread* NIL)))
(init-gamepad-system)
(pushnew #'shutdown-gamepad-system qtools:*build-hooks*)
(pushnew #'init-gamepad-system qtools:*boot-hooks*)
(pushnew #'shutdown-gamepad-system qtools:*quit-hooks*)
(defun cl-gamepad:device-attached (device)
(v:info :trial.input "Attached ~s" (cl-gamepad:print-device device NIL))
View
@@ -8,7 +8,6 @@
(defpackage #:trial
(:nicknames #:org.shirakumo.fraf.trial)
(:use #:cl #:3d-vectors #:3d-matrices #:flare)
(:import-from #:qtools #:finalize)
(:shadow #:scene #:entity #:load)
;; context.lisp
(:export
@@ -94,6 +93,7 @@
;; toolkit.lisp
(:export
#:*time-units*
#:finalize
#:current-time
#:executable-directory
#:enlist
View
@@ -9,6 +9,8 @@
(defparameter *time-units* #+sbcl 1000000
#-sbcl internal-time-units-per-second)
(defgeneric finalize (object))
(declaim (inline current-time))
(defun current-time ()
#+sbcl (let ((usec (nth-value 1 (sb-ext:get-time-of-day))))
@@ -164,7 +166,7 @@
(if (and (uiop:getenv "TRIAL_DEBUG")
(string/= "" (uiop:getenv "TRIAL_DEBUG")))
(invoke-debugger err)
(qtools::quit))))
(deploy:quit))))
(defun standalone-logging-handler ()
(when *standalone*
View
@@ -57,7 +57,7 @@
:3d-vectors
:3d-matrices
:verbose
:qtools
:deploy
:closer-mop
:trivial-garbage
:trivial-indent

0 comments on commit 9a3720a

Please sign in to comment.