From e3c08f32ced112bc9b99a10f7c40a108cc61fa58 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@shill.local>
Date: Sun, 27 Feb 2011 13:55:43 -0800
Subject: [PATCH] bootstrap.{io, ui}: load dependencies to make deploy tool
 less error-prone

---
 basis/bootstrap/io/io.factor |  5 ++++-
 basis/bootstrap/ui/ui.factor | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/basis/bootstrap/io/io.factor b/basis/bootstrap/io/io.factor
index 5740d44431..45cd2a1ce2 100644
--- a/basis/bootstrap/io/io.factor
+++ b/basis/bootstrap/io/io.factor
@@ -2,7 +2,10 @@ USING: system vocabs vocabs.loader kernel combinators
 namespaces sequences io.backend accessors ;
 IN: bootstrap.io
 
-"bootstrap.compiler" vocab [
+"bootstrap.compiler" require
+"bootstrap.threads" require
+
+[
     "io.backend." {
         { [ "io-backend" get ] [ "io-backend" get ] }
         { [ os unix? ] [ "unix." os name>> append ] }
diff --git a/basis/bootstrap/ui/ui.factor b/basis/bootstrap/ui/ui.factor
index 271a99c223..0b39ea1866 100644
--- a/basis/bootstrap/ui/ui.factor
+++ b/basis/bootstrap/ui/ui.factor
@@ -2,12 +2,14 @@ USING: alien namespaces system combinators kernel sequences
 vocabs vocabs.loader ;
 IN: bootstrap.ui
 
-"bootstrap.compiler" vocab [
-    "ui-backend" get [
-        {
-            { [ os macosx? ] [ "cocoa" ] }
-            { [ os windows? ] [ "windows" ] }
-            { [ os unix? ] [ "x11" ] }
-        } cond
-    ] unless* "ui.backend." prepend require
-] when
+"bootstrap.math" require
+"bootstrap.compiler" require
+"bootstrap.threads" require
+
+"ui-backend" get [
+    {
+        { [ os macosx? ] [ "cocoa" ] }
+        { [ os windows? ] [ "windows" ] }
+        { [ os unix? ] [ "x11" ] }
+    } cond
+] unless* "ui.backend." prepend require