Commit 1bf9e663 authored by Eric Timmons's avatar Eric Timmons
Browse files

cleanup: move src/clpm/ to clpm/

parent d5567462
......@@ -48,7 +48,7 @@
(parse-integer (uiop:run-program '("git" "rev-list" "--count" "HEAD" "--not" "master")
:output '(:string :stripped t))))
(defun base-version ()
(uiop:read-file-form (merge-pathnames "src/clpm/version.lisp" *lakefile-truename*)
(uiop:read-file-form (merge-pathnames "clpm/version.lisp" *lakefile-truename*)
:at '(3 2)))
(defun clpm-version (&key ignore-dirty-p)
......
......@@ -17,7 +17,7 @@
(defvar *default-clpm-home* nil)
(deploy:define-resource-directory deploy-src "src/")
(deploy:define-resource-directory deploy-src "clpm/")
(deploy:define-resource-directory deploy-cli "cli/")
(deploy:define-resource-directory deploy-features "features/")
(deploy:define-resource-directory deploy-client "client/")
......@@ -48,7 +48,7 @@
;; Fixup the logical pathnames
(when (uiop:featurep :clpm-logical-pathnames)
(setf (logical-pathname-translations "clpm")
`(("clpm:src;**;*.*.*" ,(merge-pathnames "src/**/*.*" deploy:*data-location*))
`(("clpm:clpm;**;*.*.*" ,(merge-pathnames "clpm/**/*.*" deploy:*data-location*))
("clpm:cli;**;*.*.*" ,(merge-pathnames "cli/**/*.*" deploy:*data-location*))
("clpm:features;**;*.*.*" ,(merge-pathnames "features/**/*.*" deploy:*data-location*)))))
(setf *clpm-client-asd-pathname* (merge-pathnames "src/clpm-client/clpm-client.asd"
......
......@@ -9,7 +9,7 @@
(in-package :asdf-user)
(defsystem #:clpm-cli
:version (:read-file-form "src/clpm/version.lisp" :at (2 2))
:version (:read-file-form "clpm/version.lisp" :at (2 2))
:description "Command Line Interface for CLPM"
:license "BSD-2-Clause"
:pathname #+clpm-logical-pathnames #p"clpm:cli;" #-clpm-logical-pathnames "cli/"
......
......@@ -9,7 +9,7 @@
(in-package :asdf-user)
(defsystem #:clpm-features
:version (:read-file-form "src/clpm/version.lisp" :at (2 2))
:version (:read-file-form "clpm/version.lisp" :at (2 2))
:description "Configuring *FEATURES* for CLPM"
:license "BSD-2-Clause"
:pathname #+clpm-logical-pathnames #p"clpm:features;" #-clpm-logical-pathnames "features/"
......
......@@ -10,10 +10,10 @@
(in-package :asdf-user)
(defsystem #:clpm
:version (:read-file-form "src/clpm/version.lisp" :at (2 2))
:version (:read-file-form "clpm/version.lisp" :at (2 2))
:description "A Common Lisp Package Manager"
:license "BSD-2-Clause"
:pathname #+clpm-logical-pathnames #p"clpm:src;clpm;" #-clpm-logical-pathnames "src/clpm/"
:pathname #+clpm-logical-pathnames #p"clpm:clpm;" #-clpm-logical-pathnames "clpm/"
:class :package-inferred-system
:defsystem-depends-on (#:clpm-features)
:depends-on (#:clpm/clpm
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment