Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JsonGen] Add --cpp-output option and header collection #65

Merged
merged 2 commits into from
Dec 14, 2023
Merged

[JsonGen] Add --cpp-output option and header collection #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fbba97
[JsonGen] Add --cpp-output option and header collection
sebaszm Dec 14, 2023
9100583
Do not drop I
sebaszm Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 34 additions & 8 deletions JsonGenerator/JsonGenerator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
else:
files.append(p)

joint_headers = {}

for path in files:

trackers.object_tracker.Reset()
Expand All @@ -74,20 +76,41 @@
warnings = config.GENERATED_JSON
config.GENERATED_JSON = "@generated" in schema

output_path = path

if args.output_dir:
if (args.output_dir[0]) == os.sep:
output_path = os.path.join(args.output_dir, os.path.basename(output_path))
output_path = os.path.normpath(args.output_dir)
else:
output_path = os.path.join(os.path.dirname(path), os.path.normpath(args.output_dir))

if not os.path.exists(output_path):
os.makedirs(output_path)
else:
output_path = os.path.dirname(path)

if args.cpp_output_dir:
if (args.cpp_output_dir[0]) == os.sep:
cpp_output_path = os.path.normpath(args.cpp_output_dir)
else:
dir = os.path.join(os.path.dirname(output_path), args.output_dir)
if not os.path.exists(dir):
os.makedirs(dir)
cpp_output_path = os.path.join(os.path.dirname(path), os.path.normpath(args.cpp_output_dir))

output_path = os.path.join(dir, os.path.basename(output_path))
if not os.path.exists(cpp_output_path):
os.makedirs(cpp_output_path)
else:
cpp_output_path = output_path

if args.code or args.stubs:
code_generator.Create(log, schema, path, output_path, additional_includes, args.code, args.stubs, args.code)
headers = code_generator.Create(log, schema, path, [output_path, cpp_output_path], additional_includes, args.code, args.stubs, args.code)

name = os.path.basename(path).replace(".h", "").replace(".json", "")

# if "@generated" in schema and name[0] == "I":
# name = name[1:]

if headers:
if name not in joint_headers:
joint_headers[name] = []

joint_headers[name].extend(headers)

if args.docs:
if "$schema" in schema:
Expand All @@ -104,6 +127,9 @@

config.GENERATED_JSON = warnings

for n in joint_headers:
code_generator.CreateApiHeader(log, n, output_path, joint_headers[n])

except json_loader.JsonParseError as err:
log.Error(str(err))
except header_loader.CppParseError as err:
Expand Down
39 changes: 33 additions & 6 deletions JsonGenerator/source/code_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,24 @@
from emitter import Emitter
from json_loader import *

def CreateApiHeader(log, source_name, path, headers):
assert(headers)

header_file = os.path.join(path, "json_" + source_name + ".h")
with Emitter(header_file, config.INDENT_SIZE) as emitter:
emitter.Line("// %s JSON-RPC API" % os.path.basename(source_name))
emitter.Line("// Generated automatically. DO NOT EDIT.")
emitter.Line()
emitter.Line("#pragma once")
emitter.Line()

sorted = [_h for _h in headers if config.DATA_NAMESPACE in _h]
sorted.extend([_h for _h in headers if config.DATA_NAMESPACE not in _h])

for h in sorted:
emitter.Line("#include \"%s\"" % os.path.basename(h))

log.Success("JSON-RPC API header generated in %s" % (os.path.basename(emitter.FileName())))

def Create(log, schema, source_file, path, additional_includes, generate_classes, generate_stubs, generate_rpc):
def _ParseJsonRpcSchema(schema):
Expand All @@ -43,17 +61,21 @@ def _ParseJsonRpcSchema(schema):
else:
return None

directory = os.path.dirname(path)
headers = []

directory = path[0]
cpp_directory = path[1]

filename = (schema["info"]["namespace"]) if "info" in schema and "namespace" in schema["info"] else ""
filename += (schema["info"]["class"]) if "info" in schema and "class" in schema["info"] else ""

if len(filename) == 0:
filename = os.path.basename(path.replace("Plugin", "").replace(".json", "").replace(".h", ""))
filename = os.path.basename(source_file.replace("Plugin", "").replace(".json", "").replace(".h", ""))

