branch: elpa/git-commit
commit 31e5b9b1ad1956484ed7cc2f7d1f8257033fc19c
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>
make: Remove bump-versions and bump-snapshots targets
---
Makefile | 146 +------------------------------------------------------------
default.mk | 18 --------
2 files changed, 1 insertion(+), 163 deletions(-)
diff --git a/Makefile b/Makefile
index dd0d79e739..4ccccc4156 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ include default.mk
install install-lisp install-docs install-info \
test test-interactive magit \
clean clean-lisp clean-docs clean-archives \
- stats bump-versions bump-snapshots \
+ stats \
dist versionlib magit-$(VERSION).tar.gz
all: lisp docs
@@ -63,8 +63,6 @@ help:
$(info make publish - publish snapshot manuals)
$(info make release - publish release manuals)
$(info make dist - create tarballs)
- $(info make bump-versions - bump versions for release)
- $(info make bump-snapshots - bump versions after release)
$(info make stats - regenerate statistics)
$(info make stats-upload - publish statistics)
@printf "\n"
@@ -183,148 +181,6 @@ magit-$(VERSION).tar.gz: lisp versionlib info
@$(CP) $(DIST_DOCS_FILES) magit-$(VERSION)/docs
@$(TAR) cz --mtime=./magit-$(VERSION) -f magit-$(VERSION).tar.gz
magit-$(VERSION)
-define set_package_requires_nongnu
-
-(defun --update-package (file version deps)
- (with-temp-buffer
- (insert-file-contents file)
- (re-search-forward "^;; Package-Version: ")
- (delete-region (point) (line-end-position))
- (insert version)
- (re-search-forward "^;; Package-Requires: (\n")
- (let ((beg (point)))
- (forward-line)
- (while (looking-at "^;; ")
- (forward-line))
- (delete-region beg (1- (point)))
- (goto-char beg)
- (while deps
- (insert (format ";; %S%s" (pop deps) (if deps "\n" ")")))))
- (write-region nil nil file nil 0)))
-
-(--update-package "lisp/git-commit.el" "$(GIT_COMMIT_VERSION)"
-`((emacs ,emacs-version) ;`
- (compat ,compat-version)
- (seq ,seq-version)
- (transient ,transient-version)
- (with-editor ,with-editor-version)))
-
-(--update-package "lisp/magit.el" "$(MAGIT_SECTION_VERSION)"
-`((emacs ,emacs-version) ;`
- (compat ,compat-version)
- (dash ,dash-version)
- (git-commit ,git-commit-version)
- (magit-section ,magit-section-version)
- (seq ,seq-version)
- (transient ,transient-version)
- (with-editor ,with-editor-version)))
-
-(--update-package "lisp/magit-section.el" "$(MAGIT_SECTION_VERSION)"
-`((emacs ,emacs-version) ;`
- (compat ,compat-version)
- (dash ,dash-version)
- (seq ,seq-version)))
-endef
-export set_package_requires_nongnu
-
-define set_package_requires_melpa
-
-(with-temp-file "lisp/git-commit-pkg.el"
- (insert (format
-"(define-package \"git-commit\" \"$(GIT_COMMIT_VERSION)\"
- \"Edit Git commit messages.\"
- '((emacs %S)
- (compat %S)
- (transient %S)
- (with-editor %S))
- :homepage \"https://magit.vc\";
- :keywords '(\"git\" \"tools\" \"vc\"))
-" emacs-version
- compat-version
- transient-version
- with-editor-version)))
-
-(with-temp-file "lisp/magit-pkg.el"
- (insert (format
-"(define-package \"magit\" \"$(MAGIT_VERSION)\"
- \"A Git porcelain inside Emacs.\"
- '((emacs %S)
- (compat %S)
- (dash %S)
- (git-commit %S)
- (magit-section %S)
- (seq %S)
- (transient %S)
- (with-editor %S))
- :homepage \"https://magit.vc\";
- :keywords '(\"git\" \"tools\" \"vc\"))
-" emacs-version
- compat-version
- dash-version
- git-commit-version
- magit-section-version
- seq-version
- transient-version
- with-editor-version)))
-
-(with-temp-file "lisp/magit-section-pkg.el"
- (insert (format
-"(define-package \"magit-section\" \"$(MAGIT_SECTION_VERSION)\"
- \"Sections for read-only buffers.\"
- '((emacs %S)
- (compat %S)
- (dash %S))
- :homepage \"https://magit.vc\";
- :keywords '(\"tools\"))
-" emacs-version
- compat-version
- dash-version)))
-endef
-export set_package_requires_melpa
-
-define set_package_versions
-(emacs-version "$(EMACS_VERSION)")
-(compat-version "$(COMPAT_VERSION)")
-(dash-version "$(DASH_VERSION)")
-(git-commit-version "$(GIT_COMMIT_VERSION)")
-(magit-version "$(MAGIT_VERSION)")
-(magit-section-version "$(MAGIT_SECTION_VERSION)")
-(seq-version "$(SEQ_VERSION)")
-(transient-version "$(TRANSIENT_VERSION)")
-(with-editor-version "$(WITH_EDITOR_VERSION)")
-endef
-export set_package_versions
-
-define set_package_snapshots
-(emacs-version "$(EMACS_VERSION)")
-(compat-version "$(COMPAT_SNAPSHOT)")
-(dash-version "$(DASH_MELPA_SNAPSHOT)")
-(git-commit-version "$(GIT_COMMIT_MELPA_SNAPSHOT)")
-(magit-version "$(MAGIT_MELPA_SNAPSHOT)")
-(magit-section-version "$(MAGIT_SECTION_MELPA_SNAPSHOT)")
-(seq-version "$(SEQ_SNAPSHOT)")
-(transient-version "$(TRANSIENT_MELPA_SNAPSHOT)")
-(with-editor-version "$(WITH_EDITOR_MELPA_SNAPSHOT)")
-endef
-export set_package_snapshots
-
-bump-versions: _bump-versions texi
-_bump-versions:
- @$(BATCH) --eval "(let (\
- $$set_package_versions)\
- $$set_package_requires_nongnu\
- $$set_package_requires_melpa)"
-
-bump-snapshots:
- @$(BATCH) --eval "(let (\
- $$set_package_versions)\
- $$set_package_requires_nongnu)"
- @$(BATCH) --eval "(let (\
- $$set_package_snapshots)\
- $$set_package_requires_melpa)"
- @git commit -a --gpg-sign -m "Reset Package-Requires for Melpa"
- @git show --pretty= -p HEAD
-
## Statistics ########################################################
stats:
diff --git a/default.mk b/default.mk
index f9a72eb5f9..7c8aa95516 100644
--- a/default.mk
+++ b/default.mk
@@ -108,24 +108,6 @@ VERSION ?= $(shell \
test -e $(TOP).git && \
git describe --tags --abbrev=0 --always | cut -c2-)
-COMPAT_VERSION = 30.0.0.0
-DASH_VERSION = 2.19.1
-GIT_COMMIT_VERSION = $(VERSION)
-MAGIT_VERSION = $(VERSION)
-MAGIT_SECTION_VERSION = $(VERSION)
-SEQ_VERSION = 2.24
-TRANSIENT_VERSION = 0.7.4
-WITH_EDITOR_VERSION = 3.4.1
-
-COMPAT_SNAPSHOT = $(COMPAT_VERSION)
-DASH_MELPA_SNAPSHOT = 20240510
-GIT_COMMIT_MELPA_SNAPSHOT = 20240808
-MAGIT_MELPA_SNAPSHOT = 20240808
-MAGIT_SECTION_MELPA_SNAPSHOT = 20240808
-SEQ_SNAPSHOT = $(SEQ_VERSION)
-TRANSIENT_MELPA_SNAPSHOT = 20240805
-WITH_EDITOR_MELPA_SNAPSHOT = 20240806
-
EMACS_VERSION = 26.1
EMACSOLD := $(shell $(BATCH) --eval \
