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

Merge branch 'master' of git://factorcode.org/git/factor

db4
Doug Coleman 2008-03-27 11:18:49 -05:00
parent 4c449296b2 aad587d664
commit 6f7d280e5c
7 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/io/backend/backend.factor
View File

@ -1,6 +1,7 @@
! Copyright (C) 2007, 2008 Slava Pestov. ! Copyright (C) 2007, 2008 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! 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 IN: io.backend
SYMBOL: io-backend SYMBOL: io-backend
@ -22,7 +23,8 @@ HOOK: normalize-pathname io-backend ( str -- newstr )
M: object normalize-directory normalize-pathname ; M: object normalize-directory normalize-pathname ;
: set-io-backend ( io-backend -- ) : 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 ] [ init-io embedded? [ init-stdio ] unless ]
"io.backend" add-init-hook "io.backend" add-init-hook

2
core/io/files/files.factor
View File

@ -170,7 +170,7 @@ SYMBOL: current-directory
M: object cwd ( -- path ) "." ; 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 -- ) : with-directory ( path quot -- )
>r normalize-pathname r> >r normalize-pathname r>

2
extra/editors/jedit/jedit.factor Normal file → Executable file
View File

@ -8,7 +8,7 @@ io.encodings.utf8 ;
IN: editors.jedit IN: editors.jedit
: jedit-server-info ( -- port auth ) : jedit-server-info ( -- port auth )
home "/.jedit/server" append-path ascii [ home ".jedit/server" append-path ascii [
readln drop readln drop
readln string>number readln string>number
readln string>number readln string>number

5
extra/tools/deploy/deploy-tests.factor
View File

@ -1,10 +1,11 @@
IN: tools.deploy.tests IN: tools.deploy.tests
USING: tools.test system io.files kernel tools.deploy.config USING: tools.test system io.files kernel tools.deploy.config
tools.deploy.backend math sequences io.launcher arrays tools.deploy.backend math sequences io.launcher arrays
namespaces ; namespaces continuations ;
: shake-and-bake ( vocab -- ) : shake-and-bake ( vocab -- )
"." resource-path [ [ "test.image" temp-file delete-file ] ignore-errors
"resource:" [
>r vm >r vm
"test.image" temp-file "test.image" temp-file
r> dup deploy-config make-deploy-image r> dup deploy-config make-deploy-image

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

@ -62,11 +62,12 @@ T{ macosx-deploy-implementation } deploy-implementation set-global
M: macosx-deploy-implementation deploy* ( vocab -- ) M: macosx-deploy-implementation deploy* ( vocab -- )
".app deploy tool" assert.app ".app deploy tool" assert.app
"." resource-path cd "resource:" [
dup deploy-config [ dup deploy-config [
bundle-name dup exists? [ delete-tree ] [ drop ] if bundle-name dup exists? [ delete-tree ] [ drop ] if
[ bundle-name create-app-dir ] keep [ bundle-name create-app-dir ] keep
[ bundle-name deploy.app-image ] keep [ bundle-name deploy.app-image ] keep
namespace make-deploy-image namespace make-deploy-image
bundle-name show-in-finder bundle-name show-in-finder
] bind ; ] bind
] with-directory ;

2
extra/tools/deploy/shaker/shaker.factor
View File

@ -81,7 +81,7 @@ IN: tools.deploy.shaker
[ [
"class" , "class" ,
"metaclass" , "metaclass" ,
"slot-names" , "layout" ,
deploy-ui? get [ deploy-ui? get [
"gestures" , "gestures" ,
"commands" , "commands" ,

2
misc/factor.sh
View File

@ -306,7 +306,7 @@ update_boot_images() {
echo "Deleting old images..." echo "Deleting old images..."
rm checksums.txt* > /dev/null 2>&1 rm checksums.txt* > /dev/null 2>&1
rm $BOOT_IMAGE.* > /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 if [[ -f $BOOT_IMAGE ]] ; then
get_url http://factorcode.org/images/latest/checksums.txt get_url http://factorcode.org/images/latest/checksums.txt
factorcode_md5=`cat checksums.txt|grep $BOOT_IMAGE|cut -f2 -d' '`; factorcode_md5=`cat checksums.txt|grep $BOOT_IMAGE|cut -f2 -d' '`;