mason: cleanup usings and misc stuff.

diff --git a/extra/mason/build/build.factor b/extra/mason/build/build.factor
index 03c5decc333f70b9705730be855f345da5c10f66..efab07b01d956dd804a52a6eedb8940d5b45e5f4 100644 (file)
--- a/extra/mason/build/build.factor
+++ b/extra/mason/build/build.factor
@@ -1,11 +1,9 @@
 ! Copyright (C) 2008, 2011 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays kernel calendar io.directories io.encodings.utf8
-io.files io.launcher io.pathnames namespaces prettyprint
-combinators sequences mason.child mason.cleanup mason.common mason.config
-mason.docs mason.release mason.report mason.email mason.git
-mason.notify mason.platform mason.updates ;
-QUALIFIED: continuations
+USING: arrays calendar combinators continuations io.directories
+io.pathnames kernel mason.child mason.cleanup mason.common
+mason.config mason.docs mason.git mason.notify mason.platform
+mason.release mason.updates namespaces sequences ;
 IN: mason.build
 
 : create-build-dir ( -- )
@@ -22,7 +20,7 @@ IN: mason.build
     short-running-process ;
 
 : copy-image ( -- )
-    builds-dir get boot-image-name append-path
+    builds-dir get target-boot-image-name append-path
     [ "." copy-file-into ] [ "factor" copy-file-into ] bi ;
 
 : save-git-id ( -- )
@@ -50,7 +48,7 @@ IN: mason.build
         ] bi
         notify-finish
         finish-build
-    ] [ cleanup ] [ ] continuations:cleanup
+    ] [ cleanup-build ] [ ] cleanup
     notify-idle ;
 
 MAIN: build

diff --git a/extra/mason/child/child.factor b/extra/mason/child/child.factor
index f8730aa3c0de689b37766e070c4a4b78573ce0de..984b7baaf7619833fe9690ef569856666b35ea78 100644 (file)
--- a/extra/mason/child/child.factor
+++ b/extra/mason/child/child.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2008, 2011 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays calendar combinators.short-circuit fry
-continuations debugger io.directories io.files io.launcher
-io.pathnames io.encodings.ascii kernel make mason.common
-mason.config mason.platform mason.report mason.notify namespaces
-sequences quotations macros system combinators splitting ;
+USING: accessors arrays calendar combinators
+combinators.short-circuit continuations fry io.directories
+io.launcher kernel macros make mason.config mason.notify
+mason.platform mason.report namespaces quotations sequences
+splitting system ;
 IN: mason.child
 
 : nmake-cmd ( -- args )
@@ -38,7 +38,7 @@ IN: mason.child
 : boot-cmd ( -- cmd )
     [
         factor-vm ,
-        "-i=" boot-image-name append ,
+        "-i=" target-boot-image-name append ,
         "-no-user-init" ,
         boot-flags get %
     ] { } make ;

diff --git a/extra/mason/cleanup/cleanup.factor b/extra/mason/cleanup/cleanup.factor
index 6dd9e4c5e39569d2755c31ac74c24820d8dd0736..765a1a23a210fa97d867583ce456089ec82c3261 100644 (file)
--- a/extra/mason/cleanup/cleanup.factor
+++ b/extra/mason/cleanup/cleanup.factor
@@ -1,20 +1,21 @@
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays continuations io.directories
-io.directories.hierarchy io.files io.launcher kernel
-mason.common mason.config mason.platform namespaces ;
+USING: arrays io.directories io.directories.hierarchy io.files
+kernel mason.common mason.config mason.platform namespaces ;
 IN: mason.cleanup
 
 : compress ( filename -- )
-    dup exists? [ "bzip2" swap 2array short-running-process ] [ drop ] if ;
+    dup exists? [
+        "bzip2" swap 2array short-running-process
+    ] [ drop ] if ;
 
 : compress-image ( -- )
-    boot-image-name compress ;
+    target-boot-image-name compress ;
 
 : compress-test-log ( -- )
     "test-log" compress ;
 
