* Canonical version number is now in stumpwm.asd. Autoconf picks it up from there. * Maintainer updates version number and commits before creating a release. * version.lisp looks for a .git dir alongside the source, if found then *version* is set using git describe, otherwise the release version is used. --- configure.ac | 3 +-- stumpwm.asd | 2 +- version.lisp.in => version.lisp | 19 ++++++++++++------- 3 files changed, 14 insertions(+), 10 deletions(-) rename version.lisp.in => version.lisp (67%)
diff --git a/configure.ac b/configure.ac index 0412ee5..9d47c06 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(Stump Window Manager, 0.9.8-git, sabe...@gmail.com) +AC_INIT(Stump Window Manager, esyscmd(grep :version stumpwm.asd | cut -d\" -f2 | tr -d \\n), sabe...@gmail.com) AC_SUBST(CONTRIB_DIR) AC_SUBST(LISP_PROGRAM) @@ -101,4 +101,3 @@ fi # Checks for library functions. AC_OUTPUT(Makefile) -AC_OUTPUT(version.lisp) diff --git a/stumpwm.asd b/stumpwm.asd index 9bb3cf8..c98046c 100644 --- a/stumpwm.asd +++ b/stumpwm.asd @@ -14,7 +14,7 @@ (defsystem :stumpwm :name "StumpWM" :author "Shawn Betts <sabe...@vcn.bc.ca>" - :version "CVS" + :version "0.9.7" :maintainer "Shawn Betts <sabe...@vcn.bc.ca>" ;; :license "GNU General Public License" :description "A tiling, keyboard driven window manager" diff --git a/version.lisp.in b/version.lisp similarity index 67% rename from version.lisp.in rename to version.lisp index 5e3a2b8..a42d5cf 100644 --- a/version.lisp.in +++ b/version.lisp @@ -27,13 +27,18 @@ (export '(*version* version)) (defparameter *version* - #.(concatenate 'string - (if (probe-path ".git") - (string-trim '(#\Newline) (run-shell-command "git describe" t)) - "@PACKAGE_VERSION@") - " Compiled On " - (format-expand *time-format-string-alist* - *time-format-string-default*))) + #.(concatenate + 'string + (let* ((sys (asdf:find-system :stumpwm)) + (git-dir (probe-path (asdf:system-relative-pathname sys ".git")))) + (if git-dir + (progn + (setf (getenv "GIT_DIR") (namestring git-dir)) + (string-trim '(#\Newline) (run-shell-command "git describe" t))) + (asdf:component-version sys))) + " Compiled On " + (format-expand *time-format-string-alist* + *time-format-string-default*))) (defcommand version () () "Print version information and compilation date." -- 1.7.7.2 _______________________________________________ Stumpwm-devel mailing list Stumpwm-devel@nongnu.org https://lists.nongnu.org/mailman/listinfo/stumpwm-devel
