Commit 8fc982d9 authored by Eric Timmons's avatar Eric Timmons
Browse files

Remove logical pathnames

Benefits don't seem to outweigh the pain
parent dd3cec47
......@@ -13,6 +13,6 @@
:version (:read-file-form "src/clpm/version.lisp" :at (2 2))
:description "A Common Lisp Package Manager"
:license "BSD-2-Clause"
:pathname #p"clpm:src;clpm-build;"
:pathname "src/clpm-build/"
:class :package-inferred-system
:depends-on (#:clpm-build/clpm-build))
......@@ -13,7 +13,7 @@
:version (:read-file-form "src/clpm/version.lisp" :at (2 2))
:description "A Common Lisp Package Manager"
:license "BSD-2-Clause"
:pathname #p"clpm:src;clpm;"
:pathname "src/clpm/"
:class :package-inferred-system
:defsystem-depends-on (#:clpm-build #:deploy)
:entry-point "clpm/cli/entry:main"
......
(in-package :cl-user)
;; Configure our logical pathnames.
;;
;; When using SLIME, LOAD this file (C-c C-l), not COMPILE and LOAD (C-c C-k).
(let ((clpm-root (uiop:pathname-directory-pathname (uiop:ensure-absolute-pathname *load-pathname*))))
(setf (logical-pathname-translations "clpm")
`(("clpm:src;**;*.*.*" ,(merge-pathnames "src/**/*.*" clpm-root)))))
......@@ -10,8 +10,6 @@
(in-package #:clpm-scripts)
(load (merge-pathnames "../logical-pathname.lisp" *load-truename*))
(setup-asdf "default")
(asdf:load-system :s-xml)
......
......@@ -11,9 +11,6 @@
;; Load in ASDF.
(require :asdf)
;; Setup logical pathnames
(load (merge-pathnames "../logical-pathname.lisp" *load-truename*))
(defvar *setup-file-pathname* *load-truename*
"The pathname to this file.")
......@@ -26,12 +23,6 @@
"The pathname to the root of the build directory. Defaults to build/ inside
*ROOT-PATHNAME*")
(defun make-asdf-logical-pathname-translator (orig-fun)
(lambda (pn)
(if (typep pn 'logical-pathname)
(funcall orig-fun (translate-logical-pathname pn))
(funcall orig-fun pn))))
(defun setup-asdf (&optional (cache-dir ""))
(let ((build-cache (uiop:ensure-directory-pathname
(merge-pathnames (concatenate 'string "cl-cache/" cache-dir)
......@@ -42,6 +33,4 @@
(:tree ,*root-pathname*)))
(asdf:initialize-output-translations `(:output-translations
:ignore-inherited-configuration
(:root (,build-cache :implementation :**/ :*.*.*))))
(setf asdf::*output-translation-function*
(make-asdf-logical-pathname-translator 'asdf:apply-output-translations))))
(:root (,build-cache :implementation :**/ :*.*.*))))))
......@@ -36,9 +36,6 @@
(deploy:runtime-directory))))
(setf deploy:*data-location* (uiop:truenamize (uiop:ensure-directory-pathname
(uiop:ensure-absolute-pathname clpm-home))))
;; Fixup the logical pathnames
(setf (logical-pathname-translations "clpm")
`(("clpm:src;**;*.*.*" ,(merge-pathnames "src/**/*.*" deploy:*data-location*))))
(setf *clpm-groveler-asd-pathname* (merge-pathnames "src/clpm-groveler/clpm-groveler.asd"
deploy:*data-location*))
(setf *clpm-client-asd-pathname* (merge-pathnames "src/clpm-client/clpm-client.asd"
......
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