Gary Oberbrunner avatar Gary Oberbrunner committed de72c1d Merge

Merged fixes from Richard Quirk

Comments (0)

Files changed (3)

src/engine/SCons/Action.py

                  show=_null, execute=_null, chdir=_null, executor=None):
         act = self._generate(target, source, env, 0, executor)
         if act is None:
-            raise UserError("While building `%s': "
+            raise SCons.Errors.UserError("While building `%s': "
                             "Cannot deduce file extension from source files: %s"
                 % (repr(list(map(str, target))), repr(list(map(str, source)))))
         return act(target, source, env, exitstatfunc, presub,

src/engine/SCons/Conftest.py

 
     lang, suffix, msg = _lang2suffix(language)
     if msg:
-        context.Display("Cannot check for declaration %s: %s\n" % (type_name, msg))
+        context.Display("Cannot check for declaration %s: %s\n" % (symbol, msg))
         return msg
 
     src = includetext + includes 

src/engine/SCons/SConfTests.py

             assert r, "__cplusplus not declared in C++ ??"
             r = sconf.CheckDeclaration('__cplusplus', language = 'C')
             assert not r, "__cplusplus declared  in C ??"
+            r = sconf.CheckDeclaration('unknown', language = 'Unknown')
+            assert not r, "unknown language was supported ??"
         finally:
             sconf.Finish()
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.