onebinary: entrypoint dynamically gets headers too

Author: iameli

meson.build

@@ -212,7 +212,7 @@ onebinary_stuff += 'MistOutHTTP'
 # onebinary_stuff += 'MistInBuffer'
 
 onebinary_tgts = []
-onebinary_sources = []
+onebinary_headers = []
 
 ## This makes sure all (installable) executables are build in top level directory
 ## Done because MistController expects its binaries to all be in the same directory
@@ -233,14 +233,15 @@ foreach exec : executables
   )
   if onebinary_stuff.contains(exec.get('name'))
     onebinary_tgts += gen_src
+    onebinary_headers += exec.get('headers')
   endif
 endforeach
 
 prog_python = find_program('python3')
 script = files('scripts/onebinary_gen.py')
 
 onebinary_header = custom_target('onebinary',
-  input: [onebinary_tgts],
+  input: [onebinary_tgts, onebinary_headers],
   output: ['controller_static_capabilities.cpp', 'mistserver.cpp'],
   command: [prog_python, script, '--cap-header', '@OUTPUT0@', '--entrypoint', '@OUTPUT1@', '@INPUT@'],
   depends: [onebinary_tgts]
@@ -272,7 +273,6 @@ onebinary = executable(
       'src/controller/controller_push.cpp',
       'src/controller/controller_variables.cpp',
     ),
-    onebinary_sources,
     io_cpp,
     header_tgts,
     embed_tgts,

scripts/onebinary_gen.py

@@ -18,13 +18,28 @@
 
 args = parser.parse_args()
 
+json_files = []
+header_files = []
+for file in args.files:
+  if file.endswith('.json'):
+    json_files.append(file)
+  elif file.endswith('h'):
+    header_files.append(file)
+  else:
+    raise Exception("unknown file type: " + file)
+
+# print('json')
+# print(json_files)
+# print('h')
+# print(header_files)
+
 MIST_IN = "MistIn"
 MIST_OUT = "MistOut"
 CAP_LINE = '    capabilities["{category}"]["{connector}"] = JSON::fromString({json_str});'
 
 capabilities = []
 
-for name in args.files:
+for name in json_files:
   path = Path(name)
   stem = path.stem
   text = path.read_text().strip("\n")
@@ -76,12 +91,14 @@
   '#include <mist/socket.h>',
   '#include <mist/util.h>',
   '#include <mist/stream.h>',
+])
+
+for header_file in header_files:
+  entrypoint_lines.append('#include "' + header_file + '"')
+
+entrypoint_lines.extend([
   '#include "src/output/mist_out.cpp"',
-  '#include "src/output/output_rtmp.h"',
-  '#include "src/output/output_hls.h"',
-  '#include "src/output/output_http_internal.h"',
   '#include "src/input/mist_in.cpp"',
-  '#include "src/input/input_buffer.h"',
   '#include "src/session.cpp"',
   '#include "src/controller/controller.cpp"',
   'int main(int argc, char *argv[]){',

src/input/meson.build

@@ -61,6 +61,8 @@ foreach input : inputs
     deps += av_libs
   endif
 
+  inputtype_header = 'input_'+input.get('format')+'.h'
+
   executables += {
     'name' : 'MistIn'+input.get('name'),
     'sources' : [
@@ -74,7 +76,10 @@ foreach input : inputs
     ],
     'deps' : deps,
     'defines': [
-      string_opt.format('INPUTTYPE', 'input_'+input.get('format')+'.h')
+      string_opt.format('INPUTTYPE', inputtype_header)
+    ],
+    'headers': [
+      inputtype_header
     ]
   }
 endforeach

src/output/meson.build

@@ -102,6 +102,8 @@ foreach output : outputs
     sources += base
   endif
 
+  outputtype_header = 'output_'+output.get('format')+'.h'
+
   executables += {
     'name': 'MistOut'+output.get('name'),
     'sources' : [
@@ -110,8 +112,11 @@ foreach output : outputs
     ],
     'deps' : deps,
     'defines' : [
-      string_opt.format('OUTPUTTYPE', 'output_'+output.get('format')+'.h'),
+      string_opt.format('OUTPUTTYPE', outputtype_header),
       '-DTS_BASECLASS='+tsBaseClass
+    ],
+    'headers' : [
+      files(outputtype_header)
     ]
   }
 endforeach