merge

Cython/Compiler/ModuleNode.py

@@ -545,11 +545,14 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
         code.putln("#endif")
 
     def generate_includes(self, env, cimported_modules, code):
-        includes = env.include_files[:]
+        includes = []
         for module in cimported_modules:
             for filename in module.include_files:
                 if filename not in includes:
                     includes.append(filename)
+        for filename in env.include_files:
+            if filename not in includes:
+                includes.append(filename)
         for filename in includes:
             code.putln('#include "%s"' % filename)
     

setup.py

@@ -29,6 +29,13 @@ try:
     sys.argv.remove("--no-cython-compile")
 except ValueError:
     try:
+        from distutils.command.build_ext import build_ext as build_ext_orig
+        class build_ext(build_ext_orig):
+            def build_extension(self, ext, *args, **kargs):
+                try:
+                    build_ext_orig.build_extension(self, ext, *args, **kargs)
+                except StandardError:
+                    print("Compilation of '%s' failed" % ext.sources[0])
         from Cython.Compiler.Main import compile
         source_root = os.path.dirname(__file__)
         compiled_modules = ["Cython.Plex.Scanners",
@@ -48,6 +55,7 @@ except ValueError:
                 print("Compilation failed")
         if extensions:
             setup_args['ext_modules'] = extensions
+            setup_args['cmdclass'] = {"build_ext" : build_ext}
     except Exception:
         print("ERROR: %s" % sys.exc_info()[1])
         print("Extension module compilation failed, using plain Python implementation")