From b31440a574b1bf26117f68745c549f600e1c94ee Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Fri, 2 Nov 2007 14:26:04 -0400
Subject: [PATCH] Fix deployment, remove image compression since its useless
 and broken

---
 core/memory/memory.factor               | 26 -------------------------
 extra/tools/deploy/config/config.factor |  2 +-
 extra/tools/deploy/shaker/shaker.factor |  4 +---
 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/core/memory/memory.factor b/core/memory/memory.factor
index 871838c3f3..0d684c3261 100644
--- a/core/memory/memory.factor
+++ b/core/memory/memory.factor
@@ -16,29 +16,3 @@ math strings combinators ;
     pusher >r each-object r> >array ; inline
 
 : save ( -- ) image save-image ;
-
-<PRIVATE
-
-: intern-objects ( predicate -- )
-    instances
-    dup H{ } clone [ [ ] cache ] curry map
-    become ; inline
-
-: prepare-compress-image ( -- seq )
-    [ sbuf? ] instances [ underlying ] map ;
-
-PRIVATE>
-
-: compress-image ( -- )
-    prepare-compress-image "bad-strings" [
-        [
-            {
-                { [ dup quotation? ] [ t ] }
-                { [ dup wrapper? ] [ t ] }
-                { [ dup fixnum? ] [ f ] }
-                { [ dup number? ] [ t ] }
-                { [ dup string? ] [ dup "bad-strings" get memq? not ] }
-                { [ t ] [ f ] }
-            } cond nip
-        ] intern-objects
-    ] with-variable ;
diff --git a/extra/tools/deploy/config/config.factor b/extra/tools/deploy/config/config.factor
index cebf39cbd0..da3daa91f1 100644
--- a/extra/tools/deploy/config/config.factor
+++ b/extra/tools/deploy/config/config.factor
@@ -17,7 +17,7 @@ SYMBOL: deploy-io
         { 3 "Level 3 - Non-blocking streams and networking" }
     } ;
 
-: strip-io? deploy-io get zero? ;
+: strip-io? deploy-io get 1 = ;
 
 : native-io? deploy-io get 3 = ;
 
diff --git a/extra/tools/deploy/shaker/shaker.factor b/extra/tools/deploy/shaker/shaker.factor
index 73c00cbd50..4531a88011 100644
--- a/extra/tools/deploy/shaker/shaker.factor
+++ b/extra/tools/deploy/shaker/shaker.factor
@@ -70,8 +70,8 @@ IN: tools.deploy.shaker
     strip-word-defs ;
 
 : strip-environment ( retain-globals -- )
-    "Stripping environment" show
     strip-globals? [
+        "Stripping environment" show
         global strip-assoc 21 setenv
     ] [ drop ] if ;
 
@@ -160,8 +160,6 @@ SYMBOL: deploy-vocab
             deploy-vocab get require
             r> [ call ] when*
             strip
-            "Compressing image" show
-            compress-image
             finish-deploy
         ] [
             print-error flush 1 exit