mason: rename some vague words like build to do-build, build? to

should-build? for clarity and because they're too generic and conflict
with kernel:build.

diff --git a/extra/mason/build/build.factor b/extra/mason/build/build.factor
index efab07b01d956dd804a52a6eedb8940d5b45e5f4..567075498bf0834d1721a82bd66aa00e85903222 100644 (file)
--- a/extra/mason/build/build.factor
+++ b/extra/mason/build/build.factor
@@ -36,7 +36,7 @@ IN: mason.build
     copy-image
     save-git-id ;
 
-: build ( -- )
+: do-build ( -- )
     create-build-dir
     enter-build-dir
     [
@@ -51,4 +51,4 @@ IN: mason.build
     ] [ cleanup-build ] [ ] cleanup
     notify-idle ;
 
-MAIN: build
+MAIN: do-build

diff --git a/extra/mason/mason.factor b/extra/mason/mason.factor
index 35ac85d30d3da26a5050c4a0f7029850dd50ef73..46fe13a8b4c083a658518cb560c016d50a207de2 100755 (executable)
--- a/extra/mason/mason.factor
+++ b/extra/mason/mason.factor
@@ -1,10 +1,9 @@
 ! Copyright (C) 2008, 2010 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors calendar continuations debugger io
-io.directories io.sockets io.streams.string kernel mason.config
-mason.disk mason.email mason.notify mason.updates namespaces
-prettyprint threads ;
-FROM: mason.build => build ;
+io.directories io.sockets io.streams.string kernel mason.build
+mason.config mason.disk mason.email mason.notify mason.updates
+namespaces prettyprint threads ;
 IN: mason
 
 : heartbeat-loop ( -- )
@@ -29,7 +28,7 @@ IN: mason
         builds-dir get [
             check-disk-space
             update-sources
-            build? [ build ] [ 5 minutes sleep ] if
+            should-build? [ do-build ] [ 5 minutes sleep ] if
         ] with-directory
     ] [
         error-continuation get call>> build-loop-error
@@ -38,9 +37,9 @@ IN: mason
 
     build-loop ;
 
-: mason ( -- )
+: run-mason ( -- )
     [ heartbeat-loop ] "Heartbeat loop" spawn
     [ build-loop ] "Build loop" spawn
     stop ;
 
-MAIN: mason
+MAIN: run-mason

diff --git a/extra/mason/updates/updates.factor b/extra/mason/updates/updates.factor
index 01b9d9a5c36610a03699b0a665d095ebc38b3e02..4b1e506d129f5cb324a78f33bdc038cb5d5746b6 100644 (file)
--- a/extra/mason/updates/updates.factor
+++ b/extra/mason/updates/updates.factor
@@ -27,7 +27,7 @@ SYMBOLS: latest-sources last-built-sources ;
     git-pull latest-boot-image latest-counter <sources>
     latest-sources set-global ;
 
-: build? ( -- ? )
+: should-build? ( -- ? )
     latest-sources get-global last-built-sources get-global = not ;
 
 : finish-build ( -- )