Revert "Supporting reproducible builds."

This commit is contained in:
David 2024-10-19 09:19:51 -04:00 committed by GitHub
parent 5010a7e1a2
commit 3608b089f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 20 deletions

View file

@ -8,7 +8,6 @@ AC_SUBST(MODULE_DIR)
AC_SUBST(LISP_PROGRAM)
AC_SUBST(LISP)
AC_SUBST(COMPRESSION)
AC_SUBST(REPRODUCIBLE)
AC_SUBST(STUMPWM_ASDF_DIR)
# Checks for programs.
@ -23,11 +22,6 @@ AC_ARG_ENABLE(compression,
COMPRESSION="t",
COMPRESSION="nil")
AC_ARG_ENABLE(reproducible,
[ --enable-reproducible create a reproducible build (doesn't include compilation date and time)],
REPRODUCIBLE="t",
REPRODUCIBLE="nil")
STUMPWM_ASDF_DIR="`pwd`"
if test -x "$SBCL_PATH"; then
@ -69,5 +63,3 @@ AC_CONFIG_FILES([make-image.lisp])
AC_OUTPUT
AC_CONFIG_FILES([load-stumpwm.lisp])
AC_OUTPUT
AC_CONFIG_FILES([version.lisp])
AC_OUTPUT

View file

@ -27,18 +27,18 @@
(export '(*version* version))
(defparameter *version*
#.(let* ((sys (asdf:find-system :stumpwm))
(git-dir (probe-path (asdf:system-relative-pathname sys ".git")))
(ver (if git-dir
(string-trim '(#\Newline)
(run-shell-command
(format nil "GIT_DIR=~a git describe --tags" git-dir) t))
(asdf:component-version sys))))
(if @REPRODUCIBLE@
(concatenate 'string ver " Reproducible Build")
(concatenate 'string ver " 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
(string-trim '(#\Newline)
(run-shell-command
(format nil "GIT_DIR=~a git describe --tags" git-dir) 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."