Skip to content

Commit

Permalink
Blaaaa
Browse files Browse the repository at this point in the history
  • Loading branch information
Shinmera committed Jul 28, 2024
1 parent a2c3c46 commit 632b1de
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
5 changes: 3 additions & 2 deletions project.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
((name :initarg :name :initform (arg! :name) :accessor name)
(source-directory :accessor source-directory)
(sources :accessor sources)
(disabled-p :initarg :disabled-p :accessor disabled-p)
(disabled-p :initarg :disabled-p :initform NIL :accessor disabled-p)
(excluded-systems :initarg :excluded-systems :accessor excluded-systems)
(excluded-paths :initarg :excluded-paths :accessor excluded-paths)
(releases :accessor releases)
Expand All @@ -45,7 +45,8 @@
(defmethod shared-initialize :after ((project project) slots &key (releases NIL releases-p) (sources NIL sources-p) source-directory (verbose T))
(when source-directory
(setf (source-directory project) (uiop:truenamize (absolutize source-directory (default-source-directory)))))
(when (and (not (slot-boundp project 'source-directory)) (stored-p project))
(when (and (not (slot-boundp project 'source-directory))
(not (stored-p project)))
(setf (source-directory project) (pathname-utils:subdirectory (default-source-directory) (name project))))
(when releases-p
(setf (releases project) releases))
Expand Down
2 changes: 1 addition & 1 deletion release.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ Systems:~12t~a~%"
(setf (name system) (string-downcase (name system)))
(multiple-value-bind (absolute-p path) (pathname-utils:absolute-p (file system))
(unless absolute-p
(setf (file system) (merge-pathnames path (source-directory (project system)))))))
(setf (file system) (merge-pathnames path (source-directory (project (project system))))))))

(defmethod (setf dependencies) :around ((dependencies cons) (system system))
(call-next-method (delete-duplicates (sort (remove-if #'implementation-specific-dependency-p dependencies) #'string<) :test #'string=) system))
Expand Down
4 changes: 3 additions & 1 deletion test.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@
(with-standard-io-syntax
(dolist (form `((require :asdf)
,@(when checkout-directory
`((asdf:initialize-source-registry '(:source-registry :ignore-inherited-configuration (:tree ,(pathname-utils:native-namestring checkout-directory))))))
`((asdf:initialize-source-registry '(:source-registry :ignore-inherited-configuration
,@(loop for dir in (enlist checkout-directory)
collect `(:tree ,(pathname-utils:native-namestring dir)))))))
,@(when cache-directory
`((asdf:initialize-output-translations '(:output-translations :ignore-inherited-configuration (T (,(pathname-utils:native-namestring cache-directory) :implementation))))))
(asdf:load-system ',(name system))
Expand Down

0 comments on commit 632b1de

Please sign in to comment.