-: cleanup ( -- )
+: cleanup-build ( -- )
     builder-debug get [
         build-dir [
             compress-image

diff --git a/extra/mason/common/common.factor b/extra/mason/common/common.factor
index 80d89182c29bb9ca97b15fe313fadd98afa49d01..d01dff72d5222d49f4e13054fe516eb1dd700fff 100644 (file)
--- a/extra/mason/common/common.factor
+++ b/extra/mason/common/common.factor
@@ -1,11 +1,10 @@
 ! Copyright (C) 2008, 2011 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel namespaces sequences splitting system accessors
-math.functions make io io.files io.pathnames io.directories
-io.directories.hierarchy io.launcher io.encodings.utf8 prettyprint
-combinators.short-circuit parser combinators math calendar
-calendar.format arrays mason.config locals debugger fry
-continuations strings io.sockets prettyprint.config ;
+USING: accessors arrays calendar calendar.format combinators
+continuations fry io io.encodings.utf8 io.files io.launcher
+io.pathnames io.sockets kernel locals make mason.config math
+namespaces parser prettyprint prettyprint.config sequences
+splitting ;
 IN: mason.common
 
 : print-timestamp ( string -- )

diff --git a/extra/mason/config/config.factor b/extra/mason/config/config.factor
index 2442d0054b4ce480e78f1a00cea99fb2963b5352..04adaaf0e9db8b5116c69b7190091bac1e4a3f4b 100644 (file)
--- a/extra/mason/config/config.factor
+++ b/extra/mason/config/config.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2008, 2011 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: calendar system io.files io.pathnames namespaces kernel
-accessors assocs ;
+USING: calendar io.pathnames kernel namespaces system ;
 IN: mason.config
 
 ! (Optional) Location for build directories

diff --git a/extra/mason/disk/disk.factor b/extra/mason/disk/disk.factor
index ca4a703aaf733bd2b9be4807b8ce1867ffb919ac..816ee3ea68fffbf86efcd9d9e147305458a9741a 100644 (file)
--- a/extra/mason/disk/disk.factor
+++ b/extra/mason/disk/disk.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors io.files.info io.pathnames kernel math
-math.parser namespaces sequences mason.config ;
+USING: accessors io.files.info io.pathnames kernel mason.config
+math math.parser namespaces sequences ;
 IN: mason.disk
 
 : gb ( -- n ) 30 2^ ; inline

diff --git a/extra/mason/docs/docs.factor b/extra/mason/docs/docs.factor
index a6cc241c580360267ff4aa2ab315ca69051e1e4d..5be8e34c8c793a326cfd3f79b0565a208b0f7094 100644 (file)
--- a/extra/mason/docs/docs.factor
+++ b/extra/mason/docs/docs.factor
@@ -1,10 +1,7 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-
-USING: arrays hashtables help.html http.client io.directories
-io.files io.files.temp io.launcher io.pathnames kernel make
+USING: hashtables http.client io.files.temp io.pathnames kernel
 mason.common mason.config namespaces sequences ;
-
 IN: mason.docs
 
 : make-docs-archive ( -- )

diff --git a/extra/mason/email/email.factor b/extra/mason/email/email.factor
index d5ebb4bdc2d88da022af1e66e81bb69834838692..ad9ecc570efa26c146253e23b1e23ea85d47ff0a 100644 (file)
--- a/extra/mason/email/email.factor
+++ b/extra/mason/email/email.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2008, 2010 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors calendar combinators continuations debugger fry
-io io.encodings.utf8 io.files io.sockets kernel make
-mason.common mason.config mason.platform math.order namespaces
-prettyprint sequences smtp ;
+io kernel make mason.common mason.config mason.platform
+math.order namespaces sequences smtp ;
 IN: mason.email
 
 : mason-email ( body content-type subject -- )

diff --git a/extra/mason/git/git.factor b/extra/mason/git/git.factor
index de83f8b094bc8927b07577771f8db89eb9f81c7c..71a71b6ccbf4fe3595262981f65bda5c9970eada 100644 (file)
--- a/extra/mason/git/git.factor
+++ b/extra/mason/git/git.factor
@@ -1,9 +1,10 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors combinators.short-circuit continuations
-debugger io io.directories io.encodings.utf8 io.files
-io.launcher io.sockets io.streams.string kernel mason.common
-mason.email sequences splitting io.directories.hierarchy ;
+debugger io io.directories io.directories.hierarchy
+io.encodings.utf8 io.files io.launcher io.sockets
+io.streams.string kernel mason.common mason.email sequences
+splitting ;
 IN: mason.git
 
 : git-id ( -- id )

diff --git a/extra/mason/mason.factor b/extra/mason/mason.factor
index fb7e5097d4e8ee7c8084b38a37d22c0206fc7be0..35ac85d30d3da26a5050c4a0f7029850dd50ef73 100755 (executable)
--- a/extra/mason/mason.factor
+++ b/extra/mason/mason.factor
@@ -1,9 +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.pathnames io.sockets io.streams.string kernel
-mason.config mason.disk mason.email mason.notify mason.updates
-namespaces prettyprint threads ;
+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 ;
 IN: mason
 

diff --git a/extra/mason/notify/notify.factor b/extra/mason/notify/notify.factor
index 7cedb2d52ea9c2798a7f9d83ad42a14afdb0e071..0c6ac5a4b755aa7189a14e4b4022f556b007acbd 100644 (file)
--- a/extra/mason/notify/notify.factor
+++ b/extra/mason/notify/notify.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2009, 2011 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors fry http.client io io.encodings.utf8 io.files
-kernel mason.common mason.config mason.email mason.twitter
-namespaces prettyprint sequences debugger continuations make ;
+USING: accessors continuations debugger fry http.client io
+io.encodings.utf8 io.files kernel make mason.common mason.config
+mason.email mason.twitter namespaces sequences ;
 IN: mason.notify
 
 : status-notify? ( -- ? )

diff --git a/extra/mason/platform/platform.factor b/extra/mason/platform/platform.factor
index 6dd5dc88cef54c813a1740e78b136ac6b811a22d..e6b2e881c59ec28265f5b67e6273c4b2e92d7027 100644 (file)
--- a/extra/mason/platform/platform.factor
+++ b/extra/mason/platform/platform.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008, 2011 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel system accessors namespaces splitting sequences
-mason.config bootstrap.image assocs ;
+USING: accessors assocs bootstrap.image kernel mason.config
+namespaces sequences ;
 IN: mason.platform
 
 : (platform) ( os cpu -- string )
@@ -14,8 +14,8 @@ IN: mason.platform
 : gnu-make ( -- string )
     "make" ;
 
-: boot-image-arch ( -- string )
+: target-arch ( -- arch )
     target-os get target-cpu get arch ;
 
-: boot-image-name ( -- string )
-    boot-image-arch "boot." ".image" surround ;
+: target-boot-image-name ( -- string )
+    target-arch boot-image-name ;

diff --git a/extra/mason/release/archive/archive.factor b/extra/mason/release/archive/archive.factor
index ef67a9faebb7ec14a53808316d25142790778e7a..464a64ef2892b2124908d2b4bcc26e77cb981567 100644 (file)
--- a/extra/mason/release/archive/archive.factor
+++ b/extra/mason/release/archive/archive.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays combinators locals io.directories
-io.directories.hierarchy io.files io.launcher io.pathnames
-kernel make mason.common mason.config mason.platform namespaces
-prettyprint sequences system words ;
+USING: accessors combinators io.directories
+io.directories.hierarchy io.pathnames kernel locals make
+mason.common mason.config mason.platform namespaces sequences
+system words ;
 IN: mason.release.archive
 
 : base-name ( -- string )
@@ -17,13 +17,20 @@ IN: mason.release.archive
         [ drop ".tar.gz" ]
     } case ;
 
-: archive-name ( -- string ) base-name target-os get extension append ;
+: archive-name ( -- string )
+    base-name target-os get extension append ;
 
 :: make-windows-archive ( archive-name -- )
     { "zip" "-r" archive-name "factor" } short-running-process ;
 
 :: make-disk-image ( archive-name volume-name dmg-root -- )
-    { "hdiutil" "create" "-srcfolder" dmg-root "-fs" "HFS+" "-volname" volume-name archive-name } short-running-process ;
+    {
+        "hdiutil" "create"
+        "-srcfolder" dmg-root
+        "-fs" "HFS+"
+        "-volname" volume-name
+        archive-name
+    } short-running-process ;
 
 : make-macosx-archive ( archive-name -- )
     "dmg-root" make-directory

diff --git a/extra/mason/release/branch/branch.factor b/extra/mason/release/branch/branch.factor
index 9f7a413f31bcb782c16c75334ddf6de38a2af6cd..8c50fde0186f1f121ff4bf0a28c8a1138a285d2c 100644 (file)
--- a/extra/mason/release/branch/branch.factor
+++ b/extra/mason/release/branch/branch.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2008, 2010 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: io.directories io.files io.launcher kernel make
-namespaces prettyprint sequences mason.common mason.config
-mason.platform ;
+USING: io.directories kernel make mason.common mason.config
+mason.platform namespaces sequences ;
 IN: mason.release.branch
 
 : branch-name ( -- string ) "clean-" platform append ;
@@ -26,7 +25,7 @@ IN: mason.release.branch
 : upload-clean-image-cmd ( -- args )
     [
         scp-command get ,
-        boot-image-name ,
+        target-boot-image-name ,
         [
             image-username get % "@" %
             image-host get % ":" %

diff --git a/extra/mason/release/release.factor b/extra/mason/release/release.factor
index a593f000f38ca516678ad0786f20288a7edf605b..8a457cb2454b13db946af4ad4abd9b8dc4efd90b 100644 (file)
--- a/extra/mason/release/release.factor
+++ b/extra/mason/release/release.factor
@@ -1,9 +1,7 @@
 ! Copyright (C) 2008, 2009 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel debugger namespaces sequences splitting
-combinators io io.files io.launcher prettyprint bootstrap.image
-mason.common mason.release.branch mason.release.tidy
-mason.release.archive mason.release.upload mason.notify ;
+USING: combinators mason.notify mason.release.archive
+mason.release.branch mason.release.tidy mason.release.upload ;
 IN: mason.release
 
 : release ( -- )
@@ -14,4 +12,4 @@ IN: mason.release
         [ upload ]
         [ save-archive ]
         [ notify-release ]
-    } cleave ;
\ No newline at end of file
+    } cleave ;

diff --git a/extra/mason/release/tidy/tidy.factor b/extra/mason/release/tidy/tidy.factor
index 29f01d7d92a7181d770e099cb4e86966b6405b8d..ba9e6be76d444e267a352d2891cdc45d18341fdd 100644 (file)
--- a/extra/mason/release/tidy/tidy.factor
+++ b/extra/mason/release/tidy/tidy.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2008, 2011 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: bootstrap.image io.directories io.directories.hierarchy
-io.encodings.ascii io.files kernel mason.common namespaces
-sequences system ;
+io.encodings.ascii io.files kernel namespaces sequences system ;
 FROM: mason.config => target-os ;
 IN: mason.release.tidy
 

diff --git a/extra/mason/release/upload/upload.factor b/extra/mason/release/upload/upload.factor
index 8058c8f561018b06b44d9a2d15dd2b96254396ad..8c2411bd1551d04ec296870042f9a9dccb30105a 100644 (file)
--- a/extra/mason/release/upload/upload.factor
+++ b/extra/mason/release/upload/upload.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2008, 2011 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel namespaces make sequences arrays io io.files
-io.launcher mason.common mason.platform
-mason.release.archive mason.config ;
+USING: kernel mason.common mason.config mason.platform
+namespaces sequences ;
 IN: mason.release.upload
 
 : remote-location ( -- dest )

diff --git a/extra/mason/report/report.factor b/extra/mason/report/report.factor
index 4c24906fa8136a444a135105d501a4106c28ef71..2836c16f8e9802de761ecdab97251309207eda30 100644 (file)
--- a/extra/mason/report/report.factor
+++ b/extra/mason/report/report.factor
@@ -1,10 +1,9 @@
 ! Copyright (C) 2008, 2010 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: benchmark combinators.smart debugger fry io assocs
-io.encodings.utf8 io.files io.sockets io.streams.string kernel
-locals mason.common mason.config mason.disk mason.platform math
-namespaces prettyprint sequences xml.syntax xml.writer
-combinators.short-circuit literals splitting ;
+USING: assocs combinators.smart debugger fry io.encodings.utf8
+io.files io.streams.string kernel literals locals mason.common
+mason.config mason.disk math namespaces sequences xml.syntax
+xml.writer ;
 IN: mason.report
 
 : git-link ( id -- link )

diff --git a/extra/mason/twitter/twitter.factor b/extra/mason/twitter/twitter.factor
index 5acd646ecca2add9286024bff9f64fef7ff132aa..29d554d4d8bcd34cdadbbb4be44bd6fe70c5dd8b 100644 (file)
--- a/extra/mason/twitter/twitter.factor
+++ b/extra/mason/twitter/twitter.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: debugger fry kernel mason.config namespaces twitter ;
+USING: debugger fry kernel namespaces twitter ;
 IN: mason.twitter
 
 : mason-tweet ( message -- )
-    twitter-access-token get [ '[ _ tweet ] try ] [ drop ] if ;
\ No newline at end of file
+    twitter-access-token get [ '[ _ tweet ] try ] [ drop ] if ;

diff --git a/extra/mason/updates/updates.factor b/extra/mason/updates/updates.factor
index 016c1a6d7974da4fa87aa844d0f308e2c5be7271..01b9d9a5c36610a03699b0a665d095ebc38b3e02 100644 (file)
--- a/extra/mason/updates/updates.factor
+++ b/extra/mason/updates/updates.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2008, 2010 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: bootstrap.image.download http.client init kernel
-math.parser namespaces mason.config mason.common mason.git
-mason.platform ;
+mason.config mason.git mason.platform math.parser namespaces ;
 IN: mason.updates
 
 TUPLE: sources git-id boot-image counter ;
@@ -17,7 +16,7 @@ SYMBOLS: latest-sources last-built-sources ;
 ] "mason.updates" add-startup-hook
 
 : latest-boot-image ( -- boot-image )
-    boot-image-name
+    target-boot-image-name
     [ maybe-download-image drop ] [ file-checksum ] bi ;
 
 : latest-counter ( -- counter )