~ salmonella-environment-setup (master) d5b0e6b34111d92c947232216208882dbce0832d

commit d5b0e6b34111d92c947232216208882dbce0832d
Author:     Christian Kellermann <ckeen@pestilenz.org>
AuthorDate: Sat Jan 22 12:49:00 2011 +0100
Commit:     Mario Domenech Goulart <mario@ossystems.com.br>
CommitDate: Mon Jan 24 09:27:25 2011 -0200

    Make the branch that is used for a salmonella run configurable
    
    Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>

diff --git a/run-salmonella.scm b/run-salmonella.scm
index 2d7fd54..628f4a2 100755
--- a/run-salmonella.scm
+++ b/run-salmonella.scm
@@ -10,6 +10,9 @@
 (define chicken-prefix (make-pathname tmp-dir "chicken"))
 (define chicken-bootstrap "/usr/local/chicken-4.6.0rc1/bin/chicken")
 (define chicken-core-git-uri "http://code.call-cc.org/git/chicken-core.git")
+(define chicken-core-branch "master")
+(define platform "linux")
+(define make "make")
 (define chicken-eggs-svn-uri
   (conc "https://anonymous@code.call-cc.org/svn/chicken-eggs/release/" chicken-major-release))
 (define eggs-dir (make-pathname tmp-dir "chicken-eggs"))
@@ -77,7 +80,7 @@
   ;; Get the most recent version of the chicken-core
   (if (file-exists? chicken-core-dir)
       (! `(git pull) chicken-core-dir)
-      (! `(git clone ,chicken-core-git-uri) tmp-dir))
+      (! `(git clone -b ,chicken-core-branch ,chicken-core-git-uri) tmp-dir))
 
   ;; Get the most recent versions of wiki documentation
   (if (file-exists? wiki-dir)
@@ -90,7 +93,7 @@
       (! `(svn co ,svn-credentials ,chicken-eggs-svn-uri ,(pathname-strip-directory eggs-dir)) tmp-dir))
 
   ;; Build chicken
-  (! `(make PLATFORM=linux ,(string-append "PREFIX=" chicken-prefix " CHICKEN=" chicken-bootstrap) install) chicken-core-dir)
+  (! `(,make ,(string-append "PLATFORM=" platform " PREFIX=" chicken-prefix " CHICKEN=" chicken-bootstrap) install) chicken-core-dir)
 
   ;; [Re]install salmonella, just in case
   (! `(,(make-pathname (pathname-directory chicken-bootstrap) "chicken-install") salmonella))