~ salmonella-environment-setup (master) 10d03b5e4cb867194b3efd082aceeb8466b81a14

commit 10d03b5e4cb867194b3efd082aceeb8466b81a14
Author:     Mario Domenech Goulart <mario.goulart@gmail.com>
AuthorDate: Thu Jul 7 20:10:10 2011 -0300
Commit:     Mario Domenech Goulart <mario.goulart@gmail.com>
CommitDate: Thu Jul 7 20:11:43 2011 -0300

    run-salmonella.scm: use THE SYSTEM & henrietta-cache.  Run "make
    check" after building chicken.

diff --git a/run-salmonella.scm b/run-salmonella.scm
index aba7e07..5353691 100755
--- a/run-salmonella.scm
+++ b/run-salmonella.scm
@@ -16,8 +16,8 @@
 (define os-platform "linux")
 (define hw-platform "x86")
 (define make "make")
-(define chicken-eggs-svn-uri
-  (conc "https://anonymous@code.call-cc.org/svn/chicken-eggs/release/" chicken-major-release))
+(define egg-locations-uri "http://code.call-cc.org/svn/chicken-eggs/release/4/egg-locations")
+(define egg-locations-file "/root/salmonella/egg-locations")
 (define eggs-dir (make-pathname tmp-dir "chicken-eggs"))
 (define wiki-svn-uri
   (conc "https://anonymous@code.call-cc.org/svn/chicken-eggs/wiki/eggref/" chicken-major-release))
@@ -78,6 +78,8 @@
               run-salmonella.log
               salmonella-report
               ,chicken-core-dir
+              henrietta-cache.log
+              make-check.out.txt
               ))
 
   ;; Get the most recent version of the chicken-core
@@ -91,15 +93,21 @@
       (! `(svn co ,svn-credentials ,wiki-svn-uri ,(pathname-strip-directory wiki-dir)) tmp-dir))
 
   ;; Get the most recent versions of all eggs
-  (if (file-exists? eggs-dir)
-      (! `(svn up ,svn-credentials) eggs-dir)
-      (! `(svn co ,svn-credentials ,chicken-eggs-svn-uri ,(pathname-strip-directory eggs-dir)) tmp-dir))
+  (unless (file-exists? eggs-dir)
+    (create-directory eggs-dir 'with-parents))
+  (! `(wget --user=anonymous --password= ,egg-locations-uri -O ,egg-locations-file))
+  (! `(,(make-pathname chicken-bootstrap-bin "henrietta-cache") -c ,eggs-dir -e ,egg-locations-file))
 
   ;; Build chicken
   (! `(touch *.scm) chicken-core-dir)
   (! `(,make ,(string-append "PLATFORM=" os-platform " CHICKEN=" chicken-bootstrap) boot-chicken) chicken-core-dir)
   (! `(touch *.scm) chicken-core-dir)
   (! `(,make ,(string-append "PLATFORM=" os-platform " PREFIX=" chicken-prefix " CHICKEN=./chicken-boot") spotless install) chicken-core-dir)
+  (with-output-to-file
+      (make-pathname tmp-dir "make-check.out.txt")
+    (lambda ()
+      (print
+       (cdr (! `(,make ,(string-append "PLATFORM=" os-platform " PREFIX=" chicken-prefix " CHICKEN=./chicken-boot") check) chicken-core-dir)))))
 
   ;; Run salmonella
   (! `(,(string-append
@@ -146,7 +154,8 @@
                 (! `(cp -R ,file ,publish-dir) tmp-dir))
               '("salmonella.log.bz2"
                 "salmonella-report"
-                "run-salmonella.log"))))
+                "run-salmonella.log"
+                "make-check.out.txt"))))
 
 ;; Create the tmp dir if it not exists
 (unless (file-exists? tmp-dir)