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.
db4
Doug Coleman 2015-06-06 17:04:30 -07:00
parent 37e7349dee
commit 5c22650960
3 changed files with 9 additions and 10 deletions

View File

@ -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

View File

@ -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

View File

@ -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 ( -- )