Tweak deploy descriptors

diff --git a/extra/bunny/deploy.factor b/extra/bunny/deploy.factor
index 2be82066aa65737f008a37bffb44f1a30f659b35..55ac991df197eb47b952710902dd2d5d74723a05 100755 (executable)
--- a/extra/bunny/deploy.factor
+++ b/extra/bunny/deploy.factor
@@ -1,15 +1,15 @@
 USING: tools.deploy.config ;
 H{
+    { deploy-io 3 }
+    { deploy-word-defs? f }
     { deploy-reflection 1 }
-    { deploy-math? t }
-    { deploy-ui? t }
-    { deploy-name "Bunny" }
     { deploy-compiler? t }
-    { deploy-threads? t }
-    { deploy-word-defs? f }
-    { deploy-c-types? f }
-    { deploy-io 3 }
-    { "stop-after-last-window?" t }
     { deploy-random? f }
+    { deploy-c-types? f }
+    { deploy-name "Bunny" }
     { deploy-word-props? f }
+    { deploy-threads? t }
+    { "stop-after-last-window?" t }
+    { deploy-ui? t }
+    { deploy-math? t }
 }

diff --git a/extra/sudoku/deploy.factor b/extra/sudoku/deploy.factor
index ba1ac1a32a69372ae47c15658a12c0b35cfbd5f1..3d9101b19e4ffbe9b18c74f5f057d6bb59736d89 100755 (executable)
--- a/extra/sudoku/deploy.factor
+++ b/extra/sudoku/deploy.factor
@@ -5,7 +5,7 @@ H{
     { deploy-name "Sudoku" }
     { deploy-threads? f }
     { deploy-compiler? t }
-    { deploy-math? f }
+    { deploy-math? t }
     { deploy-c-types? f }
     { deploy-io 2 }
     { deploy-reflection 1 }

diff --git a/extra/tools/deploy/deploy-tests.factor b/extra/tools/deploy/deploy-tests.factor
index cbc4f4e5ac93cb6e2a7942722e67e3f4a11ffec3..86691e89a0263170375639c46e54eac756024ce5 100755 (executable)
--- a/extra/tools/deploy/deploy-tests.factor
+++ b/extra/tools/deploy/deploy-tests.factor
@@ -63,13 +63,16 @@ namespaces continuations layouts accessors ;
     ] curry unit-test\r
 ] each\r
 \r
-USING: http.client furnace.actions http.server http.server.dispatchers\r
+USING: http.client http.server http.server.dispatchers\r
 http.server.responses http.server.static io.servers.connection ;\r
 \r
-: add-quit-action\r
-    <action>\r
-        [ stop-server "Goodbye" "text/html" <content> ] >>display\r
-    "quit" add-responder ;\r
+SINGLETON: quit-responder\r
+\r
+M: quit-responder call-responder*\r
+    2drop stop-server "Goodbye" "text/html" <content> ;\r
+\r
+: add-quot-responder ( responder -- responder )\r
+    quit-responder "quit" add-responder ;\r
 \r
 : test-httpd ( -- )\r
     #! Return as soon as server is running.\r
@@ -81,7 +84,7 @@ http.server.responses http.server.static io.servers.connection ;
 [ ] [\r
     [\r
         <dispatcher>\r
-            add-quit-action\r
+            add-quot-responder\r
             "resource:extra/http/test" <static> >>default\r
         main-responder set\r
 \r

diff --git a/extra/tools/deploy/test/4/deploy.factor b/extra/tools/deploy/test/4/deploy.factor
index 894d6aa62e678e548217b2e09427c8b84f0299b0..65ead56e2bc7dfc343d5563a4a09fe1f99d571bc 100644 (file)
--- a/extra/tools/deploy/test/4/deploy.factor
+++ b/extra/tools/deploy/test/4/deploy.factor
@@ -1,6 +1,6 @@
 USING: tools.deploy.config ;
 H{
-    { deploy-math? f }
+    { deploy-math? t }
     { deploy-reflection 1 }
     { deploy-io 2 }
     { deploy-c-types? f }

diff --git a/extra/tools/deploy/test/5/deploy.factor b/extra/tools/deploy/test/5/deploy.factor
index 87536457b03be386a2797f7129876a00965be4ee..bb4580b7aec2d87a3ce1e00260dff3237eac8232 100644 (file)
--- a/extra/tools/deploy/test/5/deploy.factor
+++ b/extra/tools/deploy/test/5/deploy.factor
@@ -1,10 +1,10 @@
 USING: tools.deploy.config ;
 H{
     { deploy-math? t }
-    { deploy-reflection 2 }
+    { deploy-reflection 1 }
     { deploy-io 3 }
     { deploy-c-types? f }
-    { deploy-random? t }
+    { deploy-random? f }
     { deploy-ui? f }
     { deploy-name "tools.deploy.test.5" }
     { deploy-word-defs? f }