From 1c3efa89d214ad2b4f9f6b468de2519c6bdbae2c Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Thu, 7 Feb 2008 19:50:26 -0600
Subject: [PATCH] builder improvements (download-image, simpler do-all)

---
 extra/builder/builder.factor   | 12 ++++++------
 extra/builder/test/test.factor | 24 ------------------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/extra/builder/builder.factor b/extra/builder/builder.factor
index caa381ba5d..9af79efb29 100755
--- a/extra/builder/builder.factor
+++ b/extra/builder/builder.factor
@@ -2,7 +2,7 @@
 USING: kernel io io.files io.launcher hashtables
        system continuations namespaces sequences splitting math.parser
        prettyprint tools.time calendar bake vars http.client
-       combinators bootstrap.image ;
+       combinators bootstrap.image bootstrap.image.download ;
 
 IN: builder
 
@@ -70,7 +70,6 @@ VAR: stamp
     "pull"
     "--no-summary"
     "git://factorcode.org/git/factor.git"
-    ! "http://dharmatech.onigirihouse.com/factor.git"
     "master"
   }
   run-process process-status
@@ -85,7 +84,7 @@ VAR: stamp
   {
     "git" "pull" "--no-summary"
     "http://dharmatech.onigirihouse.com/factor.git" "master"
-  } run-process process-status
+  } run-process drop
 
   "/builds/" stamp> append make-directory
   "/builds/" stamp> append cd
@@ -112,14 +111,15 @@ VAR: stamp
     "builder: vm compile" throw
   ] if
 
-  [ "http://factorcode.org/images/latest/" boot-image-name append download ]
+  [ my-arch download-image ]
+  [ ]
   [ "builder: image download" email-string ]
-  recover
+  cleanup
 
   `{
      { +arguments+ {
                      ,[ factor-binary ]
-                     ,[ "-i=" boot-image-name append ]
+                     ,[ "-i=" my-boot-image-name append ]
                      "-no-user-init"
                    } }
      { +stdout+   "../boot-log" }
diff --git a/extra/builder/test/test.factor b/extra/builder/test/test.factor
index 2a867b1fbc..c887c668e6 100644
--- a/extra/builder/test/test.factor
+++ b/extra/builder/test/test.factor
@@ -7,14 +7,6 @@ USING: kernel sequences assocs builder continuations vocabs vocabs.loader
 
 IN: builder.test
 
-! : do-load ( -- )
-!   [
-!     [ load-everything ]
-!     [ require-all-error-vocabs "../load-everything-log" log-object ]
-!     recover
-!   ]
-!   "../load-everything-time" log-runtime ;
-
 : do-load ( -- )
   [ try-everything ] "../load-everything-time" log-runtime
   dup empty?
@@ -22,22 +14,6 @@ IN: builder.test
     [ "../load-everything-log" log-object ]
   if ;
 
-! : do-tests ( -- )
-!   "" child-vocabs
-!   [ vocab-source-loaded? ] subset
-!   [ vocab-tests-path ] map
-!   [ dup [ ?resource-path exists? ] when ] subset
-!   [ dup run-test ] { } map>assoc
-!   [ second empty? not ] subset
-!   dup empty?
-!   [ drop ]
-!   [
-!     "../failing-tests" <file-writer>
-!       [ [ nl failures. ] assoc-each ]
-!     with-stream
-!   ]
-!   if ;
-
 : do-tests ( -- )
   run-all-tests keys
   dup empty?