15/16: commencement: first installed mes-boot1 --still fu

[guix-commits]

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit f718b352b992a652b1ba6739fa26fc739d7a0e65
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Fri Nov 30 18:07:35 2018 +0100

    commencement: first installed mes-boot1 --still fu
---
 gnu/packages/commencement.scm | 63 +++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index f4834cb..b129cba 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -109,7 +109,7 @@
 (define mes-boot1-source
   (let ((version "0.19")
         (revision "0")
-        (commit #f ;;"865b2f682a1934f2c75631d7b588600a1079a0ee"
+        (commit #f ;;"f6eb753ea8b90576035b0a0d7ae5fa506426cd32"
                 ))
     (package
       (inherit mes)
@@ -125,15 +125,20 @@
                           ".tar.gz"))
                     (sha256
                      (base32
-                      "07lvmb13x3x4iqwdh9w4802ky7fv0n2rzp3hika85w79pm1wx6ay")))
+                      "1i67y438c2yl3b25yfq15j2nwnvg3dk7mpyv2y60dg9rnbb8h7mx")))
                   (origin
                     (method url-fetch)
                     (uri (string-append
                           "http://lilypond.org/janneke/mes/";
-                          
"mes-43a93cfe4863bc5a49776401002011c82071f0e6.tar.Z"))
+                          
;;"mes-f6eb753ea8b90576035b0a0d7ae5fa506426cd32.tar.Z"
+                          "mes-f6eb753ea8b90576035b0a0d7ae5fa506426cd32.tar"
+                          ""
+                          ))
                     (sha256
                         (base32
-                         
"0lpbqrs1brkxnb7ksn8dnkp0j468p4bvmkpxvq44l00gxghikrmb")))))
+                         
;;"0pzd0jhy77xzz12v0p8na4x9xks8r6zbm31nzvh4grlapghhyvyd" ; .tar.Z
+                         
"0ka4l8iv3i0vs8b97qmimfmh4cx9q16j3qab5wjxsv9rckdy3qb9" ; .tar
+                         )))))
       (native-inputs '())
       (propagated-inputs '()))))
 
@@ -320,6 +325,7 @@
           (replace 'configure
             (lambda* (#:key outputs #:allow-other-keys)
               (let ((out (assoc-ref %outputs "out")))
+                ;; FIXME: --strip=N broken in gash tar
                 ;;(symlink (string-append "../nyacc-source/module") "nyacc")
                 (symlink (string-append "../nyacc-source/nyacc-0.86.0/module") 
"nyacc")
                 (setenv "V" "1")
@@ -339,31 +345,18 @@
                     (setenv "GUILE_LOAD_COMPILED_PATH"
                             (string-append guile "/lib/guile/2.2/ccache"))
                     (setenv "GUILE_LOAD_PATH"
-                            (string-append ;;(string-append dir 
"/nyacc-source/module")
-                                           (string-append dir 
"/nyacc-source/nyacc-0.86.0/module")
-                                           ":" dir
-                                           guile "/share/guile/2.2/"))
+                            ;; FIXME: --strip=N broken in gash tar
+                            (string-append ;(string-append dir 
"/nyacc-source/module")
+                             (string-append dir 
"/nyacc-source/nyacc-0.86.0/module")
+                             ":" dir
+                             guile "/share/guile/2.2/"))
                     ;; give auto-compile a home -- massive speed-up
                     (mkdir-p "/tmp/home")
                     (setenv "HOME" "/tmp/home")))
                 #t)))
           (replace 'build
             (lambda _
-              ;; (substitute* "bootstrap.sh"
-              ;;   (("guile build-aux/mes-snarf.scm (.*)" all cmd)
-              ;;    (string-append "echo guile -e '(mes-snarf)' 
build-aux/mes-snarf.scm " cmd "\n"
-              ;;                   "guile -e '(mes-snarf)' 
build-aux/mes-snarf.scm " cmd "\n"
-              ;;                   "ls -l src\n"
-              ;;                   ))
-              ;;   (("guile --no-auto-compile (.*)" all cmd)
-              ;;    (string-append "echo guile " cmd "\n"
-              ;;                   "guile " cmd "\n"
-              ;;                   "ls -l lib lib/x86-mes src\n"
-              ;;                   ))
-              ;;   )
-              ;; (system* "guile" "-e" "(mes-snarf)" "build-aux/mes-snarf.scm" 
"--mes" "src/gc.c")
-              ;; ;;(invoke "sh" "-x" "bootstrap.sh")
-
+              ;; show some progress
               (substitute* "bootstrap.sh"
                 (("guile build-aux/mes-snarf.scm (.*)" all cmd)
                  (string-append "echo guile -e '(mes-snarf)' 
build-aux/mes-snarf.scm " cmd "\n"
@@ -374,25 +367,23 @@
                  (string-append "echo guile " cmd "\n"
                                 "guile " cmd "\n"
                                 "ls -l lib lib/x86-mes src\n"
-                                ))
-                )
-
-
-              (system* "sh" "-x" "bootstrap.sh")
-              
-              ;; (system* "ls" "-l" "src")
-              ;; (format #t "***************************************\n")
-              ;; (system* "guile" "-e" "main" "-L" "module" 
"scripts/mescc.scm" "-c" "-D" "VERSION=\"0.18\"" "-D" 
"MODULEDIR=\"/gnu/store/x8xwcz1r9j3pcpg1f1szsmh6pbpjk1bb-mes-boot1-0.19-0.84ac0f1/share/mes/module\""
 "-D" 
"PREFIX=\"/gnu/store/x8xwcz1r9j3pcpg1f1szsmh6pbpjk1bb-mes-boot1-0.19-0.84ac0f1\""
 "-I" "." "-I" "lib" "-I" "include" "-v" "-g" "-L" "lib/linux/x86-mes" "-L" 
"lib/linux" "-L" "lib/x86-mes" "-L" "lib" "-L" "../mes-seed" "-o" 
"lib/libc+tcc.x86-mes-o" "lib/libc+tcc.c")
-              ;; (system* "ls" "-l" "lib")
-              ;; (system* "ls" "-l" "lib/x86-mes")
-              ;; (system* "guile" "-e" "main" "-L" "module" 
"scripts/mescc.scm" "-c" "-D" "VERSION=\"0.18\"" "-D" 
"MODULEDIR=\"/gnu/store/82qc72947aqskaj223zpsv0aiizj9v4q-mes-boot1-0.19-0.84ac0f1/share/mes/module\""
 "-D" 
"PREFIX=\"/gnu/store/82qc72947aqskaj223zpsv0aiizj9v4q-mes-boot1-0.19-0.84ac0f1\""
 "-I" "." "-I" "lib" "-I" "include" "-v" "-g" "-L" "lib/linux/x86-mes" "-L" 
"lib/linux" "-L" "lib/x86-mes" "-L" "lib" "-L" "../mes-seed" "-o" 
"src/mes.x86-mes-o" "src/mes.c")
-              ;; (system* "ls" "-l" "src")
+                                )))
+              (invoke "sh" "bootstrap.sh")
               #t))
           (replace 'check
             (lambda _
+              (setenv "MES_PREFIX" "mes")
               (invoke "src/mes" "--help")))
           (replace 'install
             (lambda _
+              ;; show some progress
+              (substitute* "install.sh"
+                ;;(("set -o pipefail" all) (string-append "#" all "\n"))
+                (("if \\[ (-f [^\\]]*)\\]" all test) (string-append "if test " 
test))
+                (("if \\[.*then") "if false; then")
+                (("^( *)((cp|mkdir|tar) [^']*[^\\])\n" all space cmd)
+                 (string-append space "echo '" cmd "'\n"
+                                space cmd "\n")))
               (invoke "sh" "-x" "install.sh")
               ;;(throw 'barf)
               )))))