Browse Source

NodesetCompiler: remove unused `generate-ns0` option

Stefan Profanter 5 years ago
parent
commit
6cb5799a74

+ 1 - 4
doc/nodeset_compiler.rst

@@ -209,7 +209,7 @@ Take the previous snippet and save it to a file ``myNS.xml``. To compile this no
 
     $ python ./nodeset_compiler.py -h
     usage: nodeset_compiler.py [-h] [-e <existingNodeSetXML>] [-x <nodeSetXML>]
-                               [--generate-ns0] [--internal-headers]
+                               [--internal-headers]
                                [-b <blacklistFile>] [-i <ignoreFile>]
                                [-t <typesArray>]
                                [-v]
@@ -227,9 +227,6 @@ Take the previous snippet and save it to a file ``myNS.xml``. To compile this no
                             on the server.
       -x <nodeSetXML>, --xml <nodeSetXML>
                             NodeSet XML files with nodes that shall be generated.
-      --generate-ns0        Omit some consistency checks for bootstrapping
-                            namespace 0, create references to parents and type
-                            definitions manually
       --internal-headers    Include internal headers instead of amalgamated header
       -b <blacklistFile>, --blacklist <blacklistFile>
                             Loads a list of NodeIDs stored in blacklistFile (one

+ 0 - 1
tools/cmake/macros_public.cmake

@@ -280,7 +280,6 @@ function(ua_generate_nodeset)
     string(REPLACE "-" "_" FILE_SUFFIX ${FILE_SUFFIX})
 
     if ("${UA_GEN_NS_NAME}" STREQUAL "ns0")
-        set(GEN_NS0 "--generate-ns0")
         set(TARGET_SUFFIX "namespace")
         set(FILE_SUFFIX "0_generated")
     endif()

+ 2 - 2
tools/nodeset_compiler/backend_open62541.py

@@ -130,7 +130,7 @@ def sortNodes(nodeset):
 # Generate C Code #
 ###################
 
-def generateOpen62541Code(nodeset, outfilename, generate_ns0=False, internal_headers=False, typesArray=[]):
+def generateOpen62541Code(nodeset, outfilename, internal_headers=False, typesArray=[]):
     outfilebase = basename(outfilename)
     # Printing functions
     outfileh = codecs.open(outfilename + ".h", r"w+", encoding='utf-8')
@@ -238,7 +238,7 @@ _UA_END_DECLS
         if not node.hidden:
             writec("\n/* " + str(node.displayName) + " - " + str(node.id) + " */")
             code_global = []
-            code = generateNodeCode_begin(node, nodeset, generate_ns0, parentref, code_global)
+            code = generateNodeCode_begin(node, nodeset, parentref, code_global)
             if code is None:
                 writec("/* Ignored. No parent */")
                 nodeset.hide_node(node.id)

+ 1 - 1
tools/nodeset_compiler/backend_open62541_nodes.py

@@ -411,7 +411,7 @@ def generateSubtypeOfDefinitionCode(node):
             return generateNodeIdCode(ref.target)
     return "UA_NODEID_NULL"
 
-def generateNodeCode_begin(node, nodeset, generate_ns0, parentref, code_global):
+def generateNodeCode_begin(node, nodeset, parentref, code_global):
     code = []
     codeCleanup = []
     code.append("UA_StatusCode retVal = UA_STATUSCODE_GOOD;")

+ 1 - 6
tools/nodeset_compiler/nodeset_compiler.py

@@ -48,11 +48,6 @@ parser.add_argument('outputFile',
                     metavar='<outputFile>',
                     help='The path/basename for the <output file>.c and <output file>.h files to be generated. This will also be the function name used in the header and c-file.')
 
-parser.add_argument('--generate-ns0',
-                    action='store_true',
-                    dest="generate_ns0",
-                    help='Omit some consistency checks for bootstrapping namespace 0, create references to parents and type definitions manually')
-
 parser.add_argument('--internal-headers',
                     action='store_true',
                     dest="internal_headers",
@@ -196,7 +191,7 @@ logger.info("Generating Code for Backend: {}".format(args.backend))
 if args.backend == "open62541":
     # Create the C code with the open62541 backend of the compiler
     from backend_open62541 import generateOpen62541Code
-    generateOpen62541Code(ns, args.outputFile, args.generate_ns0, args.internal_headers, args.typesArray)
+    generateOpen62541Code(ns, args.outputFile, args.internal_headers, args.typesArray)
 elif args.backend == "graphviz":
     from backend_graphviz import generateGraphvizCode
     generateGraphvizCode(ns, filename=args.outputFile)