From 81226bfd36b7149ddb0a34b185b612774c3d0a9d Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Sat, 24 Nov 2007 19:40:43 -0500
Subject: [PATCH] Clean up some uglyness in tools.deploy
---
extra/tools/deploy/deploy.factor | 12 ++++--------
extra/tools/deploy/macosx/macosx.factor | 10 +++++++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/extra/tools/deploy/deploy.factor b/extra/tools/deploy/deploy.factor
index 7c0dabc458..dafe44dfad 100755
--- a/extra/tools/deploy/deploy.factor
+++ b/extra/tools/deploy/deploy.factor
@@ -26,12 +26,8 @@ IN: tools.deploy
[ (copy-lines) ] [ stream-close ] [ ] cleanup ;
: stage2 ( vm flags -- )
- [
- "\"" % swap % "\" -i=" %
- boot-image-name %
- [ " " % % ] each
- ] "" make
- dup print <process-stream>
+ >r "-i=" boot-image-name append 2array r> append dup .
+ <process-stream>
dup duplex-stream-out stream-close
copy-lines ;
@@ -48,11 +44,11 @@ IN: tools.deploy
: deploy-command-line ( vm image vocab config -- vm flags )
[
- "\"-include=" swap profile-string "\"" 3append ,
+ "-include=" swap profile-string append ,
"-deploy-vocab=" swap append ,
- "\"-output-image=" swap "\"" 3append ,
+ "-output-image=" swap append ,
"-no-stack-traces" ,
diff --git a/extra/tools/deploy/macosx/macosx.factor b/extra/tools/deploy/macosx/macosx.factor
index a5319563be..7624fbeb9c 100755
--- a/extra/tools/deploy/macosx/macosx.factor
+++ b/extra/tools/deploy/macosx/macosx.factor
@@ -2,8 +2,9 @@
! See http://factorcode.org/license.txt for BSD license.
USING: io io.files io.launcher kernel namespaces sequences
system tools.deploy tools.deploy.config assocs hashtables
-prettyprint unix io.unix.backend cocoa cocoa.plists
-cocoa.application cocoa.classes ;
+prettyprint io.unix.backend cocoa cocoa.plists
+cocoa.application cocoa.classes qualified ;
+QUALIFIED: unix
IN: tools.deploy.macosx
: touch ( path -- )
@@ -19,10 +20,13 @@ IN: tools.deploy.macosx
bundle-dir over path+ -rot
>r "Contents" path+ r> path+ copy-directory ;
+: chmod ( path perms -- )
+ unix:chmod io-error ;
+
: copy-vm ( executable bundle-name -- vm )
"Contents/MacOS/" path+ swap path+ vm swap
[ copy-file ] keep
- [ 755 chmod io-error ] keep ;
+ [ OCT: 755 chmod ] keep ;
: copy-fonts ( name -- )
"fonts/" resource-path