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

Updating code for boot image renaming

db4
Slava Pestov 2008-11-07 21:09:42 -06:00
parent 639da2d335
commit 1b744ab14b
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
basis/bootstrap/image/image.factor
View File

@ -12,9 +12,15 @@ io.encodings.binary math.order math.private accessors
slots.private compiler.units ; slots.private compiler.units ;
IN: bootstrap.image IN: bootstrap.image
: arch ( os cpu -- arch )
{
{ "ppc" [ name>> "-ppc" append ] }
{ "x86.64" [ name>> "winnt" = "winnt" "unix" ? "-x86.64" append ] }
[ nip ]
} case ;
: my-arch ( -- arch ) : my-arch ( -- arch )
cpu name>> os name>> cpu name>> arch ;
dup "ppc" = [ >r os name>> "-" r> 3append ] when ;
: boot-image-name ( arch -- string ) : boot-image-name ( arch -- string )
"boot." swap ".image" 3append ; "boot." swap ".image" 3append ;

20
build-support/factor.sh
View File

@ -271,18 +271,18 @@ check_os_arch_word() {
set_build_info() { set_build_info() {
check_os_arch_word check_os_arch_word
MAKE_TARGET=$OS-$ARCH-$WORD MAKE_TARGET=$OS-$ARCH-$WORD
MAKE_IMAGE_TARGET=$ARCH.$WORD
BOOT_IMAGE=boot.$ARCH.$WORD.image
if [[ $OS == macosx && $ARCH == ppc ]] ; then if [[ $OS == macosx && $ARCH == ppc ]] ; then
MAKE_IMAGE_TARGET=$OS-$ARCH MAKE_IMAGE_TARGET=macosx-ppc
MAKE_TARGET=$OS-$ARCH elif [[ $OS == linux && $ARCH == ppc ]] ; then
BOOT_IMAGE=boot.macosx-ppc.image MAKE_IMAGE_TARGET=linux-ppc
fi elif [[ $OS == winnt && $ARCH == x86 && $WORD == 64 ]] ; then
if [[ $OS == linux && $ARCH == ppc ]] ; then MAKE_IMAGE_TARGET=winnt-x86.64
MAKE_IMAGE_TARGET=$OS-$ARCH elif [[ $ARCH == x86 && $WORD == 64 ]] ; then
MAKE_TARGET=$OS-$ARCH MAKE_IMAGE_TARGET=unix-x86.64
BOOT_IMAGE=boot.linux-ppc.image else
MAKE_IMAGE_TARGET=$ARCH.$WORD
fi fi
BOOT_IMAGE_NAME=boot.$MAKE_IMAGE_TARGET.image
} }
parse_build_info() { parse_build_info() {

4
extra/mason/platform/platform.factor
View File

@ -1,7 +1,7 @@
! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov. ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: kernel system accessors namespaces splitting sequences USING: kernel system accessors namespaces splitting sequences
mason.config ; mason.config bootstrap.image ;
IN: mason.platform IN: mason.platform
: platform ( -- string ) : platform ( -- string )
@ -11,7 +11,7 @@ IN: mason.platform
target-os get { "freebsd" "openbsd" "netbsd" } member? "gmake" "make" ? ; target-os get { "freebsd" "openbsd" "netbsd" } member? "gmake" "make" ? ;
: boot-image-arch ( -- string ) : boot-image-arch ( -- string )
target-cpu get dup "ppc" = [ target-os get "-" append prepend ] when ; target-os get target-cpu get arch ;
: boot-image-name ( -- string ) : boot-image-name ( -- string )
"boot." boot-image-arch ".image" 3append ; "boot." boot-image-arch ".image" 3append ;