mason.child: run nmake on Windows

diff --git a/extra/mason/child/child-tests.factor b/extra/mason/child/child-tests.factor
index 2d5a7c663598d58781a6d63250225b164e5f4751..6fedac87bd0a154a3a2c62ab20fd759c7d62154d 100644 (file)
--- a/extra/mason/child/child-tests.factor
+++ b/extra/mason/child/child-tests.factor
@@ -1,7 +1,7 @@
 IN: mason.child.tests
 USING: mason.child mason.config tools.test namespaces io kernel sequences ;
 
-[ { "make" "winnt-x86-32" } ] [
+[ { "nmake" "/f" "nmakefile" } ] [
     [
         "winnt" target-os set
         "x86.32" target-cpu set

diff --git a/extra/mason/child/child.factor b/extra/mason/child/child.factor
index 193ac1e2123f054b46edf2b17de51d1c9aad0a20..017e4401d8ecae31e6f2bc753d8f640b9b2ef972 100644 (file)
--- a/extra/mason/child/child.factor
+++ b/extra/mason/child/child.factor
@@ -1,14 +1,17 @@
-! Copyright (C) 2008, 2009 Eduardo Cavazos, Slava Pestov.
+! Copyright (C) 2008, 2010 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays calendar combinators.short-circuit fry
 continuations debugger io.directories io.files io.launcher
 io.pathnames io.encodings.ascii kernel make mason.common mason.config
 mason.platform mason.report mason.notify namespaces sequences
-quotations macros ;
+quotations macros system combinators ;
 IN: mason.child
 
 : make-cmd ( -- args )
-    gnu-make platform 2array ;
+    {
+        { [ target-os get "winnt" = ] [ { "nmake" "/f" "nmakefile" } ] }
+        [ gnu-make platform 2array ]
+    } cond ;
 
 : make-vm ( -- )
     "factor" [