Merge branch 'master' of git://factorcode.org/git/factor
commit
6f7d280e5c
|
@ -1,6 +1,7 @@
|
|||
! Copyright (C) 2007, 2008 Slava Pestov.
|
||||
! See http://factorcode.org/license.txt for BSD license.
|
||||
USING: init kernel system namespaces io io.encodings io.encodings.utf8 ;
|
||||
USING: init kernel system namespaces io io.encodings
|
||||
io.encodings.utf8 init assocs ;
|
||||
IN: io.backend
|
||||
|
||||
SYMBOL: io-backend
|
||||
|
@ -22,7 +23,8 @@ HOOK: normalize-pathname io-backend ( str -- newstr )
|
|||
M: object normalize-directory normalize-pathname ;
|
||||
|
||||
: set-io-backend ( io-backend -- )
|
||||
io-backend set-global init-io init-stdio ;
|
||||
io-backend set-global init-io init-stdio
|
||||
"io.files" init-hooks get at call ;
|
||||
|
||||
[ init-io embedded? [ init-stdio ] unless ]
|
||||
"io.backend" add-init-hook
|
||||
|
|
|
@ -170,7 +170,7 @@ SYMBOL: current-directory
|
|||
|
||||
M: object cwd ( -- path ) "." ;
|
||||
|
||||
[ cwd current-directory set-global ] "current-directory" add-init-hook
|
||||
[ cwd current-directory set-global ] "io.files" add-init-hook
|
||||
|
||||
: with-directory ( path quot -- )
|
||||
>r normalize-pathname r>
|
||||
|
|
|
@ -8,7 +8,7 @@ io.encodings.utf8 ;
|
|||
IN: editors.jedit
|
||||
|
||||
: jedit-server-info ( -- port auth )
|
||||
home "/.jedit/server" append-path ascii [
|
||||
home ".jedit/server" append-path ascii [
|
||||
readln drop
|
||||
readln string>number
|
||||
readln string>number
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
IN: tools.deploy.tests
|
||||
USING: tools.test system io.files kernel tools.deploy.config
|
||||
tools.deploy.backend math sequences io.launcher arrays
|
||||
namespaces ;
|
||||
namespaces continuations ;
|
||||
|
||||
: shake-and-bake ( vocab -- )
|
||||
"." resource-path [
|
||||
[ "test.image" temp-file delete-file ] ignore-errors
|
||||
"resource:" [
|
||||
>r vm
|
||||
"test.image" temp-file
|
||||
r> dup deploy-config make-deploy-image
|
||||
|
|
|
@ -62,11 +62,12 @@ T{ macosx-deploy-implementation } deploy-implementation set-global
|
|||
|
||||
M: macosx-deploy-implementation deploy* ( vocab -- )
|
||||
".app deploy tool" assert.app
|
||||
"." resource-path cd
|
||||
dup deploy-config [
|
||||
bundle-name dup exists? [ delete-tree ] [ drop ] if
|
||||
[ bundle-name create-app-dir ] keep
|
||||
[ bundle-name deploy.app-image ] keep
|
||||
namespace make-deploy-image
|
||||
bundle-name show-in-finder
|
||||
] bind ;
|
||||
"resource:" [
|
||||
dup deploy-config [
|
||||
bundle-name dup exists? [ delete-tree ] [ drop ] if
|
||||
[ bundle-name create-app-dir ] keep
|
||||
[ bundle-name deploy.app-image ] keep
|
||||
namespace make-deploy-image
|
||||
bundle-name show-in-finder
|
||||
] bind
|
||||
] with-directory ;
|
||||
|
|
|
@ -81,7 +81,7 @@ IN: tools.deploy.shaker
|
|||
[
|
||||
"class" ,
|
||||
"metaclass" ,
|
||||
"slot-names" ,
|
||||
"layout" ,
|
||||
deploy-ui? get [
|
||||
"gestures" ,
|
||||
"commands" ,
|
||||
|
|
|
@ -306,7 +306,7 @@ update_boot_images() {
|
|||
echo "Deleting old images..."
|
||||
rm checksums.txt* > /dev/null 2>&1
|
||||
rm $BOOT_IMAGE.* > /dev/null 2>&1
|
||||
rm staging.*.image > /dev/null 2>&1
|
||||
rm temp/staging.*.image > /dev/null 2>&1
|
||||
if [[ -f $BOOT_IMAGE ]] ; then
|
||||
get_url http://factorcode.org/images/latest/checksums.txt
|
||||
factorcode_md5=`cat checksums.txt|grep $BOOT_IMAGE|cut -f2 -d' '`;
|
||||
|
|
Loading…
Reference in New Issue