[JsonGen] Use same includes as StubGen

JsonGenerator/source/header_loader.py

@@ -31,6 +31,9 @@
 import ProxyStubGenerator.CppParser as CppParser
 import ProxyStubGenerator.Interface as CppInterface
 
+MODULE_FILE = "Module.h"
+IDS_FILE = "Ids.h"
+
 
 class CaseConverter:
     OBJECTS = 0
@@ -321,7 +324,7 @@ def Find(tree):
         return [], []
 
 
-def LoadInterfaceInternal(file, tree, ns, log, scanned, all = False, include_paths = []):
+def LoadInterfaceInternal(file, tree, ns, log, scanned, all, include_paths):
 
     def StripInterfaceNamespace(identifier):
         return str(identifier).replace(ns + "::", "")
@@ -1606,15 +1609,21 @@ def MaybeWarning():
 
     return schemas, []
 
-def LoadInterface(file, log, all = False, include_paths = []):
-
+def LoadInterface(file, log, all, include_paths):
     try:
         schemas = []
         includes = []
         scanned = []
 
-        tree = CppParser.ParseFiles([os.path.join(os.path.dirname(os.path.realpath(__file__)),
-                   posixpath.normpath(config.DEFAULT_DEFINITIONS_FILE)), file], config.FRAMEWORK_NAMESPACE, include_paths, log)
+        source_path = os.path.dirname(file)
+
+        files = []
+        files.append(os.path.join(os.path.dirname(os.path.realpath(__file__)), posixpath.normpath(config.DEFAULT_DEFINITIONS_FILE)))
+        files.append("@" + os.path.join(source_path, MODULE_FILE))
+        files.append("@" + os.path.join(source_path, IDS_FILE))
+        files.append(file)
+
+        tree = CppParser.ParseFiles(files, config.FRAMEWORK_NAMESPACE, include_paths, log)
 
         for ns in config.INTERFACE_NAMESPACES:
             their_schemas, their_includes = LoadInterfaceInternal(file, tree, ns, log, scanned, all, include_paths)

JsonGenerator/source/json_loader.py

@@ -1429,7 +1429,17 @@ def Scan(pairs):
 
     return [], [], temp_files
 
-def Load(log, path, if_dirs = [], cpp_if_dirs = [], include_paths = []):
+def Load(log, path, if_dirs=None, cpp_if_dirs=None, include_paths=None):
+
+    if if_dirs is None:
+        if_dirs = []
+
+    if cpp_if_dirs is None:
+        cpp_if_dirs = []
+
+    if include_paths is None:
+        include_paths = []
+
     temp_files = []
 
     if path.endswith(".h"):

ProxyStubGenerator/StubGenerator.py

@@ -63,6 +63,7 @@
 
 DEFAULT_DEFINITIONS_FILE = "default.h"
 MODULE_FILE = "Module.h"
+IDS_FILE = "Ids.h"
 
 log = Log.Log(NAME, BE_VERBOSE, SHOW_WARNINGS)
 
@@ -2835,8 +2836,7 @@ def EmitRegistration(announce_list):
                            metavar="FILE",
                            action='append',
                            default=[],
-                           nargs="*",
-                           help="include an additional C++ header file, can be used multiple times (default: include 'Module.h')")
+                           help="include an additional C++ header file, can be used multiple times")
     argparser.add_argument('-I', dest="includePaths", metavar="INCLUDE_DIR", action='append', default=[], type=str,
                            help='add an include search path, can be used multiple times')
 
@@ -2984,14 +2984,16 @@ def EmitRegistration(announce_list):
 
             for source_file in interface_files:
                 try:
-                    _extra_includes = [ os.path.join("@" + os.path.dirname(source_file), MODULE_FILE),
-                                        os.path.join("@" + os.path.dirname(source_file), "Ids.h") ]
+                    source_path = os.path.dirname(source_file)
 
-                    _extra_includes.extend(args.extra_includes)
+                    extra_includes = []
+                    extra_includes.append("@" + os.path.join(source_path, MODULE_FILE))
+                    extra_includes.append("@" + os.path.join(source_path, IDS_FILE))
+                    extra_includes.extend(args.extra_includes)
 
-                    tree = Parse(source_file, FRAMEWORK_NAMESPACE, args.includePaths,
-                                    os.path.join("@" + os.path.dirname(os.path.realpath(__file__)), DEFAULT_DEFINITIONS_FILE),
-                                    _extra_includes)
+                    definition_file = "@" + os.path.join(os.path.dirname(os.path.realpath(__file__)), DEFAULT_DEFINITIONS_FILE)
+
+                    tree = Parse(source_file, FRAMEWORK_NAMESPACE, args.includePaths, definition_file, extra_includes)
 
                     if args.code:
                         log.Header(source_file)