steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up some uglyness in tools.deploy

release
Slava Pestov 2007-11-24 19:40:43 -05:00
parent 026c4186f1
commit 81226bfd36
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extra/tools/deploy/deploy.factor
View File

@ -26,12 +26,8 @@ IN: tools.deploy
[ (copy-lines) ] [ stream-close ] [ ] cleanup ; [ (copy-lines) ] [ stream-close ] [ ] cleanup ;
: stage2 ( vm flags -- ) : stage2 ( vm flags -- )
[ >r "-i=" boot-image-name append 2array r> append dup .
"\"" % swap % "\" -i=" % <process-stream>
boot-image-name %
[ " " % % ] each
] "" make
dup print <process-stream>
dup duplex-stream-out stream-close dup duplex-stream-out stream-close
copy-lines ; copy-lines ;
@ -48,11 +44,11 @@ IN: tools.deploy
: deploy-command-line ( vm image vocab config -- vm flags ) : deploy-command-line ( vm image vocab config -- vm flags )
[ [
"\"-include=" swap profile-string "\"" 3append , "-include=" swap profile-string append ,
"-deploy-vocab=" swap append , "-deploy-vocab=" swap append ,
"\"-output-image=" swap "\"" 3append , "-output-image=" swap append ,
"-no-stack-traces" , "-no-stack-traces" ,

10
extra/tools/deploy/macosx/macosx.factor
View File

@ -2,8 +2,9 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: io io.files io.launcher kernel namespaces sequences USING: io io.files io.launcher kernel namespaces sequences
system tools.deploy tools.deploy.config assocs hashtables system tools.deploy tools.deploy.config assocs hashtables
prettyprint unix io.unix.backend cocoa cocoa.plists prettyprint io.unix.backend cocoa cocoa.plists
cocoa.application cocoa.classes ; cocoa.application cocoa.classes qualified ;
QUALIFIED: unix
IN: tools.deploy.macosx IN: tools.deploy.macosx
: touch ( path -- ) : touch ( path -- )
@ -19,10 +20,13 @@ IN: tools.deploy.macosx
bundle-dir over path+ -rot bundle-dir over path+ -rot
>r "Contents" path+ r> path+ copy-directory ; >r "Contents" path+ r> path+ copy-directory ;
: chmod ( path perms -- )
unix:chmod io-error ;
: copy-vm ( executable bundle-name -- vm ) : copy-vm ( executable bundle-name -- vm )
"Contents/MacOS/" path+ swap path+ vm swap "Contents/MacOS/" path+ swap path+ vm swap
[ copy-file ] keep [ copy-file ] keep
[ 755 chmod io-error ] keep ; [ OCT: 755 chmod ] keep ;
: copy-fonts ( name -- ) : copy-fonts ( name -- )
"fonts/" resource-path "fonts/" resource-path