refactor: correct version variables

These two variables have been the wrong way around for a while. In
preparation for splitting Doom into separate repos (its core and module
libraries), I've corrected them. doom-modules-version is a placeholder
and will be removed later.

I've also settled on -dev suffix for inter-release versions of Doom,
rather than alpha.
This commit is contained in:
Henrik Lissner 2022-03-20 23:56:06 +01:00
parent 319665bbdc
commit 2aeca577c8
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
2 changed files with 14 additions and 11 deletions

View file

@ -258,16 +258,19 @@ ready to be pasted in a bug report on github."
"GNU Emacs"
emacs-version
emacs-repository-version)
(let ((default-directory doom-core-dir))
(print! "%-13s v%-15s %s"
"Doom core"
doom-core-version
(or (cdr (doom-call-process "git" "log" "-1" "--format=%D %h %ci"))
"n/a")))
(let ((default-directory doom-emacs-dir))
(print! "%-13s v%-15s %s"
"Doom modules"
"Doom core"
doom-version
(or (cdr (doom-call-process "git" "log" "-1" "--format=%D %h %ci"))
"n/a")))
;; NOTE This is a placeholder. Our modules will be moved to its own repo
;; eventually, and Doom core will later be capable of managing them like
;; package sources.
(let ((default-directory doom-modules-dir))
(print! "%-13s v%-15s %s"
"Doom modules"
doom-modules-version
(or (cdr (doom-call-process "git" "log" "-1" "--format=%D %h %ci"))
"n/a"))))

View file

@ -24,12 +24,12 @@
"An Emacs framework for the stubborn martian hacker."
:link '(url-link "https://doomemacs.org"))
(defconst doom-version "21.12.0-alpha"
"Current version of Doom Emacs.")
(defconst doom-core-version "3.0.0-alpha"
(defconst doom-version "3.0.0-dev"
"Current version of Doom Emacs core.")
(defconst doom-modules-version "22.03.0-dev"
"Current version of Doom Emacs.")
(defvar doom-debug-p (or (getenv-internal "DEBUG") init-file-debug)
"If non-nil, Doom will log more.