Squashed commit of the following:

commit 197dbe9 Author: Doug Coleman <[email protected]> Date: Sat Sep 18 19:01:38 2010 -0500 Fix bootstrap, move privileges to windows.privileges commit 521c622 Author: Doug Coleman <[email protected]> Date: Sat Sep 18 18:26:30 2010 -0500 Hopefully fix bootstrap commit eb3f229 Author: Doug Coleman <[email protected]> Date: Sat Sep 18 18:19:05 2010 -0500 Remove wince from factor codebase commit 619d6c9 Author: Doug Coleman <[email protected]> Date: Sat Sep 18 16:07:46 2010 -0500 Remove Windows CE from vm/
factor · Sep 20, 2010 · f791c8c · f791c8c
1 parent 87ec88f
commit f791c8c
Show file tree

Hide file tree

Showing 96 changed files with 1,079 additions and 1,653 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -96,7 +96,6 @@ help:
 	@echo "macosx-ppc"
 	@echo "solaris-x86-32"
 	@echo "solaris-x86-64"
-	@echo "wince-arm"
 	@echo "winnt-x86-32"
 	@echo "winnt-x86-64"
 	@echo ""
@@ -162,9 +161,6 @@ winnt-x86-64:
 	$(MAKE) $(ALL) CONFIG=vm/Config.windows.nt.x86.64
 	$(MAKE) factor-console CONFIG=vm/Config.windows.nt.x86.64
 
-wince-arm:
-	$(MAKE) $(ALL) CONFIG=vm/Config.windows.ce.arm
-
 ifdef CONFIG
 
 macosx.app: factor

diff --git a/Nmakefile b/Nmakefile
@@ -14,18 +14,17 @@ CL_FLAGS = $(CL_FLAGS) /Zi /DFACTOR_DEBUG
 
 !IF "$(PLATFORM)" == "x86-32"
 LINK_FLAGS = $(LINK_FLAGS) /safeseh
-PLAF_DLL_OBJS = vm\os-windows-nt-x86.32.obj vm\safeseh.obj
+PLAF_DLL_OBJS = vm\os-windows-x86.32.obj vm\safeseh.obj
 !ELSEIF "$(PLATFORM)" == "x86-64"
-PLAF_DLL_OBJS = vm\os-windows-nt-x86.64.obj
+PLAF_DLL_OBJS = vm\os-windows-x86.64.obj
 !ENDIF
 
 ML_FLAGS = /nologo /safeseh
 
-EXE_OBJS = vm\main-windows-nt.obj vm\factor.res
+EXE_OBJS = vm/main-windows.obj vm\factor.res
 
 DLL_OBJS = $(PLAF_DLL_OBJS) \
 	vm\os-windows.obj \
-	vm\os-windows-nt.obj \
 	vm\aging_collector.obj \
 	vm\alien.obj \
 	vm\arrays.obj \
@@ -56,7 +55,7 @@ DLL_OBJS = $(PLAF_DLL_OBJS) \
 	vm\jit.obj \
 	vm\math.obj \
 	vm\mvm.obj \
-	vm\mvm-windows-nt.obj \
+	vm\mvm-windows.obj \
 	vm\nursery_collector.obj \
 	vm\object_start_map.obj \
 	vm\objects.obj \
@@ -68,7 +67,7 @@ DLL_OBJS = $(PLAF_DLL_OBJS) \
 	vm\to_tenured_collector.obj \
 	vm\tuples.obj \
 	vm\utilities.obj \
-        vm\vm.obj \
+	vm\vm.obj \
 	vm\words.obj
 
 .cpp.obj:

diff --git a/basis/bootstrap/io/io.factor b/basis/bootstrap/io/io.factor
@@ -6,6 +6,6 @@ IN: bootstrap.io
     "io.backend." {
         { [ "io-backend" get ] [ "io-backend" get ] }
         { [ os unix? ] [ "unix." os name>> append ] }
-        { [ os winnt? ] [ "windows.nt" ] }
+        { [ os windows? ] [ "windows" ] }
     } cond append require
 ] when
diff --git a/basis/bootstrap/stage2.factor b/basis/bootstrap/stage2.factor
@@ -72,8 +72,7 @@ SYMBOL: bootstrap-time
     (command-line) parse-command-line
 
     ! Set dll paths