rpcObj = _ParseJsonRpcSchema(schema)
if rpcObj:
header_file = os.path.join(directory, config.DATA_NAMESPACE + "_" + filename + ".h")
enum_file = os.path.join(directory, "JsonEnum_" + filename + ".cpp")
enum_file = os.path.join(cpp_directory, "JsonEnum_" + filename + ".cpp")

data_emitted = 0

Expand All @@ -68,6 +90,7 @@ def _ParseJsonRpcSchema(schema):

if data_emitted:
log.Success("JSON data classes generated in %s" % os.path.basename(emitter.FileName()))
headers.append(header_file)
else:
log.Info("No JSON data classes generated for %s" % os.path.basename(filename))

Expand Down Expand Up @@ -108,10 +131,12 @@ def _ParseJsonRpcSchema(schema):
with Emitter(output_filename, config.INDENT_SIZE) as emitter:
rpc_emitter.EmitRpcVersionCode(rpcObj, emitter, filename, os.path.basename(source_file), data_emitted)
log.Success("JSON-RPC version information generated in %s" % os.path.basename(emitter.FileName()))
headers.append(output_filename)


# Generate manual stub code...
if generate_stubs:
with Emitter(os.path.join(directory, filename + "JsonRpc.cpp"), config.INDENT_SIZE) as emitter:
with Emitter(os.path.join(cpp_directory, filename + "JsonRpc.cpp"), config.INDENT_SIZE) as emitter:
stub_emitter.EmitHelperCode(log, rpcObj, emitter, os.path.basename(header_file))
log.Success("JSON-RPC stubs generated in %s" % os.path.basename(emitter.FileName()))

Expand All @@ -124,9 +149,11 @@ def _ParseJsonRpcSchema(schema):
else:
with Emitter(output_filename, config.INDENT_SIZE) as emitter:
rpc_emitter.EmitRpcCode(rpcObj, emitter, filename, os.path.basename(source_file), data_emitted)

log.Success("JSON-RPC implementation generated in %s" % os.path.basename(emitter.FileName()))
log.Success("JSON-RPC implementation generated in %s" % os.path.basename(emitter.FileName()))
headers.append(output_filename)

else:
log.Info("No code to generate.")

return headers

7 changes: 7 additions & 0 deletions JsonGenerator/source/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,13 @@ def Parse(cmdline):
action="store",
default=None,
help="output directory, absolute path or directory relative to output file (default: output in the same directory as the source file)")
argparser.add_argument(
"--cpp-output",
dest="cpp_output_dir",
metavar="DIR",
action="store",
default=None,
help="output directory for cpp files, absolute path or directory relative to output file")
argparser.add_argument(
"--force",
dest="force",
Expand Down
2 changes: 1 addition & 1 deletion ProxyStubGenerator/StubGenerator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1930,7 +1930,7 @@ def GenerateIdentification(name):
if not options:
options.append("0")

emit.Line("EXTERNAL proxystubs_options_t proxystubs_options()")
emit.Line("EXTERNAL_EXPORT proxystubs_options_t proxystubs_options()")
emit.Line("{")
emit.IndentInc()
emit.Line("return (static_cast<proxystubs_options_t>(%s));" % " | ".join(options))
Expand Down
7 changes: 6 additions & 1 deletion cmake/FindJsonGenerator.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function(JsonGenerator)
endif()

set(optionsArgs CODE STUBS DOCS LEGACY_ALT NO_INCLUDES NO_STYLE_WARNINGS COPY_CTOR NO_REF_NAMES NO_INTERFACES_SECTION VERBOSE FORCE_GENERATE)
set(oneValueArgs OUTPUT IFDIR CPPIFDIR INDENT DEF_STRING DEF_INT_SIZE PATH FORMAT)
set(oneValueArgs OUTPUT CPP_OUTPUT IFDIR CPPIFDIR INDENT DEF_STRING DEF_INT_SIZE PATH FORMAT)
set(multiValueArgs INPUT INCLUDE_PATH NAMESPACE)

cmake_parse_arguments(Argument "${optionsArgs}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
Expand Down Expand Up @@ -105,6 +105,11 @@ function(JsonGenerator)
list(APPEND _execute_command "--output" "${Argument_OUTPUT}")
endif()

if (Argument_CPP_OUTPUT)
file(MAKE_DIRECTORY "${Argument_CPP_OUTPUT}")
list(APPEND _execute_command "--cpp-output" "${Argument_CPP_OUTPUT}")
endif()

if (Argument_INDENT)
list(APPEND _execute_command "--indent" "${Argument_INDENT}")
endif()
Expand Down
Loading