emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/git-commit d466c4a47e 1/2: make: No longer append a suffix


From: ELPA Syncer
Subject: [nongnu] elpa/git-commit d466c4a47e 1/2: make: No longer append a suffix to non-release versions
Date: Thu, 8 Aug 2024 10:00:26 -0400 (EDT)

branch: elpa/git-commit
commit d466c4a47ed376e99722c33071267926fc6f12ef
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    make: No longer append a suffix to non-release versions
    
    That means that every commit starting with release N, that isn't part of
    a later release, will claim to actually be release N.  That is wrong for
    every commit but N itself, but I was unable to get anybody else to care.
---
 Makefile   | 9 ++++-----
 default.mk | 2 --
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index e62512ac09..002ff6b355 100644
--- a/Makefile
+++ b/Makefile
@@ -192,7 +192,7 @@ define set_package_requires_nongnu
     (insert-file-contents file)
     (re-search-forward "^;; Package-Version: ")
     (delete-region (point) (line-end-position))
-    (insert (concat version "$(DEV_SUFFIX)"))
+    (insert version)
     (re-search-forward "^;; Package-Requires: (\n")
     (let ((beg (point)))
       (forward-line)
@@ -233,7 +233,7 @@ define set_package_requires_melpa
 
 (with-temp-file "lisp/git-commit-pkg.el"
   (insert (format
-"(define-package \"git-commit\" \"$(GIT_COMMIT_VERSION)$(DEV_SUFFIX)\"
+"(define-package \"git-commit\" \"$(GIT_COMMIT_VERSION)\"
   \"Edit Git commit messages.\"
   '((emacs       %S)
     (compat      %S)
@@ -248,7 +248,7 @@ define set_package_requires_melpa
 
 (with-temp-file "lisp/magit-pkg.el"
   (insert (format
-"(define-package \"magit\" \"$(MAGIT_VERSION)$(DEV_SUFFIX)\"
+"(define-package \"magit\" \"$(MAGIT_VERSION)\"
   \"A Git porcelain inside Emacs.\"
   '((emacs         %S)
     (compat        %S)
@@ -271,7 +271,7 @@ define set_package_requires_melpa
 
 (with-temp-file "lisp/magit-section-pkg.el"
   (insert (format
-"(define-package \"magit-section\" \"$(MAGIT_SECTION_VERSION)$(DEV_SUFFIX)\"
+"(define-package \"magit-section\" \"$(MAGIT_SECTION_VERSION)\"
   \"Sections for read-only buffers.\"
   '((emacs  %S)
     (compat %S)
@@ -318,7 +318,6 @@ _bump-versions:
         $$set_package_requires_melpa)"
 
 bump-snapshots:
-       @$(eval DEV_SUFFIX := $(DEV_VERSION_SUFFIX))
        @$(BATCH) --eval "(let (\
         $$set_package_versions)\
         $$set_package_requires_nongnu)"
diff --git a/default.mk b/default.mk
index 96eaed2a12..645a7dbc73 100644
--- a/default.mk
+++ b/default.mk
@@ -126,8 +126,6 @@ SEQ_SNAPSHOT                 = $(SEQ_VERSION)
 TRANSIENT_MELPA_SNAPSHOT     = 20240629
 WITH_EDITOR_MELPA_SNAPSHOT   = 20240702
 
-DEV_VERSION_SUFFIX = .50-git
-
 EMACS_VERSION = 26.1
 
 EMACSOLD := $(shell $(BATCH) --eval \



reply via email to

[Prev in Thread] Current Thread [Next in Thread]