summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Script
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2003-10-22 03:15:44 (GMT)
committerSteven Knight <knight@baldmt.com>2003-10-22 03:15:44 (GMT)
commit69767c5516cfd51afc93b87746f130825f0bf831 (patch)
tree0177b25e280c6371d87d57211d667c9952a7440d /src/engine/SCons/Script
parent4618fabde17038bd961f93ceb9af6b31e778540b (diff)
downloadSCons-69767c5516cfd51afc93b87746f130825f0bf831.zip
SCons-69767c5516cfd51afc93b87746f130825f0bf831.tar.gz
SCons-69767c5516cfd51afc93b87746f130825f0bf831.tar.bz2
Really handle lack of the threading.py module when run by non-threaded Pythons.
Diffstat (limited to 'src/engine/SCons/Script')
-rw-r--r--src/engine/SCons/Script/__init__.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index 03cb6d8..a533c29 100644
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -703,6 +703,7 @@ def _main(args, parser):
SCons.Warnings._warningOut = _scons_internal_warning
SCons.Warnings.enableWarningClass(SCons.Warnings.DeprecatedWarning)
SCons.Warnings.enableWarningClass(SCons.Warnings.CorruptSConsignWarning)
+ SCons.Warnings.enableWarningClass(SCons.Warnings.NoParallelSupportWarning)
global ssoptions
ssoptions = SConscriptSettableOptions(options)
@@ -964,7 +965,12 @@ def _main(args, parser):
progress_display("scons: " + opening_message)
taskmaster = SCons.Taskmaster.Taskmaster(nodes, task_class, calc, order)
- jobs = SCons.Job.Jobs(ssoptions.get('num_jobs'), taskmaster)
+ nj = ssoptions.get('num_jobs')
+ jobs = SCons.Job.Jobs(nj, taskmaster)
+ if nj > 1 and jobs.num_jobs == 1:
+ msg = "parallel builds are unsupported by this version of Python;\n" + \
+ "\tignoring -j or num_jobs option.\n"
+ SCons.Warnings.warn(SCons.Warnings.NoParallelSupportWarning, msg)
try:
jobs.run()