Make OS name more consistent for extra/builder

db4
Slava Pestov 2008-02-05 18:48:38 -06:00
parent f8df69d9a1
commit 20e4fcecda
4 changed files with 8 additions and 7 deletions

View File

@ -63,8 +63,8 @@ default:
@echo "macosx-ppc" @echo "macosx-ppc"
@echo "solaris-x86-32" @echo "solaris-x86-32"
@echo "solaris-x86-64" @echo "solaris-x86-64"
@echo "windows-ce-arm" @echo "wince-arm"
@echo "windows-nt-x86-32" @echo "winnt-x86-32"
@echo "" @echo ""
@echo "Additional modifiers:" @echo "Additional modifiers:"
@echo "" @echo ""
@ -122,10 +122,10 @@ solaris-x86-32:
solaris-x86-64: solaris-x86-64:
$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.solaris.x86.64 $(MAKE) $(EXECUTABLE) CONFIG=vm/Config.solaris.x86.64
windows-nt-x86-32: winnt-x86-32:
$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.32 $(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.32
windows-ce-arm: wince-arm:
$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.ce.arm $(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.ce.arm
macosx.app: factor macosx.app: factor

3
core/system/system-docs.factor Normal file → Executable file
View File

@ -51,7 +51,8 @@ HELP: os
"openbsd" "openbsd"
"netbsd" "netbsd"
"solaris" "solaris"
"windows" "wince"
"winnt"
} }
} ; } ;

2
core/system/system.factor Normal file → Executable file
View File

@ -22,7 +22,7 @@ splitting assocs ;
os "wince" = ; foldable os "wince" = ; foldable
: winnt? ( -- ? ) : winnt? ( -- ? )
os "windows" = ; foldable os "winnt" = ; foldable
: windows? ( -- ? ) : windows? ( -- ? )
wince? winnt? or ; foldable wince? winnt? or ; foldable

View File

@ -12,7 +12,7 @@ typedef char F_SYMBOL;
#define unbox_symbol_string unbox_char_string #define unbox_symbol_string unbox_char_string
#define from_symbol_string from_char_string #define from_symbol_string from_char_string
#define FACTOR_OS_STRING "windows" #define FACTOR_OS_STRING "winnt"
#define FACTOR_DLL L"factor-nt.dll" #define FACTOR_DLL L"factor-nt.dll"
#define FACTOR_DLL_NAME "factor-nt.dll" #define FACTOR_DLL_NAME "factor-nt.dll"