Merge pull request #2139 from willend/main

Improved error-handling in mccode.py

Author: willend

docs/pull_request_template.md

@@ -1,7 +1,7 @@
 ### Free-form text area
 _Please describe what your PR is adding in terms of features or bugfixes:_
 
-Underline that only _relevant parts_ of the checklist needs to be filled in.
+
 
 --------------
 ### Development OS / boundary conditions
@@ -46,7 +46,7 @@ _Please describe what OS you developed and tested your additions on, and if any
   * [ ] I have indicated the issue number here:
   * [ ] I have added documentation for the fix and possible side effects
 * ### My contribution contains something else
-  * [x] Explanation is added in free form text above or below the checklist
+  * [ ] Explanation is added in free form text above or below the checklist
 
 --------------
 

tools/Python/mcrun/mccode.py

@@ -154,10 +154,14 @@ def x_path(file):
                 trace='-t'
                 if options.no_trace:
                    trace='--no-trace'
-                if self.options.I is not None:
-                    Process(mccode_bin_abspath).run([trace, '-o', self.cpath, self.path, '-I', self.options.I])
-                else:
-                    Process(mccode_bin_abspath).run([trace, '-o', self.cpath, self.path])
+                try:
+                    if self.options.I is not None:
+                        Process(mccode_bin_abspath).run([trace, '-o', self.cpath, self.path, '-I', self.options.I])
+                    else:
+                        Process(mccode_bin_abspath).run([trace, '-o', self.cpath, self.path])
+                except:
+                    LOG.error('Code generation failed for instrument %s using code generator %s', self.path, mccode_bin_abspath)
+                    exit(-1)
             else:
                 if self.options.I is not None:
                     Process(mccode_bin_abspath).run(['--no-main', '-o', self.cpath, self.path, '-I', self.options.I])
@@ -314,16 +318,23 @@ def x_path(file):
         # Lint or compile?
         if options.c_lint is not None:
             args = [self.cpath] + lexer.split(mccode_config.compilation['CLINTERFLAGS'])
-            Process(lexer.quote(mccode_config.compilation['CLINT'])).run(args)
-            LOG.info('End of linting %s', self.cpath)
+            try:
+                Process(lexer.quote(mccode_config.compilation['CLINT'])).run(args)
+                LOG.info('End of linting %s', self.cpath)
+            except:
+                LOG.error('Linting failed on %s - you may need to install the %s package?', self.cpath, mccode_config.compilation['CLINT'])
             exit()
         else:
             # Final assembly of compiler commandline
             if not "cl.exe" in mccode_config.compilation['CC'].lower():
                 args = ['-o', self.binpath, self.cpath] + lexer.split(cflags)
             else:
                 args = [self.cpath] + lexer.split(cflags)
-            Process(lexer.quote(options.cc)).run(args)
+            try:
+                Process(lexer.quote(options.cc)).run(args)
+            except:
+                LOG.error('Compilation failed for %s using compiler %s', self.cpath, options.cc)
+                exit(-1)
 
     def run(self, pipe=False, extra_opts=None, override_mpi=None):
         ''' Run simulation '''