Merge pull request #175 from nasa/devel

Changes for release 1.4 and tutorial fixes

Author: LeStarch

.dockerignore

@@ -0,0 +1,4 @@
+.git
+**.mdxml
+**/docs
+**build

Autocoders/Python/bin/codegen.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #===============================================================================
 # NAME: codegen.py
 #
@@ -50,7 +50,11 @@
 #@todo: from src.parsers import assembly_parser
 
 #Generators to produce the code
-from fprime_ac.generators import GenFactory
+try:
+    from fprime_ac.generators import GenFactory
+except ImportError as ime:
+    print("[ERROR] Cheetah templates need to be generated.\n\t", ime, file=sys.stderr)
+    sys.exit(1)
 
 # Flag to indicate verbose mode.
 VERBOSE = False
@@ -366,7 +370,7 @@ def generate_topology(the_parsed_topology_xml, xml_filename, opt):
                             else:
                                 type_name = member_type
                                 if member_type == "string":
-                                    member_elem.attrib["len"] = member.get_size()
+                                    member_elem.attrib["len"] = member_size
                             member_elem.attrib["type"] = type_name
                             members_elem.append(member_elem)
                         serializable_elem.append(members_elem)
@@ -1234,7 +1238,7 @@ def generate_dependency_file(filename, target_file, subst_path, parser, type):
 
     # verify directory exists for dependency file and is directory
     if not os.path.isdir(os.path.dirname(filename)):
-        PRINT.info("ERROR: Dependency file path %s does not exist!",os.path.dirname(full_path))
+        PRINT.info("ERROR: Dependency file path %s does not exist!",os.path.dirname(filename))
         sys.exit(-1)
 
 
@@ -1448,4 +1452,8 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    try:
+        main()
+    except Exception as exc:
+        print(exc, file=sys.stderr)
+        sys.exit(-1)

Autocoders/Python/bin/cosmosgen.py

@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/env python3
 #===============================================================================
 # NAME: gds_dictgen.py
 #
@@ -33,7 +33,11 @@
 from lxml import etree
 
 #Generators to produce the code
-from fprime_ac.generators import GenFactory
+try:
+    from fprime_ac.generators import GenFactory
+except ImportError as ime:
+    print("[ERROR] Cheetah templates need to be generated.\n\t", ime, file=sys.stderr)
+    sys.exit(1)
 
 # Needs to be initialized to create the other parsers
 CONFIG = ConfigManager.ConfigManager.getInstance()

Autocoders/Python/bin/gds_dictgen.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #===============================================================================
 # NAME: implgen.py
 #
@@ -47,7 +47,11 @@
 from fprime_ac.generators.writers import ImplHWriter
 
 #Generators to produce the code
-from fprime_ac.generators import GenFactory
+try:
+    from fprime_ac.generators import GenFactory
+except ImportError as ime:
+    print("[ERROR] Cheetah templates need to be generated.\n\t", ime, file=sys.stderr)
+    sys.exit(1)
 
 # Flag to indicate verbose mode.
 VERBOSE = False
@@ -264,7 +268,7 @@ def main():
             print("\nGenerating tests...")
         generate_impl_files(opt, component_model)
     else:
-        print("ERROR: Invalid XML found...this format not supported")
+        print("ERROR: {} is used for component XML files, not {} XML files".format(sys.argv[0], xml_type))
         sys.exit(-1)
 
     sys.exit(0)

Autocoders/Python/bin/implgen.py

@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/env python3
 #===============================================================================
 # NAME: pymod_dictgen.py
 #
@@ -35,7 +35,11 @@
 from fprime_ac.generators.writers import InstEventWriter
 
 #Generators to produce the code
-from fprime_ac.generators import GenFactory
+try:
+    from fprime_ac.generators import GenFactory
+except ImportError as ime:
+    print("[ERROR] Cheetah templates need to be generated.\n\t", ime, file=sys.stderr)
+    sys.exit(1)
 
 # Needs to be initialized to create the other parsers
 CONFIG = ConfigManager.ConfigManager.getInstance()

Autocoders/Python/bin/pymod_dictgen.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #===============================================================================
 # NAME: testgen.py
 #
@@ -53,7 +53,11 @@
 from fprime_ac.generators.writers import TestMainWriter
 
 #Generators to produce the code
-from fprime_ac.generators import GenFactory
+try:
+    from fprime_ac.generators import GenFactory
+except ImportError as ime:
+    print("[ERROR] Cheetah templates need to be generated.\n\t", ime, file=sys.stderr)
+    sys.exit(1)
 
 # Flag to indicate verbose mode.
 VERBOSE = False

Autocoders/Python/bin/run_cosmosgen.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #===============================================================================
 # NAME: TlmLayout.py
 #

Autocoders/Python/bin/testgen.py

@@ -1,4 +1,3 @@
-#!/bin/env python
 #===============================================================================
 # NAME:  AbstractGenerator.py
 #
@@ -73,7 +72,3 @@ def addVisitor(self, visitor):
 	    Method to add the visitor to a list of visitors.
 	    """
         raise Exception("AbstractFace.accept.addVisitor(v) - Implementation Error: you must supply your own concrete implementation.")
-
-
-if __name__ == '__main__':
-    pass