Deploy tool always uses optimizing compiler now

diff --git a/basis/none/deploy.factor b/basis/none/deploy.factor
index f604beab3f8a87430f5e632513f7deb9dac03192..06cc8c6a20e456eed75521b92f18c9b7944fec8b 100644 (file)
--- a/basis/none/deploy.factor
+++ b/basis/none/deploy.factor
@@ -6,7 +6,6 @@ H{
     { deploy-name "none" }
     { "stop-after-last-window?" t }
     { deploy-c-types? f }
-    { deploy-compiler? f }
     { deploy-io 1 }
     { deploy-ui? f }
     { deploy-reflection 1 }

diff --git a/basis/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor
index b74548a65f3346a0478c5e6c18a26206b9bc5e0e..ba822769272f302e4143ffb6cb6cb971cefbf787 100755 (executable)
--- a/basis/tools/deploy/backend/backend.factor
+++ b/basis/tools/deploy/backend/backend.factor
@@ -43,14 +43,14 @@ CONSTANT: theme-path "basis/ui/gadgets/theme/"
     [ my-arch make-image ] unless ;
 
 : bootstrap-profile ( -- profile )
-    {
-        { "math"     deploy-math?     }
-        { "compiler" deploy-compiler? }
-        { "threads"  deploy-threads?  }
-        { "ui"       deploy-ui?       }
-        { "unicode"  deploy-unicode?  }
-    } [ nip get ] assoc-filter keys
-    native-io? [ "io" suffix ] when ;
+    [
+        deploy-math? get [ "math" , ] when
+        deploy-threads? get [ "threads" , ] when
+        "compiler" ,
+        deploy-ui? get [ "ui" , ] when
+        deploy-unicode? get [ "unicode" , ] when
+        native-io? [ "io" , ] when
+    ] { } make ;
 
 : staging-image-name ( profile -- name )
     "staging."

diff --git a/basis/tools/deploy/config/config-docs.factor b/basis/tools/deploy/config/config-docs.factor
index c8249e4e41c89522eedd5473fc38bc8b4e5bd805..bd612c644a9a59f3e46447fb18d20a76f7d782c5 100644 (file)
--- a/basis/tools/deploy/config/config-docs.factor
+++ b/basis/tools/deploy/config/config-docs.factor
@@ -5,7 +5,6 @@ IN: tools.deploy.config
 ARTICLE: "deploy-flags" "Deployment flags"
 "There are two sets of deployment flags. The first set controls the major subsystems which are to be included in the deployment image:"
 { $subsection deploy-math?     }
-{ $subsection deploy-compiler? }
 { $subsection deploy-unicode?   }
 { $subsection deploy-threads?  }
 { $subsection deploy-ui?       }
@@ -53,11 +52,6 @@ HELP: deploy-math?
 $nl
 "On by default. Often the programmer will use rationals without realizing it. A small amount of space can be saved by stripping these features out, but some code may require changes to work properly." } ;
 
