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

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

Slava Pestov 2008-03-27 17:45:47 -05:00
parent 3b0e2b412c 6f7d280e5c
commit 8638430185
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/cpu/x86/architecture/architecture.factor
View File

@ -156,7 +156,7 @@ M: x86-backend %unbox-small-struct ( size -- )
M: x86-backend struct-small-enough? ( size -- ? ) M: x86-backend struct-small-enough? ( size -- ? )
{ 1 2 4 8 } member? { 1 2 4 8 } member?
os { "linux" "solaris" } member? not and ; os { "linux" "netbsd" "solaris" } member? not and ;
M: x86-backend %return ( -- ) 0 %unwind ; M: x86-backend %return ( -- ) 0 %unwind ;

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

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' '`;