-    os wince? [ "windows.ce" require ] when
-    os winnt? [ "windows.nt" require ] when
+    os windows? [ "windows" require ] when
 
     "staging" get "deploy-vocab" get or [
         "stage2: deployment mode" print

diff --git a/basis/io/backend/windows/nt/nt.factor b/basis/io/backend/windows/nt/nt.factor
diff --git a/basis/io/backend/windows/privileges/privileges-tests.factor b/basis/io/backend/windows/privileges/privileges-tests.factor
diff --git a/basis/io/backend/windows/privileges/privileges.factor b/basis/io/backend/windows/privileges/privileges.factor
diff --git a/basis/io/backend/windows/windows.factor b/basis/io/backend/windows/windows.factor
@@ -1,34 +1,8 @@
 ! Copyright (C) 2004, 2010 Mackenzie Straight, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien.c-types classes.struct destructors
-io.backend io.timeouts kernel literals windows.errors
-windows.handles windows.kernel32 vocabs.loader ;
+USING: io.backend namespaces system vocabs.loader ;
 IN: io.backend.windows
 
-HOOK: CreateFile-flags io-backend ( DWORD -- DWORD )
-HOOK: FileArgs-overlapped io-backend ( port -- overlapped/f )
-HOOK: add-completion io-backend ( port -- port )
+"io.files.windows" require
 
-TUPLE: win32-file < win32-handle ptr ;
-
-: <win32-file> ( handle -- win32-file )
-    win32-file new-win32-handle ;
-
-M: win32-file dispose
-    [ cancel-operation ] [ call-next-method ] bi ;
-
-: opened-file ( handle -- win32-file )
-    check-invalid-handle <win32-file> |dispose add-completion ;
-
-CONSTANT: share-mode
-    flags{
-        FILE_SHARE_READ
-        FILE_SHARE_WRITE
-        FILE_SHARE_DELETE
-    }
-
-: default-security-attributes ( -- obj )
-    SECURITY_ATTRIBUTES <struct>
-    SECURITY_ATTRIBUTES heap-size >>nLength ;
-
-"io.files.windows" require
+winnt set-io-backend
diff --git a/basis/io/files/info/windows/windows.factor b/basis/io/files/info/windows/windows.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: byte-arrays math io.backend io.files.info
-io.files.windows io.files.windows.nt kernel windows.kernel32
+io.files.windows kernel windows.kernel32
 windows.time windows.types windows accessors alien.c-types
 combinators generalizations system alien.strings
 io.encodings.utf16n sequences splitting windows.errors fry

diff --git a/basis/io/files/unique/windows/windows.factor b/basis/io/files/unique/windows/windows.factor
@@ -1,6 +1,5 @@
-USING: kernel system windows.kernel32 io.backend.windows
-io.files.windows io.ports windows destructors environment
-io.files.unique ;
+USING: destructors environment io.files.unique io.files.windows
+system windows.kernel32 ;
 IN: io.files.unique.windows
 
 M: windows (touch-unique-file) ( path -- )

diff --git a/basis/io/files/windows/nt/authors.txt b/basis/io/files/windows/nt/authors.txt
diff --git a/basis/io/files/windows/nt/nt.factor b/basis/io/files/windows/nt/nt.factor
diff --git a/basis/io/files/windows/nt/platforms.txt b/basis/io/files/windows/nt/platforms.txt
diff --git a/basis/io/files/windows/nt/nt-tests.factor → basis/io/files/windows/windows-tests.factor b/basis/io/files/windows/nt/nt-tests.factor → basis/io/files/windows/windows-tests.factor
@@ -1,6 +1,8 @@
+! Copyright (C) 2010 Doug Coleman.
+! See http://factorcode.org/license.txt for BSD license.
 USING: io.files io.pathnames kernel tools.test io.backend
-io.files.windows.nt splitting sequences io.pathnames.private ;
-IN: io.files.windows.nt.tests
+io.files.windows splitting sequences io.pathnames.private ;
+IN: io.files.windows.tests
 
 [ f ] [ "\\foo" absolute-path? ] unit-test
 [ t ] [ "\\\\?\\c:\\foo" absolute-path? ] unit-test