-HELP: deploy-compiler?
-{ $description "Deploy flag. If set, words in the deployed image will be compiled with the optimizing compiler when possible."
-$nl
-"On by default. Most programs should be compiled, not only for performance but because features which depend on the C library interface only function after compilation." } ;
-
 HELP: deploy-unicode?
 { $description "Deploy flag. If set, full Unicode " { $link POSTPONE: CHAR: } " syntax is included."
 $nl

diff --git a/basis/tools/deploy/config/config.factor b/basis/tools/deploy/config/config.factor
index 63c8393b51ff2c8099a067a2969a9272c22fa5b9..89d1fe3821d90db514065c507cebbdc41fcb8c7f 100644 (file)
--- a/basis/tools/deploy/config/config.factor
+++ b/basis/tools/deploy/config/config.factor
@@ -7,7 +7,6 @@ IN: tools.deploy.config
 SYMBOL: deploy-name
 
 SYMBOL: deploy-ui?
-SYMBOL: deploy-compiler?
 SYMBOL: deploy-math?
 SYMBOL: deploy-unicode?
 SYMBOL: deploy-threads?
@@ -55,7 +54,6 @@ SYMBOL: deploy-image
         { deploy-ui?                f }
         { deploy-io                 2 }
         { deploy-reflection         1 }
-        { deploy-compiler?          t }
         { deploy-threads?           t }
         { deploy-unicode?           f }
         { deploy-math?              t }

diff --git a/basis/tools/deploy/deploy-tests.factor b/basis/tools/deploy/deploy-tests.factor
index 1c12e8b781285afa970ff34f4a41ad4a61f159c2..842faba6402af1345b35e5d560d1a947a745d01e 100644 (file)
--- a/basis/tools/deploy/deploy-tests.factor
+++ b/basis/tools/deploy/deploy-tests.factor
@@ -11,7 +11,7 @@ io.directories tools.deploy.test ;
 \r
 [ t ] [ "hello-ui" shake-and-bake 1300000 small-enough? ] unit-test\r
 \r
-[ "staging.math-compiler-threads-ui-strip.image" ] [\r
+[ "staging.math-threads-compiler-ui-strip.image" ] [\r
     "hello-ui" deploy-config\r
     [ bootstrap-profile staging-image-name file-name ] bind\r
 ] unit-test\r
@@ -88,7 +88,6 @@ M: quit-responder call-responder*
 {\r
     "tools.deploy.test.6"\r
     "tools.deploy.test.7"\r
-    "tools.deploy.test.8"\r
     "tools.deploy.test.9"\r
     "tools.deploy.test.10"\r
     "tools.deploy.test.11"\r

diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index 7bbc726d309df98c497b64dced5bba746430fc78..d79326ddc461937146ace83d166fff437b00187c 100755 (executable)
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -337,16 +337,17 @@ IN: tools.deploy.shaker
     [ instances dup H{ } clone [ [ ] cache ] curry map ] dip call
     become ; inline
 
+: compress-object? ( obj -- ? )
+    {
+        { [ dup array? ] [ empty? ] }
+        { [ dup byte-array? ] [ drop t ] }
+        { [ dup string? ] [ drop t ] }
+        { [ dup wrapper? ] [ drop t ] }
+        [ drop f ]
+    } cond ;
+
 : compress-objects ( -- )
-    [
-        {
-            [ dup array? [ empty? ] [ drop f ] if ]
-            [ byte-array? ]
-            [ string? ]
-            [ wrapper? ]
-        } cleave
-        or or or
-    ] [ ] "objects" compress ;
+    [ compress-object? ] [ ] "objects" compress ;
 
 : remain-compiled ( old new -- old new )
     #! Quotations which were formerly compiled must remain

diff --git a/basis/tools/deploy/test/1/deploy.factor b/basis/tools/deploy/test/1/deploy.factor
index 6d6a1c1bd362939bf5cd5158f10698dd87b64059..509024a5c39aca5e15cc8d1b2fd3f4aece5a61a7 100644 (file)
--- a/basis/tools/deploy/test/1/deploy.factor
+++ b/basis/tools/deploy/test/1/deploy.factor
@@ -8,7 +8,6 @@ H{
     { deploy-math? t }
     { deploy-io 2 }
     { deploy-name "tools.deploy.test.1" }
-    { deploy-compiler? t }
     { deploy-reflection 1 }
     { "stop-after-last-window?" t }
 }

diff --git a/basis/tools/deploy/test/10/deploy.factor b/basis/tools/deploy/test/10/deploy.factor
index 3f5940651df3e790801e5b850823c074864ba1b4..c42063f644f851de6787009ad6bba9ab400b5cdb 100644 (file)
--- a/basis/tools/deploy/test/10/deploy.factor
+++ b/basis/tools/deploy/test/10/deploy.factor
@@ -4,7 +4,6 @@ H{
     { deploy-unicode? f }
     { deploy-io 2 }
     { deploy-word-props? f }
-    { deploy-compiler? f }
     { deploy-threads? f }
     { deploy-word-defs? f }
     { "stop-after-last-window?" t }

diff --git a/basis/tools/deploy/test/11/deploy.factor b/basis/tools/deploy/test/11/deploy.factor
index 42f707b332a9ae275a2de2cfad9e7c608aa69d80..4828f70d905e87690177e8ea4137e47beaffb7df 100644 (file)
--- a/basis/tools/deploy/test/11/deploy.factor
+++ b/basis/tools/deploy/test/11/deploy.factor
@@ -9,7 +9,6 @@ H{
     { deploy-math? f }
     { deploy-unicode? f }
     { deploy-threads? f }
-    { deploy-compiler? f }
     { deploy-io 2 }
     { deploy-ui? f }
 }

diff --git a/basis/tools/deploy/test/12/deploy.factor b/basis/tools/deploy/test/12/deploy.factor
index 638e1ca0000f262e7465d8e058d1e9d0121e8018..a3aaa3bca242a078c3201a384cd1ba2cab1ef083 100644 (file)
--- a/basis/tools/deploy/test/12/deploy.factor
+++ b/basis/tools/deploy/test/12/deploy.factor
@@ -9,7 +9,6 @@ H{
     { deploy-io 2 }
     { deploy-ui? f }
     { deploy-name "tools.deploy.test.12" }
-    { deploy-compiler? f }
     { deploy-word-defs? f }
     { deploy-threads? f }
 }

diff --git a/basis/tools/deploy/test/13/deploy.factor b/basis/tools/deploy/test/13/deploy.factor
index 951319231152fd4490f23c8b12d66a2dace640b5..d175075c1431d3d100f1b54b07ed493839fe80bb 100644 (file)
--- a/basis/tools/deploy/test/13/deploy.factor
+++ b/basis/tools/deploy/test/13/deploy.factor
@@ -1,7 +1,6 @@
 USING: tools.deploy.config ;
 H{
     { deploy-threads? t }
-    { deploy-compiler? t }
     { deploy-math? t }
     { deploy-io 2 }
     { "stop-after-last-window?" t }

diff --git a/basis/tools/deploy/test/2/deploy.factor b/basis/tools/deploy/test/2/deploy.factor
index 1457769ce19a4bc44b1d1b8d0ca9a2846df148f1..10cd7a85d9361b530f129cf84c4b4de5e285de12 100644 (file)
--- a/basis/tools/deploy/test/2/deploy.factor
+++ b/basis/tools/deploy/test/2/deploy.factor
@@ -8,7 +8,6 @@ H{
     { deploy-math? t }
     { deploy-io 2 }
     { deploy-name "tools.deploy.test.2" }
-    { deploy-compiler? t }
     { deploy-reflection 1 }
     { "stop-after-last-window?" t }
 }

diff --git a/basis/tools/deploy/test/3/deploy.factor b/basis/tools/deploy/test/3/deploy.factor
index f3131237bfa4e7c739a0df95c9a1a4c9288e7f04..b72b00d1e4ab7a2228afbcdf523f4a5f1e11cc76 100644 (file)
--- a/basis/tools/deploy/test/3/deploy.factor
+++ b/basis/tools/deploy/test/3/deploy.factor
@@ -6,7 +6,6 @@ H{
     { "stop-after-last-window?" t }
     { deploy-word-defs? f }
     { deploy-reflection 1 }
-    { deploy-compiler? t }
     { deploy-threads? t }
     { deploy-io 3 }
     { deploy-math? t }

diff --git a/basis/tools/deploy/test/4/deploy.factor b/basis/tools/deploy/test/4/deploy.factor
index 981bbcf982739d4bb852a7d5ac78f0f0a8675157..b2f22055c4f8acfa2c8dea24b3fcf403bcbe632b 100644 (file)
--- a/basis/tools/deploy/test/4/deploy.factor
+++ b/basis/tools/deploy/test/4/deploy.factor
@@ -8,7 +8,6 @@ H{
     { deploy-math? t }
     { deploy-io 2 }
     { deploy-name "tools.deploy.test.4" }
-    { deploy-compiler? t }
     { deploy-reflection 1 }
     { "stop-after-last-window?" t }
 }

diff --git a/basis/tools/deploy/test/5/deploy.factor b/basis/tools/deploy/test/5/deploy.factor
index 22f50214975dbe99280fe29c2e5abc11c161cf14..3f9b7f15995be44007dbf86d4560e9356965755d 100644 (file)
--- a/basis/tools/deploy/test/5/deploy.factor
+++ b/basis/tools/deploy/test/5/deploy.factor
@@ -8,7 +8,6 @@ H{
     { deploy-math? t }
     { deploy-io 3 }
     { deploy-name "tools.deploy.test.5" }
-    { deploy-compiler? t }
     { deploy-reflection 1 }
     { "stop-after-last-window?" t }
 }

diff --git a/basis/tools/deploy/test/6/deploy.factor b/basis/tools/deploy/test/6/deploy.factor
index c474fcdadfada8b972ebdd04ac72024dde755128..b86bfdb31a9c8ad2b89dbf52731b69bfebd09260 100644 (file)
--- a/basis/tools/deploy/test/6/deploy.factor
+++ b/basis/tools/deploy/test/6/deploy.factor
@@ -5,7 +5,6 @@ H{
     { deploy-io 1 }
     { deploy-name "tools.deploy.test.6" }
     { deploy-math? t }
-    { deploy-compiler? t }
     { deploy-ui? f }
     { deploy-c-types? f }
     { deploy-word-defs? f }

diff --git a/basis/tools/deploy/test/7/deploy.factor b/basis/tools/deploy/test/7/deploy.factor
index bc374f1088981c373fc5328e969c649fcbd099a6..d1e93fc7c25962be383f5d87ee7aaf0204ed8895 100644 (file)
--- a/basis/tools/deploy/test/7/deploy.factor
+++ b/basis/tools/deploy/test/7/deploy.factor
@@ -6,7 +6,6 @@ H{
     { deploy-io 2 }
     { deploy-math? t }
     { "stop-after-last-window?" t }
-    { deploy-compiler? t }
     { deploy-unicode? f }
     { deploy-c-types? f }
     { deploy-reflection 1 }

diff --git a/basis/tools/deploy/test/8/8.factor b/basis/tools/deploy/test/8/8.factor
deleted file mode 100644 (file)
index c495928..0000000
--- a/basis/tools/deploy/test/8/8.factor
+++ /dev/null
@@ -1,11 +0,0 @@
-USING: kernel ;
-IN: tools.deploy.test.8
-
-: literal-merge-test-1 ( -- x ) H{ { "lil" "wayne" } } ;
-: literal-merge-test-2 ( -- x ) H{ { "lil" "wayne" } } ;
-
-: literal-merge-test ( -- )
-    literal-merge-test-1
-    literal-merge-test-2 eq? t assert= ;
-
-MAIN: literal-merge-test

diff --git a/basis/tools/deploy/test/8/deploy.factor b/basis/tools/deploy/test/8/deploy.factor
deleted file mode 100644 (file)
index 3bea1ed..0000000
--- a/basis/tools/deploy/test/8/deploy.factor
+++ /dev/null
@@ -1,15 +0,0 @@
-USING: tools.deploy.config ;
-H{
-    { deploy-name "tools.deploy.test.8" }
-    { deploy-c-types? f }
-    { deploy-word-props? f }
-    { deploy-ui? f }
-    { deploy-reflection 1 }
-    { deploy-compiler? f }
-    { deploy-unicode? f }
-    { deploy-io 1 }
-    { deploy-word-defs? f }
-    { deploy-threads? f }
-    { "stop-after-last-window?" t }
-    { deploy-math? f }
-}

diff --git a/basis/tools/deploy/test/9/deploy.factor b/basis/tools/deploy/test/9/deploy.factor
index 91b1da569751c17a6c2765cc4db6da7b52882c84..caddbe36d009482f056d8b777187a8f5d68d2932 100644 (file)
--- a/basis/tools/deploy/test/9/deploy.factor
+++ b/basis/tools/deploy/test/9/deploy.factor
@@ -6,7 +6,6 @@ H{
     { "stop-after-last-window?" t }
     { deploy-word-defs? f }
     { deploy-reflection 1 }
-    { deploy-compiler? t }
     { deploy-threads? f }
     { deploy-io 1 }
     { deploy-math? t }

diff --git a/basis/ui/tools/deploy/deploy.factor b/basis/ui/tools/deploy/deploy.factor
index 6a8322ac02fb9aded6b27a4c6bb782aa6bf9defa..d3c1278bf55bfe93cfa07d09a7e0f7376e114662 100644 (file)
--- a/basis/ui/tools/deploy/deploy.factor
+++ b/basis/ui/tools/deploy/deploy.factor
@@ -29,7 +29,6 @@ TUPLE: deploy-gadget < pack vocab settings ;
 
 : advanced-settings ( parent -- parent )
     "Advanced:" <label> add-gadget
-    deploy-compiler? get "Use optimizing compiler" <checkbox> add-gadget
     deploy-math? get "Rational and complex number support" <checkbox> add-gadget
     deploy-threads? get "Threading support" <checkbox> add-gadget
     deploy-unicode? get "Unicode character literal support" <checkbox> add-gadget

diff --git a/extra/4DNav/deploy.factor b/extra/4DNav/deploy.factor
index e39f91acf6e0f1b429ab7b4e7926e275550df74c..44481f49f9f596de76f55dfec7ad677b2aa2023e 100755 (executable)
--- a/extra/4DNav/deploy.factor
+++ b/extra/4DNav/deploy.factor
@@ -7,7 +7,6 @@ H{
     { deploy-math? t }
     { deploy-threads? t }
     { deploy-reflection 3 }
-    { deploy-compiler? t }
     { deploy-unicode? t }
     { deploy-io 3 }
     { "stop-after-last-window?" t }

diff --git a/extra/benchmark/fib6/deploy.factor b/extra/benchmark/fib6/deploy.factor
index 3a367dcd5176f672e6c699583b38613b33d2fec3..92adf90802a7887b23c2f7b5df42eb65ee917a39 100644 (file)
--- a/extra/benchmark/fib6/deploy.factor
+++ b/extra/benchmark/fib6/deploy.factor
@@ -6,7 +6,6 @@ H{
     { deploy-word-props? f }
     { deploy-ui? f }
     { deploy-io 1 }
-    { deploy-compiler? t }
     { deploy-reflection 1 }
     { "stop-after-last-window?" t }
     { deploy-unicode? f }

diff --git a/extra/benchmark/regex-dna/deploy.factor b/extra/benchmark/regex-dna/deploy.factor
index 91edab430e0ff21257bec1966e3e83df2d8133ac..5f9fddf1a8ab9fcef468d41807171a8c0233daf6 100644 (file)
--- a/extra/benchmark/regex-dna/deploy.factor
+++ b/extra/benchmark/regex-dna/deploy.factor
@@ -3,7 +3,6 @@ H{
     { deploy-word-defs? f }
     { deploy-word-props? f }
     { deploy-math? f }
-    { deploy-compiler? t }
     { deploy-ui? f }
     { deploy-c-types? f }
     { "stop-after-last-window?" t }

diff --git a/extra/bunny/deploy.factor b/extra/bunny/deploy.factor
index 0954c9ad4188b9dc222172b136c43b0c4373e115..7cf6a3ecbafdd147edd37d71750b00fca2b0e059 100755 (executable)
--- a/extra/bunny/deploy.factor
+++ b/extra/bunny/deploy.factor
@@ -3,7 +3,6 @@ H{
     { deploy-io 3 }
     { deploy-word-defs? f }
     { deploy-reflection 1 }
-    { deploy-compiler? t }
     { deploy-c-types? f }
     { deploy-name "Bunny" }
     { deploy-word-props? f }

diff --git a/extra/chicago-talk/deploy.factor b/extra/chicago-talk/deploy.factor
index 8f8adc18d88128a921703c94da8abd165e646c43..0ef255185187e2d5f5327a1aa166631ecb949505 100755 (executable)
--- a/extra/chicago-talk/deploy.factor
+++ b/extra/chicago-talk/deploy.factor
@@ -3,7 +3,6 @@ V{
     { deploy-ui? t }
     { deploy-io 1 }
     { deploy-reflection 1 }
-    { deploy-compiler? t }
     { deploy-math? t }
     { deploy-word-props? f }
     { deploy-c-types? f }

diff --git a/extra/color-picker/deploy.factor b/extra/color-picker/deploy.factor
index eeeb63dd7db86f61de4a72153f5b3d5f470a83d6..1c24d9eacbe5bfe235b32275a5e757b37231dceb 100755 (executable)
--- a/extra/color-picker/deploy.factor
+++ b/extra/color-picker/deploy.factor
@@ -7,7 +7,6 @@ H{
     { deploy-unicode? f }
     { deploy-c-types? f }
     { deploy-word-defs? f }
-    { deploy-compiler? t }
     { deploy-io 2 }
     { deploy-reflection 1 }
     { "stop-after-last-window?" t }

diff --git a/extra/drills/deployed/deploy.factor b/extra/drills/deployed/deploy.factor
index 2f629123600e90092f52d53886998ece27b3f158..eaa0d3bb6949fce87143fa6ca32b8838bcec21bb 100644 (file)
--- a/extra/drills/deployed/deploy.factor
+++ b/extra/drills/deployed/deploy.factor
@@ -5,7 +5,6 @@ H{
     { deploy-math? t }
     { deploy-name "drills" }
     { deploy-ui? t }
-    { deploy-compiler? t }
     { "stop-after-last-window?" t }
     { deploy-word-props? f }
     { deploy-c-types? f }

diff --git a/extra/gesture-logger/deploy.factor b/extra/gesture-logger/deploy.factor
index 0692feb30d0fb9cdd457c91203864411fcc12a9b..124e2f0437467122a351660115d8abdb760818a7 100755 (executable)
--- a/extra/gesture-logger/deploy.factor
+++ b/extra/gesture-logger/deploy.factor
@@ -3,7 +3,6 @@ V{
     { deploy-ui? t }
     { deploy-io 1 }
     { deploy-reflection 3 }
-    { deploy-compiler? t }
     { deploy-math? t }
     { deploy-word-props? f }
     { deploy-c-types? f }

diff --git a/extra/hello-ui/deploy.factor b/extra/hello-ui/deploy.factor
index 28ce8f519d32f1874cd665dfd8c65e3fd53d89a9..7fcc167cea3feb733b5334bec34330ee12bc6802 100644 (file)
--- a/extra/hello-ui/deploy.factor
+++ b/extra/hello-ui/deploy.factor
@@ -1,14 +1,14 @@
 USING: tools.deploy.config ;
 H{
-    { deploy-threads? t }
+    { deploy-ui? t }
+    { deploy-reflection 1 }
+    { deploy-unicode? f }
     { deploy-math? t }
-    { deploy-name "Hello world" }
+    { deploy-io 2 }
     { deploy-c-types? f }
+    { deploy-name "Hello world" }
     { deploy-word-props? f }
-    { deploy-io 2 }
-    { deploy-ui? t }
-    { "stop-after-last-window?" t }
     { deploy-word-defs? f }
-    { deploy-compiler? t }
-    { deploy-reflection 1 }
+    { "stop-after-last-window?" t }
+    { deploy-threads? t }
 }

diff --git a/extra/hello-unicode/deploy.factor b/extra/hello-unicode/deploy.factor
index f2f1c9fb189ae15826793f1ac5b211819c960351..106817aa5077251e1f84cb3dd3182b122177fa34 100644 (file)
--- a/extra/hello-unicode/deploy.factor
+++ b/extra/hello-unicode/deploy.factor
@@ -3,7 +3,6 @@ H{
     { deploy-word-defs? f }
     { deploy-reflection 1 }
     { deploy-word-props? f }
-    { deploy-compiler? t }
     { deploy-threads? t }
     { deploy-unicode? f }
     { "stop-after-last-window?" t }

diff --git a/extra/hello-world/deploy.factor b/extra/hello-world/deploy.factor
index aadffb6ae81c87ed8999dfed16c8ff6237aab000..0852188761fce2f683dbe25dacfc47b52c1d0f41 100755 (executable)
--- a/extra/hello-world/deploy.factor
+++ b/extra/hello-world/deploy.factor
@@ -2,7 +2,6 @@ USING: tools.deploy.config ;
 H{
     { deploy-unicode? f }
     { deploy-ui? f }
-    { deploy-compiler? t }
     { deploy-name "Hello world (console)" }
     { deploy-io 2 }
     { deploy-threads? f }

diff --git a/extra/jamshred/deploy.factor b/extra/jamshred/deploy.factor
index 9a18cf1f9b76b5b47d8db2566cce452ffd2d85e0..867fb8d62643f27c5313c74c36e8fcc844d7d405 100644 (file)
--- a/extra/jamshred/deploy.factor
+++ b/extra/jamshred/deploy.factor
@@ -3,7 +3,6 @@ V{
     { deploy-ui? t }
     { deploy-io 1 }
     { deploy-reflection 1 }
-    { deploy-compiler? t }
     { deploy-math? t }
     { deploy-word-props? f }
     { deploy-c-types? f }

diff --git a/extra/joystick-demo/deploy.factor b/extra/joystick-demo/deploy.factor
index 8f25662f9e06654e84423fb04fbabb0a24882244..8ef5231362e96d0cd3f2b20bcbc86ae79422c668 100644 (file)
--- a/extra/joystick-demo/deploy.factor
+++ b/extra/joystick-demo/deploy.factor
@@ -10,5 +10,4 @@ H{
     { deploy-math? t }
     { "stop-after-last-window?" t }
     { deploy-ui? t }
-    { deploy-compiler? t }
 }

diff --git a/extra/maze/deploy.factor b/extra/maze/deploy.factor
index 1eda31561755d097bd30edd30836a767133a85dd..9f5795d55ac82fe0779edd4298f6cab479b3f2d1 100755 (executable)
--- a/extra/maze/deploy.factor
+++ b/extra/maze/deploy.factor
@@ -1,14 +1,14 @@
 USING: tools.deploy.config ;
 H{
-    { deploy-threads? t }
+    { deploy-ui? t }
+    { deploy-reflection 1 }
+    { deploy-unicode? f }
     { deploy-math? t }
-    { deploy-name "Maze" }
+    { deploy-io 2 }
     { deploy-c-types? f }
+    { deploy-name "Maze" }
     { deploy-word-props? f }
-    { deploy-io 2 }
-    { deploy-ui? t }
-    { "stop-after-last-window?" t }
     { deploy-word-defs? f }
-    { deploy-compiler? t }
-    { deploy-reflection 1 }
+    { "stop-after-last-window?" t }
+    { deploy-threads? t }
 }

diff --git a/extra/merger/deploy.factor b/extra/merger/deploy.factor
index 54535d5bc82edc750a55f5888576fd767f18c568..adaab737c3dc00696a0c0656356fdb86302c84de 100644 (file)
--- a/extra/merger/deploy.factor
+++ b/extra/merger/deploy.factor
@@ -7,7 +7,6 @@ H{
     { "stop-after-last-window?" t }
     { deploy-ui? t }
     { deploy-reflection 1 }
-    { deploy-compiler? t }
     { deploy-name "Merger" }
     { deploy-word-props? f }
     { deploy-threads? t }

diff --git a/extra/minneapolis-talk/deploy.factor b/extra/minneapolis-talk/deploy.factor
index 32b78a2c137af31b0547281c96ccb4449af7a898..c74ff304871abeebf9eebb1ceafe45bc2bc8c9c5 100755 (executable)
--- a/extra/minneapolis-talk/deploy.factor
+++ b/extra/minneapolis-talk/deploy.factor
@@ -3,7 +3,6 @@ V{
     { deploy-ui? t }
     { deploy-io 1 }
     { deploy-reflection 1 }
-    { deploy-compiler? t }
     { deploy-math? t }
     { deploy-word-props? f }
     { deploy-c-types? f }

diff --git a/extra/nehe/deploy.factor b/extra/nehe/deploy.factor
index 6cf9543678ca9502312fb7ec279c92f0ac7eec80..2d6bdec8a837cd57bd4f6ded0ccc4aa49a4fb57d 100755 (executable)
--- a/extra/nehe/deploy.factor
+++ b/extra/nehe/deploy.factor
@@ -3,7 +3,6 @@ V{
     { deploy-ui? t }
     { deploy-io 1 }
     { deploy-reflection 1 }
-    { deploy-compiler? t }
     { deploy-math? t }
     { deploy-word-props? f }
     { deploy-c-types? f }

diff --git a/extra/spheres/deploy.factor b/extra/spheres/deploy.factor
index 22c5de09630ac89759f5c318ae77b86632fda278..df314317cf9744e1c56d111c4533ec3e0b512933 100644 (file)
--- a/extra/spheres/deploy.factor
+++ b/extra/spheres/deploy.factor
@@ -10,6 +10,5 @@ H{
     { deploy-word-props? f }
     { deploy-word-defs? f }
     { "stop-after-last-window?" t }
-    { deploy-compiler? t }
     { deploy-threads? t }
 }

diff --git a/extra/sudoku/deploy.factor b/extra/sudoku/deploy.factor
index 92c4395decf31bcb76d1b4885517628355ac5674..c873600134f0663973fc60e3f65be4092b160f32 100755 (executable)
--- a/extra/sudoku/deploy.factor
+++ b/extra/sudoku/deploy.factor
@@ -3,7 +3,6 @@ H{
     { deploy-word-defs? f }
     { deploy-name "Sudoku" }
     { deploy-threads? f }
-    { deploy-compiler? t }
     { deploy-math? t }
     { deploy-c-types? f }
     { deploy-io 2 }

diff --git a/extra/terrain/deploy.factor b/extra/terrain/deploy.factor
index e51f8d13e632f94f4d58a12648873858efa5e2ab..b51873a5adabe0cfa8615694defcb9dd9f97358e 100644 (file)
--- a/extra/terrain/deploy.factor
+++ b/extra/terrain/deploy.factor
@@ -10,6 +10,5 @@ H{
     { deploy-word-props? f }
     { deploy-word-defs? f }
     { "stop-after-last-window?" t }
-    { deploy-compiler? t }
     { deploy-threads? t }
 }

diff --git a/extra/tetris/deploy.factor b/extra/tetris/deploy.factor
index 03ec5d4e6405b7f975e47fa5ce3792a2be12e93e..a2d71ab08bf9302c2fa463557157a584765b310e 100755 (executable)
--- a/extra/tetris/deploy.factor
+++ b/extra/tetris/deploy.factor
@@ -1,7 +1,6 @@
 USING: tools.deploy.config ;
 H{
     { deploy-ui? t }
-    { deploy-compiler? t }
     { deploy-threads? t }
     { deploy-word-props? f }
     { deploy-reflection 1 }

diff --git a/extra/webkit-demo/deploy.factor b/extra/webkit-demo/deploy.factor
index 322212c4fc7170edf9036ae8860f75d6d82d5dfa..fb320446649769ce001a068ec8368ab693d74df3 100644 (file)
--- a/extra/webkit-demo/deploy.factor
+++ b/extra/webkit-demo/deploy.factor
@@ -4,7 +4,6 @@ H{
     { deploy-threads? f }
     { deploy-word-defs? f }
     { deploy-ui? f }
-    { deploy-compiler? t }
     { deploy-word-props? f }
     { "stop-after-last-window?" t }
     { deploy-unicode? f }