Merge pull request #569 from veselypeta/petr/565/fail-build-on-spec-generate

[UR] Fail build on spec generate

Author: veselypeta

scripts/parse_specs.py

@@ -430,7 +430,7 @@ def __validate_params(d, tags):
         print("%s(%s): %s!"%(os.path.abspath(f), line_num, msg))
         print("-- Function Info --")
         print(d)
-        return False
+        raise
 
 """
     filters object by version

scripts/run.py

@@ -133,69 +133,76 @@ def main():
         'meta'   : {},
         'ref'    : {}
         }
+    
+    try:
 
-    for section in configParser.sections():
-        input['configs'].append({
-            'name'     : section,
-            'namespace': configParser.get(section,'namespace'),
-            'tags'     : {'$'+key : configParser.get(section,key) for key in configParser.get(section,'tags').split(",")},
-            })
+        for section in configParser.sections():
+            input['configs'].append({
+                'name'     : section,
+                'namespace': configParser.get(section,'namespace'),
+                'tags'     : {'$'+key : configParser.get(section,key) for key in configParser.get(section,'tags').split(",")},
+                })
+
+        # phase 2: parse specs
+        for config in input['configs']:
+            specs, input['meta'], input['ref'] = parse_specs.parse(config['name'], args['ver'], config['tags'], input['meta'], input['ref'])
+            input['specs'].append(specs)
+
+        util.jsonWrite(args['api_json'], input)
 
-    # phase 2: parse specs
-    for config in input['configs']:
-        specs, input['meta'], input['ref'] = parse_specs.parse(config['name'], args['ver'], config['tags'], input['meta'], input['ref'])
-        input['specs'].append(specs)
+        # phase 3: generate files
+        if args['clean']:
+            clean()
 
-    util.jsonWrite(args['api_json'], input)
+        incpath = os.path.join("../include/")
+        srcpath = os.path.join("../source/")
+        docpath = os.path.join("../docs/")
 
-    # phase 3: generate files
-    if args['clean']:
-        clean()
+        generate_docs.prepare(docpath, args['rst'], args['html'], args['ver'])
+        generate_docs.generate_ref(docpath, input['ref'])
 
-    incpath = os.path.join("../include/")
-    srcpath = os.path.join("../source/")
-    docpath = os.path.join("../docs/")
+        for idx, specs in enumerate(input['specs']):
+            config = input['configs'][idx]
+            if args[config['name']]:
 
-    generate_docs.prepare(docpath, args['rst'], args['html'], args['ver'])
-    generate_docs.generate_ref(docpath, input['ref'])
+                generate_code.generate_api(incpath, srcpath, config['namespace'], config['tags'], args['ver'], args['rev'], specs, input['meta'])
 
-    for idx, specs in enumerate(input['specs']):
-        config = input['configs'][idx]
-        if args[config['name']]:
+                if args['rst']:
+                    generate_docs.generate_rst(docpath, config['name'], config['namespace'], config['tags'], args['ver'], args['rev'], specs, input['meta'])
 
-            generate_code.generate_api(incpath, srcpath, config['namespace'], config['tags'], args['ver'], args['rev'], specs, input['meta'])
+            if util.makeErrorCount():
+                print("\n%s Errors found during generation, stopping execution!"%util.makeErrorCount())
+                return
 
-            if args['rst']:
-                generate_docs.generate_rst(docpath, config['name'], config['namespace'], config['tags'], args['ver'], args['rev'], specs, input['meta'])
+        if args['debug']:
+            util.makoFileListWrite("generated.json")
 
-        if util.makeErrorCount():
-            print("\n%s Errors found during generation, stopping execution!"%util.makeErrorCount())
-            return
+        # phase 4: build code
+        if args['build']:
+            if not build():
+                print("\nBuild failed, stopping execution!")
+                return
 
-    if args['debug']:
-        util.makoFileListWrite("generated.json")
+        # phase 5: prep for publication of html or pdf
+        if args['html'] or args['pdf']:
+            generate_docs.generate_common(docpath, configParser.sections(), args['ver'], args['rev'])
 
-    # phase 4: build code
-    if args['build']:
-        if not build():
-            print("\nBuild failed, stopping execution!")
-            return
+        # phase 5: publish documentation
+        if args['html']:
+            generate_docs.generate_html(docpath)
 
-    # phase 5: prep for publication of html or pdf
-    if args['html'] or args['pdf']:
-        generate_docs.generate_common(docpath, configParser.sections(), args['ver'], args['rev'])
+        if args['pdf']:
+            generate_docs.generate_pdf(docpath)
 
-    # phase 5: publish documentation
-    if args['html']:
-        generate_docs.generate_html(docpath)
+        if args['update_spec']:
+            update_spec(args['update_spec'])
 
-    if args['pdf']:
-        generate_docs.generate_pdf(docpath)
+        print("\nCompleted in %.1f seconds!"%(time.time() - start))
 
-    if args['update_spec']:
-        update_spec(args['update_spec'])
+    except:
+        print("Failed to generate specification.")
+        return sys.exit(1)
 
-    print("\nCompleted in %.1f seconds!"%(time.time() - start))
 
 if __name__ == '__main__':
     main()