Windows related fixes

fbuild/lib/fbuild/builders/platform.py

@@ -76,7 +76,7 @@ def guess_platform(ctx, arch=None):
                 arch = platform.system().lower()
             else:
                 arch = stdout.decode('utf-8').strip().lower()
-                if arch == 'windowsnt' : arch = 'windows'
+                if arch == 'windowsnt' or 'mingw' in arch: arch = 'windows'
 
     try:
         architecture = archmap[arch]

fbuild/lib/fbuild/context.py

@@ -2,14 +2,14 @@
 import signal
 import threading
 import time
+import subprocess
 
 import fbuild
 import fbuild.builders.platform
 import fbuild.console
 import fbuild.db.database
 import fbuild.path
 import fbuild.sched
-import fbuild.subprocess.killableprocess
 
 # ------------------------------------------------------------------------------
 
@@ -94,8 +94,8 @@ def execute(self, cmd, msg1=None, msg2=None, *,
             stderr_quieter=None,
             input=None,
             stdin=None,
-            stdout=fbuild.subprocess.PIPE,
-            stderr=fbuild.subprocess.PIPE,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
             timeout=None,
             env=None,
             runtime_libpaths=None,
@@ -177,7 +177,7 @@ def timeout_function(p):
 
         starttime = time.time()
         try:
-            p = fbuild.subprocess.killableprocess.Popen(cmd,
+            p = subprocess.Popen(cmd,
                 stdin=fbuild.subprocess.PIPE if input else stdin,
                 stdout=stdout,
                 stderr=stderr,

fbuild/lib/fbuild/path.py

@@ -31,7 +31,7 @@ def __new__(cls, *paths):
         s = ''
         for path in paths:
             if isinstance(path, str):
-                s = os.path.join(s, path.replace('/', os.sep))
+                s = os.path.join(s, path.replace('/', os.sep)).replace('"','')
             else:
                 s = os.path.join(s, *path)