From 2ab41d0944888463053fcb5e9df68c9b77f3aade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= <bjourne@gmail.com>
Date: Thu, 28 Apr 2016 17:12:43 +0200
Subject: [PATCH] tools.deploy.shaker: Revert from f488f77
---
basis/tools/deploy/shaker/shaker.factor | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index 2dc680a8bb..9b66bee1b0 100755
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -292,6 +292,9 @@ IN: tools.deploy.shaker
[ [ "No method" throw ] ( -- * ) define-temp ] with-compilation-unit ;
: strip-default-methods ( -- )
+ ! In a development image, each generic has its own default method.
+ ! This gives better error messages for runtime type errors, but
+ ! takes up space. For deployment we merge them all together.
strip-debugger? [
"Stripping default methods" show
[ single-generic? ] instances
@@ -437,6 +440,10 @@ IN: tools.deploy.shaker
] when ;
: strip-c-io ( -- )
+ ! On all platforms, if deploy-io is 1, we strip out C streams.
+ ! On Unix, if deploy-io is 3, we strip out C streams as well.
+ ! On Windows, even if deploy-io is 3, C streams are still used
+ ! for the console, so don't strip it there.
strip-io?
native-io? os windows? not and
or [
@@ -462,6 +469,8 @@ IN: tools.deploy.shaker
[ compress-object? ] [ ] "objects" compress ;
: remain-compiled ( old new -- old new )
+ ! Quotations which were formerly compiled must remain
+ ! compiled.
2dup [
2dup [ quotation-compiled? ] [ quotation-compiled? not ] bi* and
[ nip jit-compile ] [ 2drop ] if
@@ -610,6 +619,8 @@ SYMBOL: deploy-vocab
] recover ; inline
: (deploy) ( final-image vocab-manifest-out vocab config -- )
+ ! Does the actual work of a deployment in the slave
+ ! stage2 image
[
[
strip-debugger? [