builder: more tweaks

extra/builder/builder.factor

@@ -11,28 +11,6 @@ IN: builder
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-SYMBOL: builder-recipients
-
-: tag-subject ( str -- str ) { "builder@" host-name* ": " , } bake to-string ;
-
-: target ( -- target ) { os [ cpu "." split ] } to-strings "-" join ;
-
-: factor-binary ( -- name )
-  os
-  { { "macosx" [ "./Factor.app/Contents/MacOS/factor" ] }
-    { "winnt"  [ "./factor-nt.exe" ] }
-    [ drop       "./factor" ] }
-  case ;
-
-: git-pull ( -- desc )
-  {
-    "git"
-    "pull"
-    "--no-summary"
-    "git://factorcode.org/git/factor.git"
-    "master"
-  } ;
-
 : git-clone ( -- desc ) { "git" "clone" "../factor" } ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -54,6 +32,10 @@ VAR: stamp
 
 : make-clean ( -- desc ) { "make" "clean" } ;
 
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: target ( -- target ) { os [ cpu "." split ] } to-strings "-" join ;
+
 : make-vm ( -- desc )
   <process*>
     { "make" target } to-strings >>arguments
@@ -61,6 +43,15 @@ VAR: stamp
     +stdout+                     >>stderr
   >desc ;
 
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: factor-binary ( -- name )
+  os
+  { { "macosx" [ "./Factor.app/Contents/MacOS/factor" ] }
+    { "winnt"  [ "./factor-nt.exe" ] }
+    [ drop       "./factor" ] }
+  case ;
+
 : bootstrap-cmd ( -- cmd )
   { factor-binary [ "-i=" my-boot-image-name append ] "-no-user-init" }
   to-strings ;
@@ -75,8 +66,6 @@ VAR: stamp
 
 : builder-test ( -- desc ) { factor-binary "-run=builder.test" } to-strings ;
   
-SYMBOL: build-status
-
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : (build) ( -- )
@@ -134,6 +123,12 @@ SYMBOL: build-status
 
   ] with-file-out ;
 
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+SYMBOL: builder-recipients
+
+: tag-subject ( str -- str ) { "builder@" host-name* ": " , } bake to-string ;
+
 : build ( -- )
   [ (build) ] [ drop ] recover
   <email>
@@ -145,6 +140,15 @@ SYMBOL: build-status
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
+: git-pull ( -- desc )
+  {
+    "git"
+    "pull"
+    "--no-summary"
+    "git://factorcode.org/git/factor.git"
+    "master"
+  } ;
+
 : updates-available? ( -- ? )
   git-id
   git-pull run-process drop

extra/builder/server/server.factor

@@ -41,28 +41,28 @@ IN: builder.server
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: build-server ( -- )
+! : build-server ( -- )
-  receive
+!   receive
-  {
+!   {
-    {
+!     {
-      "start"
+!       "start"
-      [
+!       [
-        build-status get "idle" =
+!         build-status get "idle" =
-        build-status get f      =
+!         build-status get f      =
-        or
+!         or
-        [
+!         [
-          [ [ build ] [ drop ] recover "idle" build-status set-global ]
+!           [ [ build ] [ drop ] recover "idle" build-status set-global ]
-          in-thread
+!           in-thread
-        ]
+!         ]
-        when
+!         when
-      ]
+!       ]
-    }
+!     }
 
-    {
+!     {
-      { ?from ?tag "status" }
+!       { ?from ?tag "status" }
-      [ `{ ?tag ,[ build-status get ] } ?from send ]
+!       [ `{ ?tag ,[ build-status get ] } ?from send ]
-    }
+!     }
-  }
+!   }
-  match-cond
+!   match-cond
-  build-server ;
+!   build-server ;