~ salmonella-environment-setup (master) 09bf97c09d8388196a268591f7bebe24c6201953

commit 09bf97c09d8388196a268591f7bebe24c6201953
Author:     Mario Domenech Goulart <mario.goulart@gmail.com>
AuthorDate: Sat Mar 12 10:49:41 2011 -0300
Commit:     Mario Domenech Goulart <mario.goulart@gmail.com>
CommitDate: Sat Mar 12 10:49:41 2011 -0300

    run-salmonella.scm: added branch/os/arch support

diff --git a/run-salmonella.scm b/run-salmonella.scm
index 50224f0..1f97a98 100755
--- a/run-salmonella.scm
+++ b/run-salmonella.scm
@@ -13,7 +13,8 @@
 (define csi-bootstrap (make-pathname chicken-bootstrap-bin "csi"))
 (define chicken-core-git-uri "http://code.call-cc.org/git/chicken-core.git")
 (define chicken-core-branch "master")
-(define platform "linux")
+(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))
@@ -96,9 +97,9 @@
 
   ;; Build chicken
   (! `(touch *.scm) chicken-core-dir)
-  (! `(,make ,(string-append "PLATFORM=" platform " CHICKEN=" chicken-bootstrap) boot-chicken) 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=" platform " PREFIX=" chicken-prefix " CHICKEN=./chicken-boot") spotless install) chicken-core-dir)
+  (! `(,make ,(string-append "PLATFORM=" os-platform " PREFIX=" chicken-prefix " CHICKEN=./chicken-boot") spotless install) chicken-core-dir)
 
   ;; [Re]install salmonella, just in case
   (! `(,(make-pathname (pathname-directory chicken-bootstrap) "chicken-install") salmonella))
@@ -128,8 +129,8 @@
          (day (pad-number (vector-ref now 3) 2))
          (month (pad-number (add1 (vector-ref now 4)) 2))
          (year (number->string (+ 1900 (vector-ref now 5))))
-         (publish-dir (make-pathname (list www-dir year month) day))
-         (feeds-dir (make-pathname www-dir "feeds"))
+         (publish-dir (make-pathname (list www-dir chicken-core-branch os-platform hw-platform year month) day))
+         (feeds-dir (make-pathname (list www-dir "feeds" chicken-core-branch os-platform) hw-platform))
          (today-path (make-pathname (list year month) day)))
 
     (unless (file-exists? publish-dir)
@@ -148,12 +149,7 @@
                 (! `(cp -R ,file ,publish-dir) tmp-dir))
               '("salmonella.log.bz2"
                 "salmonella-report"
-                "run-salmonella.log"))
-
-    ;; Making a link for the current results
-    (! `(rm -f current) www-dir)
-    (! `(ln -s ,today-path current) www-dir)))
-
+                "run-salmonella.log"))))
 
 ;; Create the tmp dir if it not exists
 (unless (file-exists? tmp-dir)