summaryrefslogtreecommitdiff
path: root/platform_methods.py
diff options
context:
space:
mode:
authorMax Hilbrunner <mhilbrunner@users.noreply.github.com>2018-08-01 19:00:22 +0200
committerGitHub <noreply@github.com>2018-08-01 19:00:22 +0200
commit6c569c90b666c7fb773eca3948fc76ba7a160a27 (patch)
treeaa1b738695da72f5c42011f600d04bb9b24825b2 /platform_methods.py
parent3fa2404a793ab72816cbae3a9fedaf5c27c08e00 (diff)
parent5590ec67db4b0eddaf2489862b7e659c3ee4ce02 (diff)
Merge pull request #20617 from viktor-ferenczi/issue-20613
Fix Mac build
Diffstat (limited to 'platform_methods.py')
-rw-r--r--platform_methods.py26
1 files changed, 21 insertions, 5 deletions
diff --git a/platform_methods.py b/platform_methods.py
index 0e0d93d0a6..4300216427 100644
--- a/platform_methods.py
+++ b/platform_methods.py
@@ -7,6 +7,11 @@ import subprocess
# NOTE: The multiprocessing module is not compatible with SCons due to conflict on cPickle
+if sys.version_info[0] < 3:
+ JSON_SERIALIZABLE_TYPES = (bool, int, long, float, basestring)
+else:
+ JSON_SERIALIZABLE_TYPES = (bool, int, float, str)
+
def run_in_subprocess(builder_function):
@@ -17,9 +22,9 @@ def run_in_subprocess(builder_function):
target = [node.srcnode().abspath for node in target]
source = [node.srcnode().abspath for node in source]
- # Short circuit on non-Windows platforms
- if os.name != 'nt':
- return builder_function(target, source, None)
+ # Short circuit on non-Windows platforms, no need to run in subprocess
+ if sys.platform not in ('win32', 'cygwin'):
+ return builder_function(target, source, env)
# Identify module
module_name = builder_function.__module__
@@ -32,14 +37,25 @@ def run_in_subprocess(builder_function):
subprocess_env = os.environ.copy()
subprocess_env['PYTHONPATH'] = os.pathsep.join([os.getcwd()] + sys.path)
+ # Keep only JSON serializable environment items
+ filtered_env = dict(
+ (key, value)
+ for key, value in env.items()
+ if isinstance(value, JSON_SERIALIZABLE_TYPES)
+ )
+
# Save parameters
- args = (target, source, None)
+ args = (target, source, filtered_env)
data = dict(fn=function_name, args=args)
json_path = os.path.join(os.environ['TMP'], uuid.uuid4().hex + '.json')
with open(json_path, 'wt') as json_file:
json.dump(data, json_file, indent=2)
+ json_file_size = os.stat(json_path).st_size
+
+ print('Executing builder function in subprocess: '
+ 'module_path=%r, parameter_file=%r, parameter_file_size=%r, target=%r, source=%r' % (
+ module_path, json_path, json_file_size, target, source))
try:
- print('Executing builder function in subprocess: module_path=%r; data=%r' % (module_path, data))
exit_code = subprocess.call([sys.executable, module_path, json_path], env=subprocess_env)
finally:
try: