guix: restore the manual mdate when building it

4 files changed, 19 insertions, 4 deletions

diff --git a/bootstrap b/bootstrap
index feb3ddf..d18d9f7 100755
--- a/bootstrap
+++ b/bootstrap
@@ -18,7 +18,12 @@
 
 if [ -f .manual-mdate ]
 then
-    touch -t "$(date -d $(cat .manual-mdate) '+%Y%m%d%H%M.%S')" doc/disfluid.texi
+    MANUAL_MDATE="$(cat .manual-mdate)"
+    MANUAL_MDATE_TOUCH="$(date -d $MANUAL_MDATE '+%Y%m%d%H%M.%S')"
+    >&2 echo "Changing the manual date to $MANUAL_MDATE_TOUCH (from $MANUAL_MDATE)."
+    touch -m -t "$MANUAL_MDATE_TOUCH" doc/disfluid.texi
+else
+    >&2 echo "Please write the last modification date in .manual-mdate, if it’s not the modification date of doc/disfluid.texi."
 fi
 
 autoreconf -vif || exit 1
diff --git a/configure.ac b/configure.ac
index de1c2a8..e4bc52b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,5 +50,4 @@ GLIB_GSETTINGS
 AC_CONFIG_FILES([Makefile po/Makefile.in man/Makefile eu.planete_kraus.Disfluid.gschema.xml])
 AC_CONFIG_FILES([man/reset-env], [chmod +x man/reset-env])
 AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env])
-touch -m -t $(date -d "$RELEASE_DATE" '+%Y%m%d%H%M.%S') "$srcdir/doc/disfluid.texi"
 AC_OUTPUT
diff --git a/guix/vkraus/packages/disfluid.scm b/guix/vkraus/packages/disfluid.scm
index d9558ac..dedae91 100644
--- a/guix/vkraus/packages/disfluid.scm
+++ b/guix/vkraus/packages/disfluid.scm
@@ -146,7 +146,7 @@
            (files '("lib")))))))
 
 (define*-public (disfluid-release
-                 #:key version release-date commit-id hash)
+                 #:key version release-date manual-mdate commit-id hash)
   (package
    (inherit disfluid-snapshot)
    (name "disfluid")
@@ -164,13 +164,16 @@
            (lambda _ (format #t "~a~%" ,version)))
          (with-output-to-file ".tarball-release-date"
            (lambda _ (format #t "~a~%" ,release-date)))
+         (with-output-to-file ".manual-mdate"
+           (lambda _ (format #t "~a~%" ,manual-mdate)))
          #t))))))
 
 (define*-public (disfluid-branch-snapshot
-                 #:key branch-name version release-date commit-id hash)
+                 #:key branch-name version manual-mdate release-date commit-id hash)
   (package
     (inherit (disfluid-release
               #:version version
+              #:manual-mdate manual-mdate
               #:release-date release-date
               #:commit-id commit-id
               #:hash hash))
diff --git a/update-channel.scm b/update-channel.scm
index 26c0221..7169472 100644
--- a/update-channel.scm
+++ b/update-channel.scm
@@ -37,6 +37,7 @@
   (hash #:getter hash)
   (version #:getter version)
   (release-date #:getter release-date)
+  (manual-mdate #:getter manual-mdate)
   (commit-id #:getter commit-id)
   (interned-modules #:getter interned-modules))
 
@@ -67,6 +68,8 @@
          tmp-dirname
        (invoke bash "-c" (format #f "guix hash -r source > hash")))
      (invoke bash "-c" (format #f "~a describe --tags --always ~a > ~a/version" git branch-name tmp-dirname))
+     (invoke bash "-c" (format #f "~a log -n 1 --format=%cI ~a -- doc/disfluid.texi > ~a/manual-mdate"
+                               git branch-name tmp-dirname))
      (invoke bash "-c" (format #f "~a show -s --format=%cI ~a > ~a/release-date" git branch-name tmp-dirname))
      (invoke bash "-c" (format #f "~a rev-parse ~a > ~a/commit-id" git branch-name tmp-dirname))
      (slot-set! branch 'branch-name branch-name)
@@ -76,6 +79,9 @@
      (slot-set! branch 'version
                 (call-with-input-file (string-append tmp-dirname "/version")
                   read-line))
+     (slot-set! branch 'manual-mdate
+                (call-with-input-file (string-append tmp-dirname "/manual-mdate")
+                  read-line))
      (slot-set! branch 'release-date
                 (call-with-input-file (string-append tmp-dirname "/release-date")
                   read-line))
@@ -120,6 +126,7 @@
              `((define-public disfluid
                  (disfluid-release
                   #:version ,(version branch)
+                  #:manual-mdate ,(manual-mdate branch)
                   #:release-date ,(release-date branch)
                   #:commit-id ,(commit-id branch)
                   #:hash ,(hash branch))))
@@ -130,6 +137,7 @@
          (disfluid-branch-snapshot
           #:branch-name ,(branch-name branch)
           #:version ,(version branch)
+          #:manual-mdate ,(manual-mdate branch)
           #:release-date ,(release-date branch)
           #:commit-id ,(commit-id branch)
           #:hash ,(hash branch)))))))