From 9ffe013d0331c7619d7974f764ff126baeb1c9f0 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Fri, 7 Mar 2008 18:30:47 -0600
Subject: [PATCH] builder.*: lots of updates for the new language changes

---
 extra/builder/builder.factor   |  2 +-
 extra/builder/test/test.factor | 14 ++++++++------
 extra/builder/util/util.factor |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/extra/builder/builder.factor b/extra/builder/builder.factor
index 728e87f28d..747f0cd1e5 100644
--- a/extra/builder/builder.factor
+++ b/extra/builder/builder.factor
@@ -102,7 +102,7 @@ SYMBOL: build-status
 
   enter-build-dir
 
-  "report"
+  "report" utf8
     [
       "Build machine:   " write host-name print
       "CPU:             " write cpu       print
diff --git a/extra/builder/test/test.factor b/extra/builder/test/test.factor
index c664941132..d03be0781a 100644
--- a/extra/builder/test/test.factor
+++ b/extra/builder/test/test.factor
@@ -6,22 +6,24 @@ USING: kernel namespaces sequences assocs builder continuations
        prettyprint
        tools.browser
        tools.test
+       io.encodings.utf8
        bootstrap.stage2 benchmark builder.util ;
 
 IN: builder.test
 
 : do-load ( -- )
-  try-everything keys "../load-everything-vocabs" [ . ] with-file-writer ;
+  try-everything keys "../load-everything-vocabs" utf8 [ . ] with-file-writer ;
 
 : do-tests ( -- )
-  run-all-tests keys "../test-all-vocabs" [ . ] with-file-writer ;
+  run-all-tests keys "../test-all-vocabs" utf8 [ . ] with-file-writer ;
 
-: do-benchmarks ( -- ) run-benchmarks "../benchmarks" [ . ] with-file-writer ;
+: do-benchmarks ( -- )
+  run-benchmarks "../benchmarks" utf8 [ . ] with-file-writer ;
 
 : do-all ( -- )
-  bootstrap-time get   "../boot-time" [ . ] with-file-writer
-  [ do-load  ] runtime "../load-time" [ . ] with-file-writer
-  [ do-tests ] runtime "../test-time" [ . ] with-file-writer
+  bootstrap-time get   "../boot-time" utf8 [ . ] with-file-writer
+  [ do-load  ] runtime "../load-time" utf8 [ . ] with-file-writer
+  [ do-tests ] runtime "../test-time" utf8 [ . ] with-file-writer
   do-benchmarks ;
 
 MAIN: do-all
\ No newline at end of file
diff --git a/extra/builder/util/util.factor b/extra/builder/util/util.factor
index 50d74ddfc8..82514ca43d 100644
--- a/extra/builder/util/util.factor
+++ b/extra/builder/util/util.factor
@@ -70,7 +70,7 @@ DEFER: to-strings
 : milli-seconds>time ( n -- string )
   1000 /i 60 /mod >r 60 /mod r> 3array [ pad-00 ] map ":" join ;
 
-: eval-file ( file -- obj ) file-contents eval ;
+: eval-file ( file -- obj ) utf8 file-contents eval ;
 
 : cat ( file -- ) utf8 file-contents print ;