Commit 5b6a9d1e authored by Eric Timmons's avatar Eric Timmons
Browse files

Remove logical-pathnames.lisp

I had high hopes for logical pathnames, in terms of the debugger being able to
find the source code on a deployed version of CLPM to allow for easy
debugging. But the truth is, that doesn't work. Bugs are likely often also
going to include external libraries which don't have logical pathnames. If we
want to have debugging of deployed versions of CLPM, users need to compile it
parent 58db4b41
......@@ -41,12 +41,6 @@
(setf deploy:*data-location* (uiop:truenamize (uiop:ensure-directory-pathname
(uiop:ensure-absolute-pathname clpm-home))))
;; Fixup the logical pathnames
(when (uiop:featurep :clpm-logical-pathnames)
(setf (logical-pathname-translations "clpm")
`(("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 "client/clpm-client.asd"
......@@ -12,7 +12,7 @@
: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/"
:pathname "cli/"
:class :package-inferred-system
:defsystem-depends-on (#:clpm-features #:deploy)
:entry-point "clpm-cli/entry:main"
......@@ -12,6 +12,6 @@
: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/"
:pathname "features/"
:class :package-inferred-system
:depends-on (#:clpm-features/clpm-features))
......@@ -13,7 +13,7 @@
: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:clpm;" #-clpm-logical-pathnames "clpm/"
:pathname "clpm/"
:class :package-inferred-system
:defsystem-depends-on (#:clpm-features)
:depends-on (#:clpm/clpm
(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:clpm;**;*.*.*" ,(merge-pathnames "clpm/**/*.*" clpm-root))
("clpm:cli;**;*.*.*" ,(merge-pathnames "cli/**/*.*" clpm-root))
("clpm:features;**;*.*.*" ,(merge-pathnames "features/**/*.*" clpm-root)))))
(pushnew :clpm-logical-pathnames *features*)
......@@ -10,8 +10,6 @@
(in-package #:clpm-scripts)
(load (merge-pathnames "../logical-pathname.lisp" *load-truename*))
(setup-asdf "default")
(asdf:load-system :s-xml)
......@@ -17,9 +17,6 @@
(compile-file asdf.lisp :verbose nil :print nil :progress nil))
(load asdf.fasl))
;; Setup logical pathnames
(load (merge-pathnames "../logical-pathname.lisp" *load-truename*))
(defvar *setup-file-pathname* *load-truename*
"The pathname to this file.")
......@@ -32,12 +29,6 @@
"The pathname to the root of the build directory. Defaults to build/ inside
(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)
......@@ -48,6 +39,4 @@
(:tree ,*root-pathname*)))
(asdf:initialize-output-translations `(:output-translations
(:root (,build-cache :implementation :**/ :*.*.*))))
(setf asdf::*output-translation-function*
(make-asdf-logical-pathname-translator 'asdf:apply-output-translations))))
(:root (,build-cache :implementation :**/ :*.*.*))))))
Supports Markdown
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