From f6abe28d62f8e84ab8b302980be889b32fa58d3d Mon Sep 17 00:00:00 2001 From: Colin Okay Date: Sat, 29 Jan 2022 08:11:31 -0600 Subject: update to use clpm --- build.lisp | 22 ++----- clpmfile | 7 +++ clpmfile.lock | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ imbricate-run.asd | 2 +- imbricate.asd | 2 +- run.lisp | 10 ---- 6 files changed, 184 insertions(+), 30 deletions(-) create mode 100644 clpmfile create mode 100644 clpmfile.lock diff --git a/build.lisp b/build.lisp index e4ed845..a9193a7 100644 --- a/build.lisp +++ b/build.lisp @@ -1,22 +1,8 @@ - - -(ql:register-local-projects) - -(dolist (dir ql:*local-project-directories*) - (push dir asdf:*central-registry*)) - -(ql:quickload :imbricate-run) +(asdf:load-system "imbricate-run") #+sbcl -(progn - (sb-ext:save-lisp-and-die #p"imbricate" :toplevel #'imbricate.run:main :executable t; :compression t - )) +(sb-ext:save-lisp-and-die #p"imbricate" + :toplevel #'imbricate.run:main + :executable t) -#+ecl -(progn - (asdf:make-build :imbricate-run - :type :program - :move-here #P"./" - :epilogue-code '(imbricate.run:main)) - (ext:exit)) diff --git a/clpmfile b/clpmfile new file mode 100644 index 0000000..624b45a --- /dev/null +++ b/clpmfile @@ -0,0 +1,7 @@ +;;; -*- Mode: common-lisp; -*- +(:api-version "0.4") + +(:source "quicklisp" :url "https://beta.quicklisp.org/dist/quicklisp.txt" :type :quicklisp) + +(:asd "imbricate.asd") +(:asd "imbricate-run.asd") diff --git a/clpmfile.lock b/clpmfile.lock new file mode 100644 index 0000000..2411372 --- /dev/null +++ b/clpmfile.lock @@ -0,0 +1,171 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; This is autogenerated by CLPM. Do not edit by hand. +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(:api-version "0.4") + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; BEGIN SOURCES +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +:sources +(:implicit-file :type :file-system :system-files ("imbricate-run.asd")) +(:implicit-file :type :file-system :system-files ("imbricate.asd")) +("quicklisp" :url "https://beta.quicklisp.org/dist/quicklisp.txt" :type + :quicklisp) + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; BEGIN REQUIREMENTS +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +:requirements +(:asd-file :name "imbricate-run.asd") +(:asd-file :name "imbricate.asd") + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; BEGIN RELEASES +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +:releases +("3bz" :version "2020-12-20" :source "quicklisp" :systems ("3bz")) +("alexandria" :version "2021-12-09" :source "quicklisp" :systems ("alexandria")) +("babel" :version "2020-09-25" :source "quicklisp" :systems ("babel")) +("cffi" :version "2021-04-11" :source "quicklisp" :systems + ("cffi" "cffi-grovel" "cffi-toolchain")) +("cl-jpeg" :version "2017-06-30" :source "quicklisp" :systems ("cl-jpeg")) +("cl-tga" :version "2016-03-18" :source "quicklisp" :systems ("cl-tga")) +("deflate" :version "2020-02-18" :source "quicklisp" :systems ("deflate")) +("documentation-utils" :version "2019-07-11" :source "quicklisp" :systems + ("documentation-utils")) +("flexi-streams" :version "2021-08-07" :source "quicklisp" :systems + ("flexi-streams")) +("ieee-floats" :version "2017-08-30" :source "quicklisp" :systems + ("ieee-floats")) +("imbricate-run.asd" :version :newest :source :implicit-file :systems + ("imbricate-run")) +("imbricate.asd" :version :newest :source :implicit-file :systems ("imbricate")) +("mmap" :version "2020-12-20" :source "quicklisp" :systems ("mmap")) +("monkeylib-binary-data" :version "2011-12-03" :source "quicklisp" :systems + ("com.gigamonkeys.binary-data")) +("nibbles" :version "2021-12-09" :source "quicklisp" :systems ("nibbles")) +("opticl" :version "2021-12-30" :source "quicklisp" :systems ("opticl")) +("opticl-core" :version "2017-10-19" :source "quicklisp" :systems + ("opticl-core")) +("parse-float" :version "2020-02-18" :source "quicklisp" :systems + ("parse-float")) +("pngload" :version "2021-04-11" :source "quicklisp" :systems ("pngload")) +("retrospectiff" :version "2021-12-09" :source "quicklisp" :systems + ("retrospectiff")) +("salza2" :version "2021-10-21" :source "quicklisp" :systems ("salza2")) +("skippy" :version "2015-04-07" :source "quicklisp" :systems ("skippy")) +("static-vectors" :version "2021-06-30" :source "quicklisp" :systems + ("static-vectors")) +("swap-bytes" :version "2019-11-30" :source "quicklisp" :systems ("swap-bytes")) +("trivial-features" :version "2021-12-09" :source "quicklisp" :systems + ("trivial-features")) +("trivial-gray-streams" :version "2021-01-24" :source "quicklisp" :systems + ("trivial-gray-streams")) +("trivial-indent" :version "2021-05-31" :source "quicklisp" :systems + ("trivial-indent")) +("zpb-exif" :version "2021-01-24" :source "quicklisp" :systems ("zpb-exif")) +("zpng" :version "2015-04-07" :source "quicklisp" :systems ("zpng")) + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; BEGIN REVERSE-DEPENDENCIES +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +:reverse-dependencies +("3bz" ((:system :name "pngload") (:system :name "3bz"))) + +("alexandria" ((:system :name "static-vectors") (:system :name "alexandria")) + ((:system :name "pngload") (:system :name "alexandria")) + ((:system :name "parse-float") (:system :name "alexandria")) + ((:system :name "opticl-core") (:system :name "alexandria")) + ((:system :name "opticl") (:system :name "alexandria")) + ((:system :name "com.gigamonkeys.binary-data") (:system :name "alexandria")) + ((:system :name "cffi-grovel") (:system :name "alexandria")) + ((:system :name "cffi") (:system :name "alexandria")) + ((:system :name "babel") (:system :name "alexandria")) + ((:system :name "3bz") (:system :name "alexandria"))) + +("babel" ((:system :name "cffi") (:system :name "babel")) + ((:system :name "3bz") (:system :name "babel"))) + +("cffi" ((:system :name "static-vectors") (:system :name "cffi")) + ((:system :name "static-vectors") (:system :name "cffi-grovel")) + ((:system :name "pngload") (:system :name "cffi")) + ((:system :name "mmap") (:system :name "cffi")) + ((:system :name "cffi-toolchain") (:system :name "cffi")) + ((:system :name "cffi-grovel") (:system :name "cffi")) + ((:system :name "cffi-grovel") (:system :name "cffi-toolchain")) + ((:system :name "3bz") (:system :name "cffi"))) + +("cl-jpeg" ((:system :name "retrospectiff") (:system :name "cl-jpeg")) + ((:system :name "opticl") (:system :name "cl-jpeg"))) + +("cl-tga" ((:system :name "opticl") (:system :name "cl-tga"))) + +("deflate" ((:system :name "retrospectiff") (:system :name "deflate"))) + +("documentation-utils" + ((:system :name "mmap") (:system :name "documentation-utils"))) + +("flexi-streams" + ((:system :name "retrospectiff") (:system :name "flexi-streams"))) + +("ieee-floats" ((:system :name "retrospectiff") (:system :name "ieee-floats"))) + +("imbricate-run.asd" (t (:asd-file :name "imbricate-run.asd"))) + +("imbricate.asd" ((:system :name "imbricate-run") (:system :name "imbricate")) + (t (:asd-file :name "imbricate.asd"))) + +("mmap" ((:system :name "pngload") (:system :name "mmap")) + ((:system :name "3bz") (:system :name "mmap"))) + +("monkeylib-binary-data" + ((:system :name "retrospectiff") + (:system :name "com.gigamonkeys.binary-data"))) + +("nibbles" ((:system :name "3bz") (:system :name "nibbles"))) + +("opticl" ((:system :name "imbricate") (:system :name "opticl"))) + +("opticl-core" ((:system :name "retrospectiff") (:system :name "opticl-core")) + ((:system :name "opticl") (:system :name "opticl-core"))) + +("parse-float" ((:system :name "pngload") (:system :name "parse-float"))) + +("pngload" ((:system :name "opticl") (:system :name "pngload"))) + +("retrospectiff" ((:system :name "opticl") (:system :name "retrospectiff"))) + +("salza2" ((:system :name "zpng") (:system :name "salza2"))) + +("skippy" ((:system :name "opticl") (:system :name "skippy"))) + +("static-vectors" ((:system :name "pngload") (:system :name "static-vectors"))) + +("swap-bytes" ((:system :name "pngload") (:system :name "swap-bytes"))) + +("trivial-features" + ((:system :name "swap-bytes") (:system :name "trivial-features")) + ((:system :name "mmap") (:system :name "trivial-features")) + ((:system :name "cffi") (:system :name "trivial-features")) + ((:system :name "babel") (:system :name "trivial-features")) + ((:system :name "3bz") (:system :name "trivial-features"))) + +("trivial-gray-streams" + ((:system :name "salza2") (:system :name "trivial-gray-streams")) + ((:system :name "flexi-streams") (:system :name "trivial-gray-streams"))) + +("trivial-indent" + ((:system :name "documentation-utils") (:system :name "trivial-indent"))) + +("zpb-exif" ((:system :name "pngload") (:system :name "zpb-exif"))) + +("zpng" ((:system :name "opticl") (:system :name "zpng"))) + diff --git a/imbricate-run.asd b/imbricate-run.asd index c017655..7149784 100644 --- a/imbricate-run.asd +++ b/imbricate-run.asd @@ -5,5 +5,5 @@ :license "AGPL-3.0" :version "0.1.0" :serial t - :depends-on ( #:asdf #:imbricate ) + :depends-on (#:imbricate ) :components ((:file "run"))) diff --git a/imbricate.asd b/imbricate.asd index 472579f..d0560ac 100644 --- a/imbricate.asd +++ b/imbricate.asd @@ -6,5 +6,5 @@ :license "AGPL-3.0" :version "0.1.0" :serial t - :depends-on (#:asdf #:uiop #:opticl) + :depends-on (#:uiop #:opticl) :components ((:file "imbricate"))) diff --git a/run.lisp b/run.lisp index 8eeb603..f83351b 100644 --- a/run.lisp +++ b/run.lisp @@ -11,16 +11,6 @@ (format t " TARGET-DIR a directory where the tilesheet is to be built.~%") (format t " SHEET-TITLE a name used for this sheet and its meta info~%~%")) -#+ecl -(defun main () - (print (ext:command-args))) - ;; (unless (= 4 (length (ext:command-args))) - ;; (print-help) - ;; (ext:quit)) - ;; (destructuring-bind (src target title) (cdr (ext:command-args)) - ;; (imbricate:imbricate-and-save src target title) - ;; (ext:quit))) - #+sbcl (defun main () (unless (= 4 (length sb-ext:*posix-argv*)) -- cgit v1.2.3