[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] elpa-admin 9731033 204/357: Use symbolic links for core packages
From: |
Stefan Monnier |
Subject: |
[elpa] elpa-admin 9731033 204/357: Use symbolic links for core packages |
Date: |
Thu, 10 Dec 2020 18:06:44 -0500 (EST) |
branch: elpa-admin
commit 97310334e317dfe992241e1f6667704f5341c28b
Author: Thomas Fitzsimmons <fitzsim@fitzsim.org>
Commit: Thomas Fitzsimmons <fitzsim@fitzsim.org>
Use symbolic links for core packages
* admin/archive-contents.el (archive--process-simple-package):
Copy file if it is a symlink to prevent deletion of target source
file.
(archive--core-package-link-file): Rename from
archive--core-package-copy-file. Create symbolic links for core
files.
(archive--core-package-link-directory): Rename from
archive--core-package-copy-directory. Call
archive--core-package-link-file.
(archive--core-package-sync): Change message to indicate linking.
Call archive--core-package-link-file.
---
admin/archive-contents.el | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 74e473e..feb646a 100755
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -207,8 +207,9 @@ PKG is the name of the package and DIR is the directory
where it is."
"Deploy the contents of DIR into the archive as a simple package.
Rename DIR/PKG.el to PKG-VERS.el, delete DIR, and return the descriptor."
;; Write DIR/foo.el to foo-VERS.el and delete DIR
- (rename-file (expand-file-name (concat pkg ".el") dir)
- (concat pkg "-" vers ".el"))
+ (let ((src (expand-file-name (concat pkg ".el") dir)))
+ (funcall (if (file-symlink-p src) #'copy-file #'rename-file)
+ src (concat pkg "-" vers ".el")))
;; Add the content of the ChangeLog.
(let ((cl (expand-file-name "ChangeLog" dir)))
(with-current-buffer (find-file-noselect (concat pkg "-" vers ".el"))
@@ -645,9 +646,9 @@ version control nor listed in EXTERNALS-LIST."
"Return non-nil if DEST is an empty variant."
(member dest (list "" "." nil)))
-(defun archive--core-package-copy-file
+(defun archive--core-package-link-file
(source dest emacs-repo-root package-root exclude-regexp)
- "Copy file from SOURCE to DEST ensuring subdirectories."
+ "Link file from SOURCE to DEST ensuring subdirectories."
(unless (string-match-p exclude-regexp source)
(let* ((absolute-package-file-name
(expand-file-name dest package-root))
@@ -656,14 +657,18 @@ version control nor listed in EXTERNALS-LIST."
(directory (file-name-directory absolute-package-file-name)))
(unless (file-directory-p directory)
(make-directory directory t))
- (copy-file absolute-core-file-name absolute-package-file-name))
+ (condition-case nil
+ (make-symbolic-link absolute-core-file-name
+ absolute-package-file-name t)
+ (file-error
+ (copy-file absolute-core-file-name absolute-package-file-name))))
(message " %s -> %s" source (if (archive--core-package-empty-dest-p dest)
(file-name-nondirectory source)
dest))))
-(defun archive--core-package-copy-directory
+(defun archive--core-package-link-directory
(source dest emacs-repo-root package-root exclude-regexp)
- "Copy directory files from SOURCE to DEST ensuring subdirectories."
+ "Link directory files from SOURCE to DEST ensuring subdirectories."
(let ((stack (list source))
(base source)
(absolute-source))
@@ -678,12 +683,12 @@ version control nor listed in EXTERNALS-LIST."
(source-sans-base (substring source (length base)))
(package-file-name
(if (archive--core-package-empty-dest-p dest)
- ;; Copy to root with it's original filename.
+ ;; Link to root with its original filename.
source-sans-base
(concat
;; Prepend the destination, allowing for directory rename.
(file-name-as-directory dest) source-sans-base))))
- (archive--core-package-copy-file
+ (archive--core-package-link-file
source package-file-name
emacs-repo-root package-root exclude-regexp))))))
@@ -711,16 +716,16 @@ version control nor listed in EXTERNALS-LIST."
;; Files may be just a string, normalize.
(list file-patterns)
file-patterns))))
- (message "Copying files for package: %s" name)
+ (message "Linking files for package: %s" name)
(when (file-directory-p package-root)
(delete-directory package-root t))
(make-directory package-root t)
(dolist (file-pattern file-patterns)
(pcase-let* ((`(,file . ,dest) file-pattern))
(if (file-directory-p (expand-file-name file emacs-repo-root))
- (archive--core-package-copy-directory
+ (archive--core-package-link-directory
file dest emacs-repo-root package-root exclude-regexp)
- (archive--core-package-copy-file
+ (archive--core-package-link-file
file dest emacs-repo-root package-root exclude-regexp))))))
(defun archive-add/remove/update-externals ()
- [elpa] elpa-admin 524fc02 114/357: updating notes and README text, (continued)
- [elpa] elpa-admin 524fc02 114/357: updating notes and README text, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 5f38238 131/357: Merge branch 'master' of https://github.com/leoliu/easy-kill, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 3cd0561 181/357: Improve README.md and add a screenshot, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 4a2ebd4 186/357: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin cb8a04b 195/357: * admin/archive-contents.el: Improve docstrings, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin b9f2b90 208/357: * admin/archive-contents.el (archive--sync-emacs-repo): Fix thinko., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 83d4032 202/357: * README: Typos, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 7fa1dbd 214/357: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 5cf5115 228/357: * admin/archive-contents.el (archive--pull): New function, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin d079afa 187/357: Squashed 'packages/pinentry/' changes from 075deb6..b3a45a5, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 9731033 204/357: Use symbolic links for core packages,
Stefan Monnier <=
- [elpa] elpa-admin 5571ea8 211/357: Add symlink to README, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 9ab6e7e 217/357: Update packages/yasnippet by subtree-merging from its external upstream, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin f1c2e2f 210/357: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa: transcribe.el update, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 0d7eb99 235/357: Add 'packages/realgud/' from commit 'b7a7fe924217931332915d457928c6851db4a636', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin b14148a 249/357: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 8208d1c 245/357: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 299da86 255/357: Package pages improvements, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin ec13cc2 260/357: Let ert-support.el work for subdirectories, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 294407d 256/357: README: Fix copyright years., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 5250761 270/357: * admin/archive-contents.el: Use `git worktree` for externals, Stefan Monnier, 2020/12/10