From 7d3350d0bbcb7468fecfd9abffb3fe9f34c0c6c3 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Tue, 25 Apr 2017 00:31:44 +1000
Subject: rtemstoolkit: Move host support access into a separate module.

Moving the host support into a module lets it get used where options
is not being used.
---
 rtemstoolkit/windows.py | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'rtemstoolkit/windows.py')

diff --git a/rtemstoolkit/windows.py b/rtemstoolkit/windows.py
index 2c08258..8f51069 100644
--- a/rtemstoolkit/windows.py
+++ b/rtemstoolkit/windows.py
@@ -1,6 +1,6 @@
 #
 # RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2010-2016 Chris Johns (chrisj@rtems.org)
+# Copyright 2010-2017 Chris Johns (chrisj@rtems.org)
 # All rights reserved.
 #
 # This file is part of the RTEMS Tools package in 'rtems-tools'.
@@ -32,7 +32,6 @@
 # Windows specific support and overrides.
 #
 
-import pprint
 import os
 
 #
@@ -46,7 +45,14 @@ except (ValueError, SystemError):
     import error
     import execute
 
-def load():
+def cpus():
+    if os.environ.has_key('NUMBER_OF_PROCESSORS'):
+        ncpus = int(os.environ['NUMBER_OF_PROCESSORS'])
+    else:
+        ncpus = 1
+    return ncpus
+
+def overrides():
     # Default to the native Windows Python.
     uname = 'win32'
     system = 'mingw32'
@@ -76,10 +82,7 @@ def load():
         except:
             pass
 
-    if os.environ.has_key('NUMBER_OF_PROCESSORS'):
-        ncpus = os.environ['NUMBER_OF_PROCESSORS']
-    else:
-        ncpus = '1'
+    ncpus = '%d' % (cpus())
 
     defines = {
         '_ncpus':         ('none',    'none',     ncpus),
@@ -140,4 +143,6 @@ def load():
     return defines
 
 if __name__ == '__main__':
-    pprint.pprint(load())
+    import pprint
+    pprint.pprint(cpus())
+    pprint.pprint(overrides())
-- 
cgit v1.2.3