From: Doug Coleman Date: Mon, 19 Sep 2011 01:25:06 +0000 (-0500) Subject: Remove Windows CE from core/ basis/ and build-support/ X-Git-Tag: 0.97~4119 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=bf2a96e9e02327fa1cb9d763bbd1cbc18bf843b1 Remove Windows CE from core/ basis/ and build-support/ Rename the winnt singleton to windows in core/ basis/ extra/ Rename boot images winnt -> windows Fixes #84. --- diff --git a/GNUmakefile b/GNUmakefile index 528ea0eb2f..39de51f352 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -95,8 +95,8 @@ help: @echo "macosx-ppc" @echo "solaris-x86-32" @echo "solaris-x86-64" - @echo "winnt-x86-32" - @echo "winnt-x86-64" + @echo "windows-x86-32" + @echo "windows-x86-64" @echo "" @echo "Additional modifiers:" @echo "" @@ -155,11 +155,11 @@ solaris-x86-32: solaris-x86-64: $(MAKE) $(ALL) CONFIG=vm/Config.solaris.x86.64 -winnt-x86-32: +windows-x86-32: $(MAKE) $(ALL) CONFIG=vm/Config.windows.x86.32 $(MAKE) factor-console CONFIG=vm/Config.windows.x86.32 -winnt-x86-64: +windows-x86-64: $(MAKE) $(ALL) CONFIG=vm/Config.windows.x86.64 $(MAKE) factor-console CONFIG=vm/Config.windows.x86.64 diff --git a/basis/atk/ffi/ffi.factor b/basis/atk/ffi/ffi.factor index 147a7e4909..2577a23b3d 100644 --- a/basis/atk/ffi/ffi.factor +++ b/basis/atk/ffi/ffi.factor @@ -12,7 +12,7 @@ LIBRARY: atk << "atk" { - { [ os winnt? ] [ "libatk-1.0-0.dll" cdecl add-library ] } + { [ os windows? ] [ "libatk-1.0-0.dll" cdecl add-library ] } { [ os unix? ] [ drop ] } } cond >> diff --git a/basis/bootstrap/image/image-docs.factor b/basis/bootstrap/image/image-docs.factor index 2d29274556..78c3d58919 100644 --- a/basis/bootstrap/image/image-docs.factor +++ b/basis/bootstrap/image/image-docs.factor @@ -16,5 +16,5 @@ ABOUT: "bootstrap.image" HELP: make-image { $values { "arch" string } } { $description "Creates a bootstrap image from sources, where " { $snippet "architecture" } " is one of the following:" -{ $code "x86.32" "unix-x86.64" "winnt-x86.64" "macosx-ppc" "linux-ppc" } +{ $code "x86.32" "unix-x86.64" "windows-x86.64" "macosx-ppc" "linux-ppc" } "The new image file is written to the " { $link resource-path } " and is named " { $snippet "boot." { $emphasis "architecture" } ".image" } "." } ; diff --git a/basis/bootstrap/image/image.factor b/basis/bootstrap/image/image.factor index f0ade2ccef..ff41e39338 100755 --- a/basis/bootstrap/image/image.factor +++ b/basis/bootstrap/image/image.factor @@ -15,7 +15,7 @@ generalizations parser.notes ; IN: bootstrap.image : arch ( os cpu -- arch ) - 2dup [ winnt? ] [ ppc? ] bi* or [ + 2dup [ windows? ] [ ppc? ] bi* or [ [ drop unix ] dip ] unless [ name>> ] [ name>> ] bi* "-" glue ; @@ -31,9 +31,9 @@ IN: bootstrap.image : images ( -- seq ) { - "winnt-x86.32" "unix-x86.32" + "windows-x86.32" "unix-x86.32" "linux-ppc.32" "linux-ppc.64" - "winnt-x86.64" "unix-x86.64" + "windows-x86.64" "unix-x86.64" } ; > diff --git a/basis/compiler/tests/alien.factor b/basis/compiler/tests/alien.factor index 2c27118146..a082888690 100755 --- a/basis/compiler/tests/alien.factor +++ b/basis/compiler/tests/alien.factor @@ -23,7 +23,7 @@ IN: compiler.tests.alien : libfactor-ffi-tests-path ( -- string ) "resource:" absolute-path { - { [ os winnt? ] [ "libfactor-ffi-test.dll" ] } + { [ os windows? ] [ "libfactor-ffi-test.dll" ] } { [ os macosx? ] [ "libfactor-ffi-test.dylib" ] } { [ os unix? ] [ "libfactor-ffi-test.so" ] } } cond append-path ; diff --git a/basis/compression/zlib/ffi/ffi.factor b/basis/compression/zlib/ffi/ffi.factor index aede6d5621..6c4efbb1ed 100644 --- a/basis/compression/zlib/ffi/ffi.factor +++ b/basis/compression/zlib/ffi/ffi.factor @@ -5,7 +5,7 @@ alien.libraries ; IN: compression.zlib.ffi << "zlib" { - { [ os winnt? ] [ "zlib1.dll" ] } + { [ os windows? ] [ "zlib1.dll" ] } { [ os macosx? ] [ "libz.dylib" ] } { [ os unix? ] [ "libz.so" ] } } cond cdecl add-library >> diff --git a/basis/cpu/x86/32/windows/bootstrap.factor b/basis/cpu/x86/32/windows/bootstrap.factor new file mode 100644 index 0000000000..a081b48f62 --- /dev/null +++ b/basis/cpu/x86/32/windows/bootstrap.factor @@ -0,0 +1,36 @@ +! Copyright (C) 2010 Slava Pestov. +! See http://factorcode.org/license.txt for BSD license. +USING: bootstrap.image.private compiler.constants +cpu.x86.assembler cpu.x86.assembler.operands kernel layouts +locals parser sequences ; +IN: bootstrap.x86 + +: tib-segment ( -- ) FS ; +: tib-temp ( -- reg ) EAX ; + +<< "vocab:cpu/x86/windows/bootstrap.factor" parse-file suffix! >> call + +: jit-install-seh ( -- ) + ! Create a new exception record and store it in the TIB. + ! Clobbers tib-temp. + ! Align stack + ESP 3 bootstrap-cells ADD + ! Exception handler address filled in by callback.cpp + tib-temp 0 MOV rc-absolute-cell rt-exception-handler jit-rel + tib-temp PUSH + ! No next handler + 0 PUSH + ! This is the new exception handler + tib-exception-list-offset [] ESP tib-segment MOV ; + +:: jit-update-seh ( ctx-reg -- ) + ! Load exception record structure that jit-install-seh + ! created from the bottom of the callstack. + ! Clobbers tib-temp. + tib-temp ctx-reg context-callstack-bottom-offset [+] MOV + tib-temp bootstrap-cell ADD + ! Store exception record in TIB. + tib-exception-list-offset [] tib-temp tib-segment MOV ; + +<< "vocab:cpu/x86/32/bootstrap.factor" parse-file suffix! >> call +<< "vocab:cpu/x86/bootstrap.factor" parse-file suffix! >> call diff --git a/basis/cpu/x86/32/winnt/bootstrap.factor b/basis/cpu/x86/32/winnt/bootstrap.factor deleted file mode 100644 index 5628632e6c..0000000000 --- a/basis/cpu/x86/32/winnt/bootstrap.factor +++ /dev/null @@ -1,36 +0,0 @@ -! Copyright (C) 2010 Slava Pestov. -! See http://factorcode.org/license.txt for BSD license. -USING: bootstrap.image.private compiler.constants -cpu.x86.assembler cpu.x86.assembler.operands kernel layouts -locals parser sequences ; -IN: bootstrap.x86 - -: tib-segment ( -- ) FS ; -: tib-temp ( -- reg ) EAX ; - -<< "vocab:cpu/x86/winnt/bootstrap.factor" parse-file suffix! >> call - -: jit-install-seh ( -- ) - ! Create a new exception record and store it in the TIB. - ! Clobbers tib-temp. - ! Align stack - ESP 3 bootstrap-cells ADD - ! Exception handler address filled in by callback.cpp - tib-temp 0 MOV rc-absolute-cell rt-exception-handler jit-rel - tib-temp PUSH - ! No next handler - 0 PUSH - ! This is the new exception handler - tib-exception-list-offset [] ESP tib-segment MOV ; - -:: jit-update-seh ( ctx-reg -- ) - ! Load exception record structure that jit-install-seh - ! created from the bottom of the callstack. - ! Clobbers tib-temp. - tib-temp ctx-reg context-callstack-bottom-offset [+] MOV - tib-temp bootstrap-cell ADD - ! Store exception record in TIB. - tib-exception-list-offset [] tib-temp tib-segment MOV ; - -<< "vocab:cpu/x86/32/bootstrap.factor" parse-file suffix! >> call -<< "vocab:cpu/x86/bootstrap.factor" parse-file suffix! >> call diff --git a/basis/cpu/x86/64/64.factor b/basis/cpu/x86/64/64.factor index f4a2d05f8d..e7582e627c 100644 --- a/basis/cpu/x86/64/64.factor +++ b/basis/cpu/x86/64/64.factor @@ -143,7 +143,7 @@ USE: vocabs.loader { { [ os unix? ] [ "cpu.x86.64.unix" require ] } - { [ os winnt? ] [ "cpu.x86.64.winnt" require ] } + { [ os windows? ] [ "cpu.x86.64.windows" require ] } } cond check-sse diff --git a/basis/cpu/x86/64/windows/bootstrap.factor b/basis/cpu/x86/64/windows/bootstrap.factor new file mode 100644 index 0000000000..321e564ed3 --- /dev/null +++ b/basis/cpu/x86/64/windows/bootstrap.factor @@ -0,0 +1,25 @@ +! Copyright (C) 2008 Slava Pestov. +! See http://factorcode.org/license.txt for BSD license. +USING: bootstrap.image.private kernel namespaces system layouts +vocabs sequences cpu.x86.assembler parser +cpu.x86.assembler.operands ; +IN: bootstrap.x86 + +DEFER: stack-reg + +: stack-frame-size ( -- n ) 8 bootstrap-cells ; +: nv-regs ( -- seq ) { RBX RSI RDI R12 R13 R14 R15 } ; +: arg1 ( -- reg ) RCX ; +: arg2 ( -- reg ) RDX ; +: arg3 ( -- reg ) R8 ; +: arg4 ( -- reg ) R9 ; + +: tib-segment ( -- ) GS ; +: tib-temp ( -- reg ) R11 ; + +: jit-install-seh ( -- ) stack-reg bootstrap-cell ADD ; +: jit-update-seh ( ctx-reg -- ) drop ; + +<< "vocab:cpu/x86/windows/bootstrap.factor" parse-file suffix! >> call +<< "vocab:cpu/x86/64/bootstrap.factor" parse-file suffix! >> call +<< "vocab:cpu/x86/bootstrap.factor" parse-file suffix! >> call diff --git a/basis/cpu/x86/64/windows/summary.txt b/basis/cpu/x86/64/windows/summary.txt new file mode 100644 index 0000000000..7f66427cf5 --- /dev/null +++ b/basis/cpu/x86/64/windows/summary.txt @@ -0,0 +1 @@ +64-bit x86 Windows ABI support diff --git a/basis/cpu/x86/64/windows/tags.txt b/basis/cpu/x86/64/windows/tags.txt new file mode 100644 index 0000000000..ebb74b4d5f --- /dev/null +++ b/basis/cpu/x86/64/windows/tags.txt @@ -0,0 +1 @@ +not loaded diff --git a/basis/cpu/x86/64/windows/windows.factor b/basis/cpu/x86/64/windows/windows.factor new file mode 100644 index 0000000000..0d48531de5 --- /dev/null +++ b/basis/cpu/x86/64/windows/windows.factor @@ -0,0 +1,25 @@ +! Copyright (C) 2008, 2010 Slava Pestov. +! See http://factorcode.org/license.txt for BSD license. +USING: kernel layouts system math alien.c-types sequences +compiler.cfg.registers cpu.architecture cpu.x86.assembler +cpu.x86 cpu.x86.64 cpu.x86.assembler.operands ; +IN: cpu.x86.64.windows + +M: x86.64 param-regs + drop { + { int-regs { RCX RDX R8 R9 } } + { float-regs { XMM0 XMM1 XMM2 XMM3 } } + } ; + +M: x86.64 reserved-stack-space 4 cells ; + +M: x86.64 return-struct-in-registers? ( c-type -- ? ) + heap-size { 1 2 4 8 } member? ; + +M: x86.64 value-struct? heap-size { 1 2 4 8 } member? ; + +M: x86.64 dummy-stack-params? f ; + +M: x86.64 dummy-int-params? t ; + +M: x86.64 dummy-fp-params? t ; diff --git a/basis/cpu/x86/64/winnt/bootstrap.factor b/basis/cpu/x86/64/winnt/bootstrap.factor deleted file mode 100644 index f816980e57..0000000000 --- a/basis/cpu/x86/64/winnt/bootstrap.factor +++ /dev/null @@ -1,25 +0,0 @@ -! Copyright (C) 2008 Slava Pestov. -! See http://factorcode.org/license.txt for BSD license. -USING: bootstrap.image.private kernel namespaces system layouts -vocabs sequences cpu.x86.assembler parser -cpu.x86.assembler.operands ; -IN: bootstrap.x86 - -DEFER: stack-reg - -: stack-frame-size ( -- n ) 8 bootstrap-cells ; -: nv-regs ( -- seq ) { RBX RSI RDI R12 R13 R14 R15 } ; -: arg1 ( -- reg ) RCX ; -: arg2 ( -- reg ) RDX ; -: arg3 ( -- reg ) R8 ; -: arg4 ( -- reg ) R9 ; - -: tib-segment ( -- ) GS ; -: tib-temp ( -- reg ) R11 ; - -: jit-install-seh ( -- ) stack-reg bootstrap-cell ADD ; -: jit-update-seh ( ctx-reg -- ) drop ; - -<< "vocab:cpu/x86/winnt/bootstrap.factor" parse-file suffix! >> call -<< "vocab:cpu/x86/64/bootstrap.factor" parse-file suffix! >> call -<< "vocab:cpu/x86/bootstrap.factor" parse-file suffix! >> call diff --git a/basis/cpu/x86/64/winnt/summary.txt b/basis/cpu/x86/64/winnt/summary.txt deleted file mode 100644 index 7f66427cf5..0000000000 --- a/basis/cpu/x86/64/winnt/summary.txt +++ /dev/null @@ -1 +0,0 @@ -64-bit x86 Windows ABI support diff --git a/basis/cpu/x86/64/winnt/tags.txt b/basis/cpu/x86/64/winnt/tags.txt deleted file mode 100644 index ebb74b4d5f..0000000000 --- a/basis/cpu/x86/64/winnt/tags.txt +++ /dev/null @@ -1 +0,0 @@ -not loaded diff --git a/basis/cpu/x86/64/winnt/winnt.factor b/basis/cpu/x86/64/winnt/winnt.factor deleted file mode 100644 index 7f1f29a603..0000000000 --- a/basis/cpu/x86/64/winnt/winnt.factor +++ /dev/null @@ -1,25 +0,0 @@ -! Copyright (C) 2008, 2010 Slava Pestov. -! See http://factorcode.org/license.txt for BSD license. -USING: kernel layouts system math alien.c-types sequences -compiler.cfg.registers cpu.architecture cpu.x86.assembler -cpu.x86 cpu.x86.64 cpu.x86.assembler.operands ; -IN: cpu.x86.64.winnt - -M: x86.64 param-regs - drop { - { int-regs { RCX RDX R8 R9 } } - { float-regs { XMM0 XMM1 XMM2 XMM3 } } - } ; - -M: x86.64 reserved-stack-space 4 cells ; - -M: x86.64 return-struct-in-registers? ( c-type -- ? ) - heap-size { 1 2 4 8 } member? ; - -M: x86.64 value-struct? heap-size { 1 2 4 8 } member? ; - -M: x86.64 dummy-stack-params? f ; - -M: x86.64 dummy-int-params? t ; - -M: x86.64 dummy-fp-params? t ; diff --git a/basis/cpu/x86/windows/bootstrap.factor b/basis/cpu/x86/windows/bootstrap.factor new file mode 100644 index 0000000000..b81c1eb604 --- /dev/null +++ b/basis/cpu/x86/windows/bootstrap.factor @@ -0,0 +1,32 @@ +! Copyright (C) 2010 Slava Pestov. +! See http://factorcode.org/license.txt for BSD license. +USING: bootstrap.image.private compiler.constants +cpu.x86.assembler cpu.x86.assembler.operands kernel layouts +locals parser sequences ; +IN: bootstrap.x86 + +: tib-exception-list-offset ( -- n ) 0 bootstrap-cells ; +: tib-stack-base-offset ( -- n ) 1 bootstrap-cells ; +: tib-stack-limit-offset ( -- n ) 2 bootstrap-cells ; + +: jit-save-tib ( -- ) + tib-exception-list-offset [] tib-segment PUSH + tib-stack-base-offset [] tib-segment PUSH + tib-stack-limit-offset [] tib-segment PUSH ; + +: jit-restore-tib ( -- ) + tib-stack-limit-offset [] tib-segment POP + tib-stack-base-offset [] tib-segment POP + tib-exception-list-offset [] tib-segment POP ; + +:: jit-update-tib ( ctx-reg -- ) + ! There's a redundant load here because we're not allowed + ! to clobber ctx-reg. Clobbers tib-temp. + ! Save callstack base in TIB + tib-temp ctx-reg context-callstack-seg-offset [+] MOV + tib-temp tib-temp segment-end-offset [+] MOV + tib-stack-base-offset [] tib-temp tib-segment MOV + ! Save callstack limit in TIB + tib-temp ctx-reg context-callstack-seg-offset [+] MOV + tib-temp tib-temp segment-start-offset [+] MOV + tib-stack-limit-offset [] tib-temp tib-segment MOV ; diff --git a/basis/cpu/x86/winnt/bootstrap.factor b/basis/cpu/x86/winnt/bootstrap.factor deleted file mode 100644 index b81c1eb604..0000000000 --- a/basis/cpu/x86/winnt/bootstrap.factor +++ /dev/null @@ -1,32 +0,0 @@ -! Copyright (C) 2010 Slava Pestov. -! See http://factorcode.org/license.txt for BSD license. -USING: bootstrap.image.private compiler.constants -cpu.x86.assembler cpu.x86.assembler.operands kernel layouts -locals parser sequences ; -IN: bootstrap.x86 - -: tib-exception-list-offset ( -- n ) 0 bootstrap-cells ; -: tib-stack-base-offset ( -- n ) 1 bootstrap-cells ; -: tib-stack-limit-offset ( -- n ) 2 bootstrap-cells ; - -: jit-save-tib ( -- ) - tib-exception-list-offset [] tib-segment PUSH - tib-stack-base-offset [] tib-segment PUSH - tib-stack-limit-offset [] tib-segment PUSH ; - -: jit-restore-tib ( -- ) - tib-stack-limit-offset [] tib-segment POP - tib-stack-base-offset [] tib-segment POP - tib-exception-list-offset [] tib-segment POP ; - -:: jit-update-tib ( ctx-reg -- ) - ! There's a redundant load here because we're not allowed - ! to clobber ctx-reg. Clobbers tib-temp. - ! Save callstack base in TIB - tib-temp ctx-reg context-callstack-seg-offset [+] MOV - tib-temp tib-temp segment-end-offset [+] MOV - tib-stack-base-offset [] tib-temp tib-segment MOV - ! Save callstack limit in TIB - tib-temp ctx-reg context-callstack-seg-offset [+] MOV - tib-temp tib-temp segment-start-offset [+] MOV - tib-stack-limit-offset [] tib-temp tib-segment MOV ; diff --git a/basis/db/postgresql/ffi/ffi.factor b/basis/db/postgresql/ffi/ffi.factor index 99078ca85d..2dd7e193b7 100644 --- a/basis/db/postgresql/ffi/ffi.factor +++ b/basis/db/postgresql/ffi/ffi.factor @@ -6,7 +6,7 @@ alien.libraries ; IN: db.postgresql.ffi << "postgresql" { - { [ os winnt? ] [ "libpq.dll" ] } + { [ os windows? ] [ "libpq.dll" ] } { [ os macosx? ] [ "libpq.dylib" ] } { [ os unix? ] [ "libpq.so" ] } } cond cdecl add-library >> diff --git a/basis/db/sqlite/ffi/ffi.factor b/basis/db/sqlite/ffi/ffi.factor index b5f9020ce9..14b56a7035 100644 --- a/basis/db/sqlite/ffi/ffi.factor +++ b/basis/db/sqlite/ffi/ffi.factor @@ -7,7 +7,7 @@ system combinators alien.c-types alien.libraries ; IN: db.sqlite.ffi << "sqlite" { - { [ os winnt? ] [ "sqlite3.dll" ] } + { [ os windows? ] [ "sqlite3.dll" ] } { [ os macosx? ] [ "/usr/lib/libsqlite3.dylib" ] } { [ os unix? ] [ "libsqlite3.so" ] } } cond cdecl add-library >> diff --git a/basis/environment/environment-docs.factor b/basis/environment/environment-docs.factor index 7e08a78920..6f913c1a93 100644 --- a/basis/environment/environment-docs.factor +++ b/basis/environment/environment-docs.factor @@ -62,7 +62,6 @@ HELP: unset-os-env ARTICLE: "environment" "Environment variables" "The " { $vocab-link "environment" } " vocabulary interfaces to the platform-dependent mechanism for setting environment variables." $nl -"Windows CE has no concept of environment variables, so these words are undefined on that platform." $nl "Reading environment variables:" { $subsections os-env diff --git a/basis/environment/environment-tests.factor b/basis/environment/environment-tests.factor index 3717303175..f7c609bd28 100644 --- a/basis/environment/environment-tests.factor +++ b/basis/environment/environment-tests.factor @@ -4,26 +4,24 @@ USING: kernel namespaces prettyprint system tools.test environment strings sequences ; IN: environment.tests -os wince? [ - [ ] [ os-envs . ] unit-test +[ ] [ os-envs . ] unit-test - os unix? [ - [ ] [ os-envs "envs" set ] unit-test - [ ] [ { { "A" "B" } } set-os-envs ] unit-test - [ "B" ] [ "A" os-env ] unit-test - [ ] [ "envs" get set-os-envs ] unit-test - [ t ] [ os-envs "envs" get = ] unit-test - ] when +os unix? [ + [ ] [ os-envs "envs" set ] unit-test + [ ] [ { { "A" "B" } } set-os-envs ] unit-test + [ "B" ] [ "A" os-env ] unit-test + [ ] [ "envs" get set-os-envs ] unit-test + [ t ] [ os-envs "envs" get = ] unit-test +] when - [ ] [ "factor-test-key-1" unset-os-env ] unit-test - [ ] [ "ps3" "factor-test-key-1" set-os-env ] unit-test - [ "ps3" ] [ "factor-test-key-1" os-env ] unit-test - [ ] [ "factor-test-key-1" unset-os-env ] unit-test - [ f ] [ "factor-test-key-1" os-env ] unit-test +[ ] [ "factor-test-key-1" unset-os-env ] unit-test +[ ] [ "ps3" "factor-test-key-1" set-os-env ] unit-test +[ "ps3" ] [ "factor-test-key-1" os-env ] unit-test +[ ] [ "factor-test-key-1" unset-os-env ] unit-test +[ f ] [ "factor-test-key-1" os-env ] unit-test - [ ] [ - 32766 CHAR: a "factor-test-key-long" set-os-env - ] unit-test - [ 32766 ] [ "factor-test-key-long" os-env length ] unit-test - [ ] [ "factor-test-key-long" unset-os-env ] unit-test -] unless +[ ] [ + 32766 CHAR: a "factor-test-key-long" set-os-env +] unit-test +[ 32766 ] [ "factor-test-key-long" os-env length ] unit-test +[ ] [ "factor-test-key-long" unset-os-env ] unit-test diff --git a/basis/environment/environment.factor b/basis/environment/environment.factor index ccdbd66d96..c196cff57a 100644 --- a/basis/environment/environment.factor +++ b/basis/environment/environment.factor @@ -22,8 +22,7 @@ HOOK: (set-os-envs) os ( seq -- ) { { [ os unix? ] [ "environment.unix" require ] } - { [ os winnt? ] [ "environment.winnt" require ] } - { [ os wince? ] [ ] } + { [ os windows? ] [ "environment.windows" require ] } } cond [ diff --git a/basis/environment/windows/authors.txt b/basis/environment/windows/authors.txt new file mode 100644 index 0000000000..b4bd0e7b35 --- /dev/null +++ b/basis/environment/windows/authors.txt @@ -0,0 +1 @@ +Doug Coleman \ No newline at end of file diff --git a/basis/environment/windows/platforms.txt b/basis/environment/windows/platforms.txt new file mode 100644 index 0000000000..8e1a55995e --- /dev/null +++ b/basis/environment/windows/platforms.txt @@ -0,0 +1 @@ +windows diff --git a/basis/environment/windows/summary.txt b/basis/environment/windows/summary.txt new file mode 100644 index 0000000000..905970977f --- /dev/null +++ b/basis/environment/windows/summary.txt @@ -0,0 +1 @@ +Windows environment variables implementation diff --git a/basis/environment/windows/windows.factor b/basis/environment/windows/windows.factor new file mode 100644 index 0000000000..ae12482e95 --- /dev/null +++ b/basis/environment/windows/windows.factor @@ -0,0 +1,33 @@ +! Copyright (C) 2008 Doug Coleman. +! See http://factorcode.org/license.txt for BSD license. +USING: alien.strings fry io.encodings.utf16n kernel +splitting windows windows.kernel32 windows.types system +environment alien.data sequences windows.errors +io.streams.memory io.encodings io specialized-arrays ; +SPECIALIZED-ARRAY: TCHAR +IN: environment.windows + +M: windows os-env ( key -- value ) + MAX_UNICODE_PATH TCHAR + [ dup length GetEnvironmentVariable ] keep over 0 = [ + 2drop f + ] [ + nip utf16n alien>string + ] if ; + +M: windows set-os-env ( value key -- ) + swap SetEnvironmentVariable win32-error=0/f ; + +M: windows unset-os-env ( key -- ) + f SetEnvironmentVariable 0 = [ + GetLastError ERROR_ENVVAR_NOT_FOUND = + [ win32-error ] unless + ] when ; + +M: windows (os-envs) ( -- seq ) + GetEnvironmentStrings [ + [ + utf16n decode-input + [ "\0" read-until drop dup empty? not ] [ ] produce nip + ] with-input-stream* + ] [ FreeEnvironmentStrings win32-error=0/f ] bi ; diff --git a/basis/environment/winnt/authors.txt b/basis/environment/winnt/authors.txt deleted file mode 100644 index b4bd0e7b35..0000000000 --- a/basis/environment/winnt/authors.txt +++ /dev/null @@ -1 +0,0 @@ -Doug Coleman \ No newline at end of file diff --git a/basis/environment/winnt/platforms.txt b/basis/environment/winnt/platforms.txt deleted file mode 100644 index 205e64323d..0000000000 --- a/basis/environment/winnt/platforms.txt +++ /dev/null @@ -1 +0,0 @@ -winnt diff --git a/basis/environment/winnt/summary.txt b/basis/environment/winnt/summary.txt deleted file mode 100644 index 905970977f..0000000000 --- a/basis/environment/winnt/summary.txt +++ /dev/null @@ -1 +0,0 @@ -Windows environment variables implementation diff --git a/basis/environment/winnt/winnt.factor b/basis/environment/winnt/winnt.factor deleted file mode 100644 index 894415ace8..0000000000 --- a/basis/environment/winnt/winnt.factor +++ /dev/null @@ -1,33 +0,0 @@ -! Copyright (C) 2008 Doug Coleman. -! See http://factorcode.org/license.txt for BSD license. -USING: alien.strings fry io.encodings.utf16n kernel -splitting windows windows.kernel32 windows.types system -environment alien.data sequences windows.errors -io.streams.memory io.encodings io specialized-arrays ; -SPECIALIZED-ARRAY: TCHAR -IN: environment.winnt - -M: winnt os-env ( key -- value ) - MAX_UNICODE_PATH TCHAR - [ dup length GetEnvironmentVariable ] keep over 0 = [ - 2drop f - ] [ - nip utf16n alien>string - ] if ; - -M: winnt set-os-env ( value key -- ) - swap SetEnvironmentVariable win32-error=0/f ; - -M: winnt unset-os-env ( key -- ) - f SetEnvironmentVariable 0 = [ - GetLastError ERROR_ENVVAR_NOT_FOUND = - [ win32-error ] unless - ] when ; - -M: winnt (os-envs) ( -- seq ) - GetEnvironmentStrings [ - [ - utf16n decode-input - [ "\0" read-until drop dup empty? not ] [ ] produce nip - ] with-input-stream* - ] [ FreeEnvironmentStrings win32-error=0/f ] bi ; diff --git a/basis/game/input/dinput/platforms.txt b/basis/game/input/dinput/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/game/input/dinput/platforms.txt +++ b/basis/game/input/dinput/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/game/input/xinput/platforms.txt b/basis/game/input/xinput/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/game/input/xinput/platforms.txt +++ b/basis/game/input/xinput/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/gdk/ffi/ffi.factor b/basis/gdk/ffi/ffi.factor index 689193a8d9..ce5a40f878 100644 --- a/basis/gdk/ffi/ffi.factor +++ b/basis/gdk/ffi/ffi.factor @@ -15,7 +15,7 @@ LIBRARY: gdk << "gdk" { - { [ os winnt? ] [ "libgdk-win32-2.0-0.dll" cdecl add-library ] } + { [ os windows? ] [ "libgdk-win32-2.0-0.dll" cdecl add-library ] } { [ os unix? ] [ drop ] } } cond >> diff --git a/basis/gdk/pixbuf/ffi/ffi.factor b/basis/gdk/pixbuf/ffi/ffi.factor index d60da8fbc0..d37afcdc21 100644 --- a/basis/gdk/pixbuf/ffi/ffi.factor +++ b/basis/gdk/pixbuf/ffi/ffi.factor @@ -14,7 +14,7 @@ LIBRARY: gdk.pixbuf << "gdk.pixbuf" { - { [ os winnt? ] [ "libgdk_pixbuf-2.0-0.dll" cdecl add-library ] } + { [ os windows? ] [ "libgdk_pixbuf-2.0-0.dll" cdecl add-library ] } { [ os unix? ] [ drop ] } } cond >> diff --git a/basis/gio/ffi/ffi.factor b/basis/gio/ffi/ffi.factor index 3eb09c5105..6e82dec098 100644 --- a/basis/gio/ffi/ffi.factor +++ b/basis/gio/ffi/ffi.factor @@ -12,7 +12,7 @@ LIBRARY: gio << "gio" { - { [ os winnt? ] [ "libgio-2.0-0.dll" cdecl add-library ] } + { [ os windows? ] [ "libgio-2.0-0.dll" cdecl add-library ] } { [ os unix? ] [ drop ] } } cond >> diff --git a/basis/glib/ffi/ffi.factor b/basis/glib/ffi/ffi.factor index 30f681203e..f3fa1fc9f4 100644 --- a/basis/glib/ffi/ffi.factor +++ b/basis/glib/ffi/ffi.factor @@ -10,7 +10,7 @@ LIBRARY: glib << "glib" { - { [ os winnt? ] [ "libglib-2.0-0.dll" cdecl add-library ] } + { [ os windows? ] [ "libglib-2.0-0.dll" cdecl add-library ] } { [ os macosx? ] [ "/opt/local/lib/libglib-2.0.0.dylib" cdecl add-library ] } { [ os unix? ] [ drop ] } } cond diff --git a/basis/gmodule/ffi/ffi.factor b/basis/gmodule/ffi/ffi.factor index c90fce8085..912cd3cff0 100644 --- a/basis/gmodule/ffi/ffi.factor +++ b/basis/gmodule/ffi/ffi.factor @@ -12,7 +12,7 @@ LIBRARY: gmodule << "gmodule" { - { [ os winnt? ] [ "libgmodule-2.0-0.dll" cdecl add-library ] } + { [ os windows? ] [ "libgmodule-2.0-0.dll" cdecl add-library ] } { [ os macosx? ] [ drop ] } { [ os unix? ] [ "libgmodule-2.0.so" cdecl add-library ] } } cond diff --git a/basis/gobject/ffi/ffi.factor b/basis/gobject/ffi/ffi.factor index c9d9c21af8..38ff1789c8 100644 --- a/basis/gobject/ffi/ffi.factor +++ b/basis/gobject/ffi/ffi.factor @@ -15,7 +15,7 @@ LIBRARY: gobject << "gobject" { - { [ os winnt? ] [ "libobject-2.0-0.dll" cdecl add-library ] } + { [ os windows? ] [ "libobject-2.0-0.dll" cdecl add-library ] } { [ os unix? ] [ drop ] } } cond >> diff --git a/basis/gtk/ffi/ffi.factor b/basis/gtk/ffi/ffi.factor index a2d6e7be32..7da6cebd0f 100644 --- a/basis/gtk/ffi/ffi.factor +++ b/basis/gtk/ffi/ffi.factor @@ -15,7 +15,7 @@ LIBRARY: gtk << "gtk" { - { [ os winnt? ] [ "libgtk-win32-2.0-0.dll" cdecl add-library ] } + { [ os windows? ] [ "libgtk-win32-2.0-0.dll" cdecl add-library ] } { [ os unix? ] [ drop ] } } cond >> diff --git a/basis/gtk/gl/ffi/ffi.factor b/basis/gtk/gl/ffi/ffi.factor index e901c5bb2f..748da7617f 100644 --- a/basis/gtk/gl/ffi/ffi.factor +++ b/basis/gtk/gl/ffi/ffi.factor @@ -13,7 +13,7 @@ LIBRARY: gtk.gl << "gtk.gl" { - { [ os winnt? ] [ drop ] } + { [ os windows? ] [ drop ] } { [ os macosx? ] [ drop ] } { [ os unix? ] [ "libgtkglext-x11-1.0.so" cdecl add-library ] } } cond diff --git a/basis/io/backend/windows/windows.factor b/basis/io/backend/windows/windows.factor index 7f9c42d13b..3423ac1c93 100755 --- a/basis/io/backend/windows/windows.factor +++ b/basis/io/backend/windows/windows.factor @@ -5,4 +5,4 @@ IN: io.backend.windows "io.files.windows" require -winnt set-io-backend +windows set-io-backend diff --git a/basis/io/directories/directories-docs.factor b/basis/io/directories/directories-docs.factor index 6370fdb90d..056b1c8396 100644 --- a/basis/io/directories/directories-docs.factor +++ b/basis/io/directories/directories-docs.factor @@ -5,13 +5,11 @@ IN: io.directories HELP: cwd { $values { "path" "a pathname string" } } { $description "Outputs the current working directory of the Factor process." } -{ $errors "Windows CE has no concept of “current directory”, so this word throws an error there." } { $notes "User code should use the value of the " { $link current-directory } " variable instead." } ; HELP: cd { $values { "path" "a pathname string" } } { $description "Changes the current working directory of the Factor process." } -{ $errors "Windows CE has no concept of “current directory”, so this word throws an error there." } { $notes "User code should use " { $link with-directory } " or " { $link set-current-directory } " instead." } ; { cd cwd current-directory set-current-directory with-directory } related-words diff --git a/basis/io/files/info/windows/windows.factor b/basis/io/files/info/windows/windows.factor index bf055f327b..417a2353c2 100755 --- a/basis/io/files/info/windows/windows.factor +++ b/basis/io/files/info/windows/windows.factor @@ -141,7 +141,7 @@ ERROR: not-absolute-path ; PRIVATE> -M: winnt file-system-info ( path -- file-system-info ) +M: windows file-system-info ( path -- file-system-info ) normalize-path root-directory (file-system-info) ; CONSTANT: names-buf-length 16384 @@ -174,7 +174,7 @@ CONSTANT: names-buf-length 16384 ] ] [ '[ _ FindVolumeClose win32-error=0/f ] ] bi [ ] cleanup ; -M: winnt file-systems ( -- array ) +M: windows file-systems ( -- array ) find-volumes [ volume>paths ] map concat [ [ (file-system-info) ] diff --git a/basis/io/files/windows/windows.factor b/basis/io/files/windows/windows.factor index afadf08494..4d184bb309 100755 --- a/basis/io/files/windows/windows.factor +++ b/basis/io/files/windows/windows.factor @@ -70,7 +70,7 @@ C: io-callback [ (make-overlapped) ] dip handle>> ptr>> [ >>offset ] when* ; -M: winnt FileArgs-overlapped ( port -- overlapped ) +M: windows FileArgs-overlapped ( port -- overlapped ) make-overlapped ; : ( handle existing -- handle ) @@ -81,7 +81,7 @@ SYMBOL: master-completion-port : ( -- handle ) INVALID_HANDLE_VALUE f ; -M: winnt add-completion ( win32-handle -- win32-handle ) +M: windows add-completion ( win32-handle -- win32-handle ) dup handle>> master-completion-port get-global drop ; : eof? ( error -- ? ) @@ -121,10 +121,10 @@ M: winnt add-completion ( win32-handle -- win32-handle ) M: win32-handle cancel-operation [ handle>> CancelIo win32-error=0/f ] unless-disposed ; -M: winnt io-multiplex ( nanos -- ) +M: windows io-multiplex ( nanos -- ) handle-overlapped [ 0 io-multiplex ] when ; -M: winnt init-io ( -- ) +M: windows init-io ( -- ) master-completion-port set-global H{ } clone pending-overlapped set-global ; @@ -138,9 +138,9 @@ ERROR: seek-before-start n ; : set-seek-ptr ( n handle -- ) [ dup 0 < [ seek-before-start ] when ] dip ptr<< ; -M: winnt tell-handle ( handle -- n ) ptr>> ; +M: windows tell-handle ( handle -- n ) ptr>> ; -M: winnt seek-handle ( n seek-type handle -- ) +M: windows seek-handle ( n seek-type handle -- ) swap { { seek-absolute [ set-seek-ptr ] } { seek-relative [ [ ptr>> + ] keep set-seek-ptr ] } @@ -185,7 +185,7 @@ M: winnt seek-handle ( n seek-type handle -- ) [ lpOverlapped>> ] } cleave ; -M: winnt (wait-to-write) +M: windows (wait-to-write) [ [ make-FileArgs dup setup-write WriteFile ] [ wait-for-file ] @@ -196,7 +196,7 @@ M: winnt (wait-to-write) : finish-read ( n port -- ) [ update-file-ptr ] [ buffer>> n>buffer ] 2bi ; -M: winnt (wait-to-read) ( port -- ) +M: windows (wait-to-read) ( port -- ) [ [ make-FileArgs dup setup-read ReadFile ] [ wait-for-file ] @@ -206,7 +206,7 @@ M: winnt (wait-to-read) ( port -- ) : console-app? ( -- ? ) GetConsoleWindow >boolean ; -M: winnt init-stdio +M: windows init-stdio console-app? [ init-c-stdio ] [ null-reader null-writer null-writer set-stdio ] if ; @@ -296,17 +296,17 @@ SYMBOLS: +read-only+ +hidden+ +system+ [ timestamp>FILETIME ] tri@ SetFileTime win32-error=0/f ; -M: winnt cwd +M: windows cwd MAX_UNICODE_PATH dup [ GetCurrentDirectory win32-error=0/f ] keep utf16n alien>string ; -M: winnt cd +M: windows cd SetCurrentDirectory win32-error=0/f ; CONSTANT: unicode-prefix "\\\\?\\" -M: winnt root-directory? ( path -- ? ) +M: windows root-directory? ( path -- ? ) { { [ dup empty? ] [ drop f ] } { [ dup [ path-separator? ] all? ] [ drop t ] } @@ -331,7 +331,7 @@ TR: normalize-separators "/" "\\" ; PRIVATE> -M: winnt normalize-path ( string -- string' ) +M: windows normalize-path ( string -- string' ) dup unc-path? [ normalize-separators ] [ @@ -340,7 +340,7 @@ M: winnt normalize-path ( string -- string' ) prepend-prefix ] if ; -M: winnt CreateFile-flags ( DWORD -- DWORD ) +M: windows CreateFile-flags ( DWORD -- DWORD ) FILE_FLAG_OVERLAPPED bitor ; -M: winnt open-append +M: windows open-append [ dup windows-file-size ] [ drop 0 ] recover [ (open-append) ] dip >>ptr ; -M: winnt home +M: windows home { [ "HOMEDRIVE" os-env "HOMEPATH" os-env append-path ] [ "USERPROFILE" os-env ] diff --git a/basis/io/launcher/launcher-docs.factor b/basis/io/launcher/launcher-docs.factor index 0e7c11b6e4..e496797f6b 100644 --- a/basis/io/launcher/launcher-docs.factor +++ b/basis/io/launcher/launcher-docs.factor @@ -23,7 +23,7 @@ $nl "The default value is " { $link +append-environment+ } "." ; ARTICLE: "io.launcher.redirection" "Input/output redirection" -"On all operating systems except for Windows CE, the default input/output/error streams can be redirected." +"On all operating systems, the default input/output/error streams can be redirected." $nl "To specify redirection, set the " { $snippet "stdin" } ", " { $snippet "stdout" } " and " { $snippet "stderr" } " slots of a " { $link process } " to one of the following values:" { $list diff --git a/basis/io/launcher/windows/windows.factor b/basis/io/launcher/windows/windows.factor index 4a84064c33..47aeb0c712 100755 --- a/basis/io/launcher/windows/windows.factor +++ b/basis/io/launcher/windows/windows.factor @@ -77,27 +77,16 @@ TUPLE: CreateProcess-args [ drop f ] } case ; -: app-name/cmd-line ( process -- app-name cmd-line ) - command>> dup string? [ - " " split1 - ] [ - unclip swap join-arguments - ] if ; - : cmd-line ( process -- cmd-line ) command>> dup string? [ join-arguments ] unless ; -: fill-lpApplicationName ( process args -- process args ) - over app-name/cmd-line - [ >>lpApplicationName ] [ >>lpCommandLine ] bi* ; - : fill-lpCommandLine ( process args -- process args ) over cmd-line >>lpCommandLine ; : fill-dwCreateFlags ( process args -- process args ) 0 pick pass-environment? [ CREATE_UNICODE_ENVIRONMENT bitor ] when - pick detached>> os winnt? and [ DETACHED_PROCESS bitor ] when + pick detached>> os windows? and [ DETACHED_PROCESS bitor ] when pick lookup-priority [ bitor ] when* >>dwCreateFlags ; @@ -114,13 +103,9 @@ TUPLE: CreateProcess-args : fill-startup-info ( process args -- process args ) dup lpStartupInfo>> STARTF_USESTDHANDLES >>dwFlags drop ; -HOOK: fill-redirection io-backend ( process args -- ) - -M: wince fill-redirection 2drop ; - : make-CreateProcess-args ( process -- args ) default-CreateProcess-args - os wince? [ fill-lpApplicationName ] [ fill-lpCommandLine ] if + fill-lpCommandLine fill-dwCreateFlags fill-lpEnvironment fill-startup-info @@ -137,18 +122,6 @@ M: launch-error error. "Launch descriptor:" print nl process>> . ; -M: windows run-process* ( process -- handle ) - [ - [ - current-directory get absolute-path cd - - dup make-CreateProcess-args - [ fill-redirection ] keep - dup call-CreateProcess - lpProcessInformation>> - ] with-destructors - ] [ launch-error ] recover ; - M: windows kill-process* ( handle -- ) hProcess>> 255 TerminateProcess win32-error=0/f ; @@ -270,9 +243,21 @@ M: windows wait-for-processes ( -- ? ) OPEN_EXISTING redirect STD_INPUT_HANDLE GetStdHandle or ; - -M: winnt fill-redirection ( process args -- ) + +: fill-redirection ( process args -- ) dup lpStartupInfo>> [ [ redirect-stdout ] dip hStdOutput<< ] [ [ redirect-stderr ] dip hStdError<< ] [ [ redirect-stdin ] dip hStdInput<< ] 3tri ; + +M: windows run-process* ( process -- handle ) + [ + [ + current-directory get absolute-path cd + + dup make-CreateProcess-args + [ fill-redirection ] keep + dup call-CreateProcess + lpProcessInformation>> + ] with-destructors + ] [ launch-error ] recover ; diff --git a/basis/io/mmap/mmap.factor b/basis/io/mmap/mmap.factor index 5f35278b05..73125d8f7b 100644 --- a/basis/io/mmap/mmap.factor +++ b/basis/io/mmap/mmap.factor @@ -60,5 +60,5 @@ PRIVATE> { { [ os unix? ] [ "io.mmap.unix" require ] } - { [ os winnt? ] [ "io.mmap.windows" require ] } + { [ os windows? ] [ "io.mmap.windows" require ] } } cond diff --git a/basis/io/monitors/monitors-docs.factor b/basis/io/monitors/monitors-docs.factor index 6347a979a6..8cb6069927 100644 --- a/basis/io/monitors/monitors-docs.factor +++ b/basis/io/monitors/monitors-docs.factor @@ -91,8 +91,7 @@ $nl "Factor uses " { $snippet "kqueue" } " to implement monitors on BSD." $nl "The " { $snippet "kqueue" } " system is limited to monitoring individual files and directories. Monitoring a directory only notifies of files being added and removed to the directory itself, not of changes to file contents." -{ $heading "Windows CE" } -"Windows CE does not support monitors." ; +; ARTICLE: "io.monitors" "File system change monitors" "File system change monitors listen for changes to file names, attributes and contents under a specified directory. They can optionally be recursive, in which case subdirectories are also monitored." diff --git a/basis/io/monitors/monitors-tests.factor b/basis/io/monitors/monitors-tests.factor index d084416030..666de2e1b6 100644 --- a/basis/io/monitors/monitors-tests.factor +++ b/basis/io/monitors/monitors-tests.factor @@ -5,7 +5,7 @@ io.files.temp io.directories io.directories.hierarchy io.pathnames accessors concurrency.promises ; IN: io.monitors.tests -os { winnt linux macosx } member? [ +os { windows linux macosx } member? [ [ [ "monitor-test" temp-file delete-tree ] ignore-errors diff --git a/basis/io/monitors/windows/platforms.txt b/basis/io/monitors/windows/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/io/monitors/windows/platforms.txt +++ b/basis/io/monitors/windows/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/io/monitors/windows/windows.factor b/basis/io/monitors/windows/windows.factor index 43b3ac7ef4..f5d659ef4f 100644 --- a/basis/io/monitors/windows/windows.factor +++ b/basis/io/monitors/windows/windows.factor @@ -89,7 +89,7 @@ TUPLE: win32-monitor < monitor port ; [ dup fill-queue (fill-queue-thread) ] [ dup already-disposed? [ 2drop ] [ rethrow ] if ] recover ; -M:: winnt (monitor) ( path recursive? mailbox -- monitor ) +M:: windows (monitor) ( path recursive? mailbox -- monitor ) [ path normalize-path mailbox win32-monitor new-monitor path open-directory \ win32-monitor-port diff --git a/basis/io/pipes/windows/platforms.txt b/basis/io/pipes/windows/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/io/pipes/windows/platforms.txt +++ b/basis/io/pipes/windows/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/io/pipes/windows/windows.factor b/basis/io/pipes/windows/windows.factor index ea906de966..7a87df65e8 100644 --- a/basis/io/pipes/windows/windows.factor +++ b/basis/io/pipes/windows/windows.factor @@ -39,7 +39,7 @@ IN: io.pipes.windows nano-count # ] "" make ; -M: winnt (pipe) ( -- pipe ) +M: windows (pipe) ( -- pipe ) [ unique-pipe-name [ create-named-pipe ] [ open-other-end ] bi diff --git a/basis/io/sockets/windows/windows.factor b/basis/io/sockets/windows/windows.factor index aea8016156..359826003f 100755 --- a/basis/io/sockets/windows/windows.factor +++ b/basis/io/sockets/windows/windows.factor @@ -89,7 +89,7 @@ M: windows (raw) ( addrspec -- handle ) : malloc-int ( n -- alien ) int malloc-byte-array ; inline -M: winnt WSASocket-flags ( -- DWORD ) +M: windows WSASocket-flags ( -- DWORD ) WSA_FLAG_OVERLAPPED ; : get-ConnectEx-ptr ( socket -- void* ) @@ -251,7 +251,7 @@ TUPLE: WSARecvFrom-args port tri memcpy ] bi ; inline -M: winnt (receive) ( datagram -- packet addrspec ) +M: windows (receive) ( datagram -- packet addrspec ) [ [ call-WSARecvFrom ] @@ -295,7 +295,7 @@ TUPLE: WSASendTo-args port [ lpCompletionRoutine>> ] } cleave WSASendTo socket-error* ; inline -M: winnt (send) ( packet addrspec datagram -- ) +M: windows (send) ( packet addrspec datagram -- ) [ [ call-WSASendTo ] diff --git a/basis/openssl/libcrypto/libcrypto.factor b/basis/openssl/libcrypto/libcrypto.factor index fb39a8e51b..4ab59b7ad6 100644 --- a/basis/openssl/libcrypto/libcrypto.factor +++ b/basis/openssl/libcrypto/libcrypto.factor @@ -14,7 +14,7 @@ IN: openssl.libcrypto { { [ os openbsd? ] [ ] } ! VM is linked with it { [ os netbsd? ] [ ] } - { [ os winnt? ] [ "libcrypto" "libeay32.dll" cdecl add-library ] } + { [ os windows? ] [ "libcrypto" "libeay32.dll" cdecl add-library ] } { [ os macosx? ] [ "libcrypto" "libcrypto.dylib" cdecl add-library ] } { [ os unix? ] [ "libcrypto" "libcrypto.so" cdecl add-library ] } } cond diff --git a/basis/openssl/libssl/libssl.factor b/basis/openssl/libssl/libssl.factor index 272b1bb17e..148f12e017 100644 --- a/basis/openssl/libssl/libssl.factor +++ b/basis/openssl/libssl/libssl.factor @@ -10,7 +10,7 @@ IN: openssl.libssl << { { [ os openbsd? ] [ ] } ! VM is linked with it { [ os netbsd? ] [ ] } - { [ os winnt? ] [ "libssl" "ssleay32.dll" cdecl add-library ] } + { [ os windows? ] [ "libssl" "ssleay32.dll" cdecl add-library ] } { [ os macosx? ] [ "libssl" "libssl.dylib" cdecl add-library ] } { [ os unix? ] [ "libssl" "libssl.so" cdecl add-library ] } } cond >> diff --git a/basis/pango/cairo/ffi/ffi.factor b/basis/pango/cairo/ffi/ffi.factor index 4cb61326e2..d34df785bd 100644 --- a/basis/pango/cairo/ffi/ffi.factor +++ b/basis/pango/cairo/ffi/ffi.factor @@ -12,7 +12,7 @@ LIBRARY: pango.cairo << "pango.cairo" { - { [ os winnt? ] [ "libpangocairo-1.0-0.dll" cdecl add-library ] } + { [ os windows? ] [ "libpangocairo-1.0-0.dll" cdecl add-library ] } { [ os macosx? ] [ drop ] } { [ os unix? ] [ drop ] } } cond diff --git a/basis/pango/ffi/ffi.factor b/basis/pango/ffi/ffi.factor index fb3cb3cdbf..ef98c0ac70 100644 --- a/basis/pango/ffi/ffi.factor +++ b/basis/pango/ffi/ffi.factor @@ -13,7 +13,7 @@ LIBRARY: pango << "pango" { - { [ os winnt? ] [ "libpango-1.0-0.dll" cdecl add-library ] } + { [ os windows? ] [ "libpango-1.0-0.dll" cdecl add-library ] } { [ os unix? ] [ drop ] } } cond >> diff --git a/basis/system-info/windows/windows.factor b/basis/system-info/windows/windows.factor index d51223b69b..273461e74d 100644 --- a/basis/system-info/windows/windows.factor +++ b/basis/system-info/windows/windows.factor @@ -33,7 +33,7 @@ IN: system-info.windows : windows-minor ( -- n ) os-version-struct dwMinorVersion>> ; -M: winnt os-version ( -- obj ) +M: windows os-version ( -- obj ) os-version-struct [ dwMajorVersion>> ] [ dwMinorVersion>> ] bi 2array ; : windows-build# ( -- n ) @@ -67,7 +67,7 @@ M: winnt os-version ( -- obj ) : system-windows-directory ( -- str ) \ GetSystemWindowsDirectory get-directory ; -M: winnt cpus ( -- n ) +M: windows cpus ( -- n ) system-info dwNumberOfProcessors>> ; : memory-status ( -- MEMORYSTATUSEX ) @@ -75,25 +75,25 @@ M: winnt cpus ( -- n ) MEMORYSTATUSEX heap-size >>dwLength dup GlobalMemoryStatusEx win32-error=0/f ; -M: winnt memory-load ( -- n ) +M: windows memory-load ( -- n ) memory-status dwMemoryLoad>> ; -M: winnt physical-mem ( -- n ) +M: windows physical-mem ( -- n ) memory-status ullTotalPhys>> ; -M: winnt available-mem ( -- n ) +M: windows available-mem ( -- n ) memory-status ullAvailPhys>> ; -M: winnt total-page-file ( -- n ) +M: windows total-page-file ( -- n ) memory-status ullTotalPageFile>> ; -M: winnt available-page-file ( -- n ) +M: windows available-page-file ( -- n ) memory-status ullAvailPageFile>> ; -M: winnt total-virtual-mem ( -- n ) +M: windows total-virtual-mem ( -- n ) memory-status ullTotalVirtual>> ; -M: winnt available-virtual-mem ( -- n ) +M: windows available-virtual-mem ( -- n ) memory-status ullAvailVirtual>> ; : computer-name ( -- string ) diff --git a/basis/tools/deploy/deploy.factor b/basis/tools/deploy/deploy.factor index 94ac7e635c..d41a0bc9a3 100644 --- a/basis/tools/deploy/deploy.factor +++ b/basis/tools/deploy/deploy.factor @@ -13,6 +13,6 @@ IN: tools.deploy { { [ os macosx? ] [ "tools.deploy.macosx" ] } - { [ os winnt? ] [ "tools.deploy.windows" ] } + { [ os windows? ] [ "tools.deploy.windows" ] } { [ os unix? ] [ "tools.deploy.unix" ] } } cond require diff --git a/basis/tools/deploy/windows/windows.factor b/basis/tools/deploy/windows/windows.factor index 7fad2414fc..e3e8bee46a 100755 --- a/basis/tools/deploy/windows/windows.factor +++ b/basis/tools/deploy/windows/windows.factor @@ -28,7 +28,7 @@ CONSTANT: app-icon-resource-id "APPICON" [ binary file-contents app-icon-resource-id embed-icon-resource ] [ 2drop ] if ; -M: winnt deploy* +M: windows deploy* "resource:" [ dup deploy-config [ deploy-name get diff --git a/basis/tools/disassembler/udis/udis.factor b/basis/tools/disassembler/udis/udis.factor index 8cf885f583..fb11a5d038 100644 --- a/basis/tools/disassembler/udis/udis.factor +++ b/basis/tools/disassembler/udis/udis.factor @@ -11,7 +11,7 @@ IN: tools.disassembler.udis "libudis86" { { [ os macosx? ] [ "libudis86.0.dylib" ] } { [ os unix? ] [ "libudis86.so.0" ] } - { [ os winnt? ] [ "libudis86.dll" ] } + { [ os windows? ] [ "libudis86.dll" ] } } cond cdecl add-library >> diff --git a/basis/ui/images/images.factor b/basis/ui/images/images.factor index e5d81b8ccc..74a7be2bb1 100644 --- a/basis/ui/images/images.factor +++ b/basis/ui/images/images.factor @@ -34,7 +34,7 @@ PRIVATE> << { { [ os macosx? ] [ "images.cocoa" require ] } - { [ os winnt? ] [ "images.gdiplus" require ] } + { [ os windows? ] [ "images.gdiplus" require ] } [ "images.gtk" require ] } cond >> diff --git a/basis/windows/ddk/hid/platforms.txt b/basis/windows/ddk/hid/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/ddk/hid/platforms.txt +++ b/basis/windows/ddk/hid/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/ddk/setupapi/platforms.txt b/basis/windows/ddk/setupapi/platforms.txt index d2e9c5bf45..3646795db5 100644 --- a/basis/windows/ddk/setupapi/platforms.txt +++ b/basis/windows/ddk/setupapi/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/ddk/winusb/platforms.txt b/basis/windows/ddk/winusb/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/ddk/winusb/platforms.txt +++ b/basis/windows/ddk/winusb/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/audiodefs/platforms.txt b/basis/windows/directx/audiodefs/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/audiodefs/platforms.txt +++ b/basis/windows/directx/audiodefs/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d2d1/platforms.txt b/basis/windows/directx/d2d1/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d2d1/platforms.txt +++ b/basis/windows/directx/d2d1/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d2dbasetypes/platforms.txt b/basis/windows/directx/d2dbasetypes/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d2dbasetypes/platforms.txt +++ b/basis/windows/directx/d2dbasetypes/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d2derr/platforms.txt b/basis/windows/directx/d2derr/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d2derr/platforms.txt +++ b/basis/windows/directx/d2derr/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3d10/platforms.txt b/basis/windows/directx/d3d10/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3d10/platforms.txt +++ b/basis/windows/directx/d3d10/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3d10_1/platforms.txt b/basis/windows/directx/d3d10_1/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3d10_1/platforms.txt +++ b/basis/windows/directx/d3d10_1/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3d10_1shader/platforms.txt b/basis/windows/directx/d3d10_1shader/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3d10_1shader/platforms.txt +++ b/basis/windows/directx/d3d10_1shader/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3d10effect/platforms.txt b/basis/windows/directx/d3d10effect/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3d10effect/platforms.txt +++ b/basis/windows/directx/d3d10effect/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3d10misc/platforms.txt b/basis/windows/directx/d3d10misc/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3d10misc/platforms.txt +++ b/basis/windows/directx/d3d10misc/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3d10shader/platforms.txt b/basis/windows/directx/d3d10shader/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3d10shader/platforms.txt +++ b/basis/windows/directx/d3d10shader/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3d11/platforms.txt b/basis/windows/directx/d3d11/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3d11/platforms.txt +++ b/basis/windows/directx/d3d11/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3d11shader/platforms.txt b/basis/windows/directx/d3d11shader/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3d11shader/platforms.txt +++ b/basis/windows/directx/d3d11shader/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3d9/platforms.txt b/basis/windows/directx/d3d9/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3d9/platforms.txt +++ b/basis/windows/directx/d3d9/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3d9caps/platforms.txt b/basis/windows/directx/d3d9caps/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3d9caps/platforms.txt +++ b/basis/windows/directx/d3d9caps/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3d9types/platforms.txt b/basis/windows/directx/d3d9types/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3d9types/platforms.txt +++ b/basis/windows/directx/d3d9types/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dcommon/platforms.txt b/basis/windows/directx/d3dcommon/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dcommon/platforms.txt +++ b/basis/windows/directx/d3dcommon/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dcompiler/platforms.txt b/basis/windows/directx/d3dcompiler/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dcompiler/platforms.txt +++ b/basis/windows/directx/d3dcompiler/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dcsx/platforms.txt b/basis/windows/directx/d3dcsx/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dcsx/platforms.txt +++ b/basis/windows/directx/d3dcsx/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx10/platforms.txt b/basis/windows/directx/d3dx10/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx10/platforms.txt +++ b/basis/windows/directx/d3dx10/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx10async/platforms.txt b/basis/windows/directx/d3dx10async/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx10async/platforms.txt +++ b/basis/windows/directx/d3dx10async/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx10core/platforms.txt b/basis/windows/directx/d3dx10core/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx10core/platforms.txt +++ b/basis/windows/directx/d3dx10core/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx10math/platforms.txt b/basis/windows/directx/d3dx10math/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx10math/platforms.txt +++ b/basis/windows/directx/d3dx10math/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx10mesh/platforms.txt b/basis/windows/directx/d3dx10mesh/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx10mesh/platforms.txt +++ b/basis/windows/directx/d3dx10mesh/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx10tex/platforms.txt b/basis/windows/directx/d3dx10tex/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx10tex/platforms.txt +++ b/basis/windows/directx/d3dx10tex/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx11/platforms.txt b/basis/windows/directx/d3dx11/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx11/platforms.txt +++ b/basis/windows/directx/d3dx11/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx11async/platforms.txt b/basis/windows/directx/d3dx11async/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx11async/platforms.txt +++ b/basis/windows/directx/d3dx11async/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx11core/platforms.txt b/basis/windows/directx/d3dx11core/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx11core/platforms.txt +++ b/basis/windows/directx/d3dx11core/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx11tex/platforms.txt b/basis/windows/directx/d3dx11tex/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx11tex/platforms.txt +++ b/basis/windows/directx/d3dx11tex/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx9/platforms.txt b/basis/windows/directx/d3dx9/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx9/platforms.txt +++ b/basis/windows/directx/d3dx9/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx9anim/platforms.txt b/basis/windows/directx/d3dx9anim/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx9anim/platforms.txt +++ b/basis/windows/directx/d3dx9anim/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx9core/platforms.txt b/basis/windows/directx/d3dx9core/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx9core/platforms.txt +++ b/basis/windows/directx/d3dx9core/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx9effect/platforms.txt b/basis/windows/directx/d3dx9effect/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx9effect/platforms.txt +++ b/basis/windows/directx/d3dx9effect/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx9math/platforms.txt b/basis/windows/directx/d3dx9math/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx9math/platforms.txt +++ b/basis/windows/directx/d3dx9math/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx9mesh/platforms.txt b/basis/windows/directx/d3dx9mesh/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx9mesh/platforms.txt +++ b/basis/windows/directx/d3dx9mesh/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx9shader/platforms.txt b/basis/windows/directx/d3dx9shader/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx9shader/platforms.txt +++ b/basis/windows/directx/d3dx9shader/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx9shape/platforms.txt b/basis/windows/directx/d3dx9shape/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx9shape/platforms.txt +++ b/basis/windows/directx/d3dx9shape/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx9tex/platforms.txt b/basis/windows/directx/d3dx9tex/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx9tex/platforms.txt +++ b/basis/windows/directx/d3dx9tex/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/d3dx9xof/platforms.txt b/basis/windows/directx/d3dx9xof/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/d3dx9xof/platforms.txt +++ b/basis/windows/directx/d3dx9xof/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/dcommon/platforms.txt b/basis/windows/directx/dcommon/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/dcommon/platforms.txt +++ b/basis/windows/directx/dcommon/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/dinput/constants/platforms.txt b/basis/windows/directx/dinput/constants/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/dinput/constants/platforms.txt +++ b/basis/windows/directx/dinput/constants/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/dinput/platforms.txt b/basis/windows/directx/dinput/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/dinput/platforms.txt +++ b/basis/windows/directx/dinput/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/dwrite/platforms.txt b/basis/windows/directx/dwrite/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/dwrite/platforms.txt +++ b/basis/windows/directx/dwrite/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/dxfile/platforms.txt b/basis/windows/directx/dxfile/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/dxfile/platforms.txt +++ b/basis/windows/directx/dxfile/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/dxgi/platforms.txt b/basis/windows/directx/dxgi/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/dxgi/platforms.txt +++ b/basis/windows/directx/dxgi/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/dxgiformat/platforms.txt b/basis/windows/directx/dxgiformat/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/dxgiformat/platforms.txt +++ b/basis/windows/directx/dxgiformat/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/dxgitype/platforms.txt b/basis/windows/directx/dxgitype/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/dxgitype/platforms.txt +++ b/basis/windows/directx/dxgitype/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/x3daudio/platforms.txt b/basis/windows/directx/x3daudio/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/x3daudio/platforms.txt +++ b/basis/windows/directx/x3daudio/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/xact3/platforms.txt b/basis/windows/directx/xact3/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/xact3/platforms.txt +++ b/basis/windows/directx/xact3/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/xapo/platforms.txt b/basis/windows/directx/xapo/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/xapo/platforms.txt +++ b/basis/windows/directx/xapo/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/xapofx/platforms.txt b/basis/windows/directx/xapofx/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/xapofx/platforms.txt +++ b/basis/windows/directx/xapofx/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/xaudio2/platforms.txt b/basis/windows/directx/xaudio2/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/xaudio2/platforms.txt +++ b/basis/windows/directx/xaudio2/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/xaudio2fx/platforms.txt b/basis/windows/directx/xaudio2fx/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/xaudio2fx/platforms.txt +++ b/basis/windows/directx/xaudio2fx/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/directx/xinput/platforms.txt b/basis/windows/directx/xinput/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/directx/xinput/platforms.txt +++ b/basis/windows/directx/xinput/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/dwmapi/platforms.txt b/basis/windows/dwmapi/platforms.txt index 205e64323d..8e1a55995e 100644 --- a/basis/windows/dwmapi/platforms.txt +++ b/basis/windows/dwmapi/platforms.txt @@ -1 +1 @@ -winnt +windows diff --git a/basis/windows/summary.txt b/basis/windows/summary.txt index cfe1d889f1..6439dcab0c 100644 --- a/basis/windows/summary.txt +++ b/basis/windows/summary.txt @@ -1 +1 @@ -Microsoft Windows CE/XP/Vista API bindings +Microsoft Windows XP/Vista/7 API bindings diff --git a/build-support/factor.cmd b/build-support/factor.cmd index 4a3d48654c..0a44ed730c 100644 --- a/build-support/factor.cmd +++ b/build-support/factor.cmd @@ -17,19 +17,19 @@ call cl 2>&1 | find "x86" >nul if not errorlevel 1 ( echo x86-32 cl.exe detected. set _target=x86-32 - set _bootimage=boot.winnt-x86.32.image + set _bootimage=boot.windows-x86.32.image ) else ( call cl 2>&1 | find "x64" >nul if not errorlevel 1 ( echo x86-64 cl.exe detected. set _target=x86-64 - set _bootimage=boot.winnt-x86.64.image + set _bootimage=boot.windows-x86.64.image ) else goto nocl ) if %_bootimage_version%==clean ( - set _git_branch=clean-winnt-%_target% - set _bootimage_path=clean/winnt-%_target% + set _git_branch=clean-windows-%_target% + set _bootimage_path=clean/windows-%_target% ) else ( set _git_branch=master set _bootimage_path=latest @@ -81,7 +81,7 @@ echo If latest is specified, then the working copy is updated to the echo upstream "master" branch and the boot image corresponding to the echo most recent factor build is downloaded. This is the default. echo If clean is specified, then the working copy is updated to the -echo upstream "clean-winnt-*" branch corresponding to the current +echo upstream "clean-windows-*" branch corresponding to the current echo platform and the corresponding boot image is downloaded. goto :EOF diff --git a/build-support/factor.sh b/build-support/factor.sh index 3ddab4ba3d..3a7601370d 100755 --- a/build-support/factor.sh +++ b/build-support/factor.sh @@ -178,10 +178,10 @@ find_os() { uname_s=`uname -s` check_ret uname case $uname_s in - CYGWIN_NT-5.2-WOW64) OS=winnt;; - *CYGWIN_NT*) OS=winnt;; - *CYGWIN*) OS=winnt;; - MINGW32*) OS=winnt;; + CYGWIN_NT-5.2-WOW64) OS=windows;; + *CYGWIN_NT*) OS=windows;; + *CYGWIN*) OS=windows;; + MINGW32*) OS=windows;; *darwin*) OS=macosx;; *Darwin*) OS=macosx;; *linux*) OS=linux;; @@ -251,14 +251,14 @@ find_word_size() { set_factor_binary() { case $OS in - winnt) FACTOR_BINARY=factor.com;; + windows) FACTOR_BINARY=factor.com;; *) FACTOR_BINARY=factor;; esac } set_factor_library() { case $OS in - winnt) FACTOR_LIBRARY=factor.dll;; + windows) FACTOR_LIBRARY=factor.dll;; macosx) FACTOR_LIBRARY=libfactor.dylib;; *) FACTOR_LIBRARY=libfactor.a;; esac @@ -308,12 +308,12 @@ set_build_info() { elif [[ $OS == linux && $ARCH == ppc ]] ; then MAKE_IMAGE_TARGET=linux-ppc.32 MAKE_TARGET=linux-ppc-32 - elif [[ $OS == winnt && $ARCH == x86 && $WORD == 64 ]] ; then - MAKE_IMAGE_TARGET=winnt-x86.64 - MAKE_TARGET=winnt-x86-64 - elif [[ $OS == winnt && $ARCH == x86 && $WORD == 32 ]] ; then - MAKE_IMAGE_TARGET=winnt-x86.32 - MAKE_TARGET=winnt-x86-32 + elif [[ $OS == windows && $ARCH == x86 && $WORD == 64 ]] ; then + MAKE_IMAGE_TARGET=windows-x86.64 + MAKE_TARGET=windows-x86-64 + elif [[ $OS == windows && $ARCH == x86 && $WORD == 32 ]] ; then + MAKE_IMAGE_TARGET=windows-x86.32 + MAKE_TARGET=windows-x86-32 elif [[ $ARCH == x86 && $WORD == 64 ]] ; then MAKE_IMAGE_TARGET=unix-x86.64 MAKE_TARGET=$OS-x86-64 @@ -337,7 +337,6 @@ parse_build_info() { if [[ $OS == linux && $ARCH == ppc ]] ; then WORD=32; fi if [[ $OS == linux && $ARCH == arm ]] ; then WORD=32; fi if [[ $OS == macosx && $ARCH == ppc ]] ; then WORD=32; fi - if [[ $OS == wince && $ARCH == arm ]] ; then WORD=32; fi $ECHO "OS=$OS" $ECHO "ARCH=$ARCH" @@ -411,14 +410,14 @@ cd_factor() { set_copy() { case $OS in - winnt) COPY=cp;; + windows) COPY=cp;; *) COPY=cp;; esac } set_delete() { case $OS in - winnt) DELETE=rm;; + windows) DELETE=rm;; *) DELETE=rm;; esac } diff --git a/core/alien/alien-docs.factor b/core/alien/alien-docs.factor index 44903b7a95..a4c88a49b0 100644 --- a/core/alien/alien-docs.factor +++ b/core/alien/alien-docs.factor @@ -314,7 +314,6 @@ ARTICLE: "embedding" "Embedding Factor into C applications" { $table { "OS" "Library name" "Shared?" } { "Windows XP/Vista" { $snippet "factor.dll" } "Yes" } - ! { "Windows CE" { $snippet "factor-ce.dll" } "Yes" } { "Mac OS X" { $snippet "libfactor.dylib" } "Yes" } { "Other Unix" { $snippet "libfactor.a" } "No" } } diff --git a/core/alien/strings/strings-docs.factor b/core/alien/strings/strings-docs.factor index 335ab73328..9caa02bb5b 100644 --- a/core/alien/strings/strings-docs.factor +++ b/core/alien/strings/strings-docs.factor @@ -15,6 +15,6 @@ HELP: string>symbol { $values { "str/seq" { $or string sequence } } { "alien" alien } } { $description "Converts the string to a format which is a valid symbol name for the Factor VM's compiled code linker. By performing this conversion ahead of time, the image loader can run without allocating memory." $nl -"On Windows CE, symbols are represented as UCS2 strings, and on all other platforms they are ASCII strings." } ; +"On all platforms, symbols are ASCII strings." } ; ABOUT: "c-strings" diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor index bf2ec4defc..5d1a166022 100755 --- a/core/bootstrap/primitives.factor +++ b/core/bootstrap/primitives.factor @@ -18,9 +18,9 @@ H{ } clone sub-primitives set "vocab:bootstrap/syntax.factor" parse-file architecture get { - { "winnt-x86.32" "x86/32/winnt" } + { "windows-x86.32" "x86/32/windows" } + { "windows-x86.64" "x86/64/windows" } { "unix-x86.32" "x86/32/unix" } - { "winnt-x86.64" "x86/64/winnt" } { "unix-x86.64" "x86/64/unix" } { "linux-ppc.32" "ppc/32/linux" } { "linux-ppc.64" "ppc/64/linux" } diff --git a/core/system/system-docs.factor b/core/system/system-docs.factor index b14cb90a68..5668acd66a 100644 --- a/core/system/system-docs.factor +++ b/core/system/system-docs.factor @@ -43,8 +43,7 @@ ARTICLE: "os" "Operating system detection" openbsd netbsd solaris - wince - winnt + windows } "Operating system families:" { $subsections diff --git a/core/system/system.factor b/core/system/system.factor index 7f0872b464..37e1470fa7 100644 --- a/core/system/system.factor +++ b/core/system/system.factor @@ -11,9 +11,7 @@ UNION: ppc ppc.32 ppc.64 ; : cpu ( -- class ) \ cpu get-global ; foldable -SINGLETONS: winnt wince ; - -UNION: windows winnt wince ; +SINGLETON: windows SINGLETONS: freebsd netbsd openbsd solaris macosx linux ; @@ -40,8 +38,7 @@ UNION: unix bsd solaris linux haiku ; : string>os ( str -- class ) H{ - { "winnt" winnt } - { "wince" wince } + { "windows" windows } { "freebsd" freebsd } { "netbsd" netbsd } { "openbsd" openbsd } diff --git a/extra/clutter/cally/ffi/ffi.factor b/extra/clutter/cally/ffi/ffi.factor index 59c92bdba4..dc1ebe0b36 100644 --- a/extra/clutter/cally/ffi/ffi.factor +++ b/extra/clutter/cally/ffi/ffi.factor @@ -13,7 +13,7 @@ LIBRARY: clutter.cally << "clutter.cally" { - { [ os winnt? ] [ drop ] } + { [ os windows? ] [ drop ] } { [ os macosx? ] [ drop ] } { [ os unix? ] [ "libclutter-glx-1.0.so" cdecl add-library ] } } cond diff --git a/extra/clutter/cogl/ffi/ffi.factor b/extra/clutter/cogl/ffi/ffi.factor index b4752d402a..d395cc4d94 100644 --- a/extra/clutter/cogl/ffi/ffi.factor +++ b/extra/clutter/cogl/ffi/ffi.factor @@ -12,7 +12,7 @@ LIBRARY: clutter.cogl << "clutter.cogl" { - { [ os winnt? ] [ drop ] } + { [ os windows? ] [ drop ] } { [ os macosx? ] [ drop ] } { [ os unix? ] [ "libclutter-glx-1.0.so" cdecl add-library ] } } cond diff --git a/extra/clutter/ffi/ffi.factor b/extra/clutter/ffi/ffi.factor index 06ff981f65..1499e68b8e 100644 --- a/extra/clutter/ffi/ffi.factor +++ b/extra/clutter/ffi/ffi.factor @@ -15,7 +15,7 @@ LIBRARY: clutter << "clutter" { - { [ os winnt? ] [ drop ] } + { [ os windows? ] [ drop ] } { [ os macosx? ] [ drop ] } { [ os unix? ] [ "libclutter-glx-1.0.so" cdecl add-library ] } } cond diff --git a/extra/clutter/gtk/ffi/ffi.factor b/extra/clutter/gtk/ffi/ffi.factor index 26b3820b27..7371405803 100644 --- a/extra/clutter/gtk/ffi/ffi.factor +++ b/extra/clutter/gtk/ffi/ffi.factor @@ -13,7 +13,7 @@ LIBRARY: clutter.gtk << "clutter.gtk" { - { [ os winnt? ] [ drop ] } + { [ os windows? ] [ drop ] } { [ os macosx? ] [ drop ] } { [ os unix? ] [ "libclutter-gtk-1.0.so" cdecl add-library ] } } cond diff --git a/extra/clutter/json/ffi/ffi.factor b/extra/clutter/json/ffi/ffi.factor index ea562c1f3d..4d228027b6 100644 --- a/extra/clutter/json/ffi/ffi.factor +++ b/extra/clutter/json/ffi/ffi.factor @@ -13,7 +13,7 @@ LIBRARY: clutter.json << "clutter.json" { - { [ os winnt? ] [ drop ] } + { [ os windows? ] [ drop ] } { [ os macosx? ] [ drop ] } { [ os unix? ] [ "libclutter-glx-1.0.so" cdecl add-library ] } } cond diff --git a/extra/curses/ffi/ffi.factor b/extra/curses/ffi/ffi.factor index 85bc15d34b..9937c9797a 100644 --- a/extra/curses/ffi/ffi.factor +++ b/extra/curses/ffi/ffi.factor @@ -5,7 +5,7 @@ alien.syntax classes.struct combinators kernel math system unix.types ; IN: curses.ffi << "curses" { - { [ os winnt? ] [ "libcurses.dll" ] } + { [ os windows? ] [ "libcurses.dll" ] } { [ os macosx? ] [ "libcurses.dylib" ] } { [ os unix? ] [ "libncursesw.so" ] } } cond cdecl add-library >> diff --git a/extra/gdbm/ffi/ffi.factor b/extra/gdbm/ffi/ffi.factor index 300740c4d9..0283431d5c 100755 --- a/extra/gdbm/ffi/ffi.factor +++ b/extra/gdbm/ffi/ffi.factor @@ -7,7 +7,7 @@ IN: gdbm.ffi << "libgdbm" { { [ os macosx? ] [ "libgdbm.dylib" ] } { [ os unix? ] [ "libgdbm.so" ] } - { [ os winnt? ] [ "gdbm3.dll" ] } + { [ os windows? ] [ "gdbm3.dll" ] } } cond cdecl add-library >> LIBRARY: libgdbm diff --git a/extra/google-tech-talk/google-tech-talk.factor b/extra/google-tech-talk/google-tech-talk.factor index d5b88c244b..5eac3bd45d 100644 --- a/extra/google-tech-talk/google-tech-talk.factor +++ b/extra/google-tech-talk/google-tech-talk.factor @@ -379,7 +379,7 @@ CONSTANT: google-slides { $slide "Example: environment variables" { $vocab-link "environment" } "Hooks are generic words which dispatch on dynamically-scoped variables" - { "Implemented in an OS-specific way: " { $vocab-link "environment.unix" } ", " { $vocab-link "environment.winnt" } } + { "Implemented in an OS-specific way: " { $vocab-link "environment.unix" } ", " { $vocab-link "environment.windows" } } } { $slide "Example: environment variables" "Implementations use C FFI" diff --git a/extra/graphviz/ffi/ffi.factor b/extra/graphviz/ffi/ffi.factor index f6d84aef42..0447ff1b8b 100644 --- a/extra/graphviz/ffi/ffi.factor +++ b/extra/graphviz/ffi/ffi.factor @@ -12,14 +12,14 @@ IN: graphviz.ffi "libgraph" { { [ os macosx? ] [ "libgraph.dylib" ] } { [ os unix? ] [ "libgraph.so" ] } - { [ os winnt? ] [ "graph.dll" ] } + { [ os windows? ] [ "graph.dll" ] } } cond cdecl add-library "libgvc" { { [ os macosx? ] [ "libgvc.dylib" ] } { [ os unix? ] [ "libgvc.so" ] } - { [ os winnt? ] [ "gvc.dll" ] } + { [ os windows? ] [ "gvc.dll" ] } } cond cdecl add-library >> diff --git a/extra/gstreamer/base/ffi/ffi.factor b/extra/gstreamer/base/ffi/ffi.factor index 227c9c98e1..3f2f156e9c 100644 --- a/extra/gstreamer/base/ffi/ffi.factor +++ b/extra/gstreamer/base/ffi/ffi.factor @@ -12,7 +12,7 @@ LIBRARY: gstreamer.base << "gstreamer.base" { - { [ os winnt? ] [ drop ] } + { [ os windows? ] [ drop ] } { [ os macosx? ] [ drop ] } { [ os unix? ] [ "libgstbase-0.10.so" cdecl add-library ] } } cond diff --git a/extra/gstreamer/controller/ffi/ffi.factor b/extra/gstreamer/controller/ffi/ffi.factor index b0eb87be0b..4f38260190 100644 --- a/extra/gstreamer/controller/ffi/ffi.factor +++ b/extra/gstreamer/controller/ffi/ffi.factor @@ -12,7 +12,7 @@ LIBRARY: gstreamer.controller << "gstreamer.controller" { - { [ os winnt? ] [ drop ] } + { [ os windows? ] [ drop ] } { [ os macosx? ] [ drop ] } { [ os unix? ] [ "libgstcontroller-0.10.so" cdecl add-library ] } } cond diff --git a/extra/gstreamer/ffi/ffi.factor b/extra/gstreamer/ffi/ffi.factor index c6fd4c6c9c..cdfd5d4329 100644 --- a/extra/gstreamer/ffi/ffi.factor +++ b/extra/gstreamer/ffi/ffi.factor @@ -14,7 +14,7 @@ LIBRARY: gstreamer << "gstreamer" { - { [ os winnt? ] [ drop ] } + { [ os windows? ] [ drop ] } { [ os macosx? ] [ drop ] } { [ os unix? ] [ "libgstreamer-0.10.so" cdecl add-library ] } } cond diff --git a/extra/gstreamer/net/ffi/ffi.factor b/extra/gstreamer/net/ffi/ffi.factor index 859c6c2656..21b1d68e33 100644 --- a/extra/gstreamer/net/ffi/ffi.factor +++ b/extra/gstreamer/net/ffi/ffi.factor @@ -12,7 +12,7 @@ LIBRARY: gstreamer.net << "gstreamer.net" { - { [ os winnt? ] [ drop ] } + { [ os windows? ] [ drop ] } { [ os macosx? ] [ drop ] } { [ os unix? ] [ "libgstnet-0.10.so" cdecl add-library ] } } cond diff --git a/extra/io/files/trash/trash.factor b/extra/io/files/trash/trash.factor index 2539fc9e2a..8049adb4fe 100644 --- a/extra/io/files/trash/trash.factor +++ b/extra/io/files/trash/trash.factor @@ -10,6 +10,6 @@ HOOK: send-to-trash os ( path -- ) { { [ os macosx? ] [ "io.files.trash.macosx" ] } { [ os unix? ] [ "io.files.trash.unix" ] } - { [ os winnt? ] [ "io.files.trash.windows" ] } + { [ os windows? ] [ "io.files.trash.windows" ] } } cond require diff --git a/extra/javascriptcore/ffi/ffi.factor b/extra/javascriptcore/ffi/ffi.factor index 02847e2fa8..377a0d4006 100644 --- a/extra/javascriptcore/ffi/ffi.factor +++ b/extra/javascriptcore/ffi/ffi.factor @@ -10,7 +10,7 @@ IN: javascriptcore.ffi { [ os macosx? ] [ "/System/Library/Frameworks/JavaScriptCore.framework/Versions/Current/JavaScriptCore" cdecl add-library ] } - ! { [ os winnt? ] [ "javascriptcore.dll" ] } + ! { [ os windows? ] [ "javascriptcore.dll" ] } ! { [ os unix? ] [ "libsqlite3.so" ] } [ drop ] } cond diff --git a/extra/mason/child/child-tests.factor b/extra/mason/child/child-tests.factor index 34f9c10103..d12bd0ec0d 100644 --- a/extra/mason/child/child-tests.factor +++ b/extra/mason/child/child-tests.factor @@ -4,7 +4,7 @@ sequences system ; [ { "nmake" "/f" "nmakefile" "x86-32" } ] [ [ - winnt target-os set + windows target-os set x86.32 target-cpu set make-cmd ] with-scope @@ -18,9 +18,9 @@ sequences system ; ] with-scope ] unit-test -[ { "./factor.com" "-i=boot.winnt-x86.32.image" "-no-user-init" } ] [ +[ { "./factor.com" "-i=boot.windows-x86.32.image" "-no-user-init" } ] [ [ - winnt target-os set + windows target-os set x86.32 target-cpu set boot-cmd ] with-scope diff --git a/extra/mason/child/child.factor b/extra/mason/child/child.factor index 4191d2e25a..2da6194657 100644 --- a/extra/mason/child/child.factor +++ b/extra/mason/child/child.factor @@ -18,7 +18,7 @@ IN: mason.child : make-cmd ( -- args ) { - { [ target-os get winnt = ] [ nmake-cmd ] } + { [ target-os get windows = ] [ nmake-cmd ] } [ gnu-make-cmd ] } cond ; @@ -32,7 +32,7 @@ IN: mason.child ] with-directory ; : factor-vm ( -- string ) - target-os get winnt = "./factor.com" "./factor" ? ; + target-os get windows = "./factor.com" "./factor" ? ; : boot-cmd ( -- cmd ) [ diff --git a/extra/mason/release/archive/archive.factor b/extra/mason/release/archive/archive.factor index ceec84e475..fb269f9c9c 100644 --- a/extra/mason/release/archive/archive.factor +++ b/extra/mason/release/archive/archive.factor @@ -11,7 +11,7 @@ IN: mason.release.archive : extension ( os -- extension ) { - { "winnt" [ ".zip" ] } + { "windows" [ ".zip" ] } { "macosx" [ ".dmg" ] } [ drop ".tar.gz" ] } case ; @@ -35,7 +35,7 @@ IN: mason.release.archive : make-archive ( archive-name -- ) target-os get { - { "winnt" [ make-windows-archive ] } + { "windows" [ make-windows-archive ] } { "macosx" [ make-macosx-archive ] } [ drop make-unix-archive ] } case ; diff --git a/extra/ogg/ogg.factor b/extra/ogg/ogg.factor index 51e4621476..bcc62b0e70 100644 --- a/extra/ogg/ogg.factor +++ b/extra/ogg/ogg.factor @@ -15,7 +15,7 @@ IN: ogg << "ogg" { - { [ os winnt? ] [ "ogg.dll" ] } + { [ os windows? ] [ "ogg.dll" ] } { [ os macosx? ] [ "libogg.0.dylib" ] } { [ os unix? ] [ "libogg.so" ] } } cond cdecl add-library diff --git a/extra/ogg/theora/theora.factor b/extra/ogg/theora/theora.factor index 82f4a7db51..5e1155c19a 100644 --- a/extra/ogg/theora/theora.factor +++ b/extra/ogg/theora/theora.factor @@ -16,13 +16,13 @@ IN: ogg.theora << "theoradec" { - { [ os winnt? ] [ "theoradec.dll" ] } + { [ os windows? ] [ "theoradec.dll" ] } { [ os macosx? ] [ "libtheoradec.0.dylib" ] } { [ os unix? ] [ "libtheoradec.so" ] } } cond cdecl add-library "theoraenc" { - { [ os winnt? ] [ "theoraenc.dll" ] } + { [ os windows? ] [ "theoraenc.dll" ] } { [ os macosx? ] [ "libtheoraenc.0.dylib" ] } { [ os unix? ] [ "libtheoraenc.so" ] } } cond cdecl add-library diff --git a/extra/ogg/vorbis/vorbis.factor b/extra/ogg/vorbis/vorbis.factor index 3cefbeebec..150bfc9719 100644 --- a/extra/ogg/vorbis/vorbis.factor +++ b/extra/ogg/vorbis/vorbis.factor @@ -16,7 +16,7 @@ IN: ogg.vorbis << "vorbis" { - { [ os winnt? ] [ "vorbis.dll" ] } + { [ os windows? ] [ "vorbis.dll" ] } { [ os macosx? ] [ "libvorbis.0.dylib" ] } { [ os unix? ] [ "libvorbis.so" ] } } cond cdecl add-library diff --git a/extra/webapps/mason/grids/grids.factor b/extra/webapps/mason/grids/grids.factor index dfa2cf9b4b..10add7727f 100644 --- a/extra/webapps/mason/grids/grids.factor +++ b/extra/webapps/mason/grids/grids.factor @@ -15,7 +15,7 @@ IN: webapps.mason.grids CONSTANT: oses { - { "winnt" "Windows" } + { "windows" "Windows" } { "macosx" "Mac OS X" } { "linux" "Linux" } { "freebsd" "FreeBSD" } diff --git a/extra/webapps/mason/utils/utils.factor b/extra/webapps/mason/utils/utils.factor index bffc78970a..47e2e68376 100644 --- a/extra/webapps/mason/utils/utils.factor +++ b/extra/webapps/mason/utils/utils.factor @@ -24,7 +24,7 @@ IN: webapps.mason.utils : requirements ( builder -- xml ) [ os>> { - { "winnt" "Windows XP, Windows Vista or Windows 7" } + { "windows" "Windows XP, Windows Vista or Windows 7" } { "macosx" "Mac OS X 10.5 Leopard" } { "linux" "Ubuntu Linux 9.04 (other distributions may also work)" } { "freebsd" "FreeBSD 7.1" } diff --git a/vm/os-windows-x86.32.cpp b/vm/os-windows-x86.32.cpp index 61cf9f6c4e..61d38b5900 100644 --- a/vm/os-windows-x86.32.cpp +++ b/vm/os-windows-x86.32.cpp @@ -5,7 +5,7 @@ namespace factor void factor_vm::c_to_factor_toplevel(cell quot) { - /* 32-bit Windows SEH is set up in basis/cpu/x86/32/winnt/bootstrap.factor */ + /* 32-bit Windows SEH is set up in basis/cpu/x86/32/windows/bootstrap.factor */ c_to_factor(quot); } diff --git a/vm/os-windows.hpp b/vm/os-windows.hpp index 70e05d00de..aca5eab9a8 100755 --- a/vm/os-windows.hpp +++ b/vm/os-windows.hpp @@ -49,7 +49,7 @@ typedef HANDLE THREADHANDLE; #define SNPRINTF snprintf #endif -#define FACTOR_OS_STRING "winnt" +#define FACTOR_OS_STRING "windows" #define FACTOR_DLL NULL