onebinary: sources and stuff populated dynamically

Author: iameli

meson.build

@@ -209,10 +209,11 @@ onebinary_stuff = []
 onebinary_stuff += 'MistOutRTMP'
 onebinary_stuff += 'MistOutHLS'
 onebinary_stuff += 'MistOutHTTP'
-# onebinary_stuff += 'MistInBuffer'
+onebinary_stuff += 'MistInBuffer'
 
 onebinary_tgts = []
 onebinary_headers = []
+onebinary_sources = []
 
 ## 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
@@ -234,6 +235,7 @@ foreach exec : executables
   if onebinary_stuff.contains(exec.get('name'))
     onebinary_tgts += gen_src
     onebinary_headers += exec.get('headers')
+    onebinary_sources += exec.get('sources_debased')
   endif
 endforeach
 
@@ -251,15 +253,6 @@ onebinary = executable(
   'MistServer',
   [
     files(
-      'src/input/input.cpp',
-      'src/input/input_buffer.cpp',
-      'src/output/output.cpp',
-      'src/output/output_hls.cpp',
-      'src/output/output_http.cpp',
-      'src/output/output_http_internal.cpp',
-      'src/output/output_ts.cpp',
-      'src/output/output_ts_base.cpp',
-      'src/output/output_rtmp.cpp',
       'src/controller/controller_external_writers.cpp',
       'src/controller/controller_updater.cpp',
       'src/controller/controller_streams.cpp',
@@ -272,7 +265,10 @@ onebinary = executable(
       'src/controller/controller_api.cpp',
       'src/controller/controller_push.cpp',
       'src/controller/controller_variables.cpp',
+      'src/session.cpp',
+      'src/controller/controller.cpp',
     ),
+    onebinary_sources,
     io_cpp,
     header_tgts,
     embed_tgts,

scripts/onebinary_gen.py

@@ -50,11 +50,13 @@
   if stem.startswith(MIST_IN):
     category = "inputs"
     connector = stem[len(MIST_IN):]
-    class_name = "Mist::In" + connector
+    class_name = "Mist::Input" + connector
+    func_name = "InputMain"
   elif stem.startswith(MIST_OUT):
     category = "connectors"
     connector = stem[len(MIST_OUT):]
     class_name = "Mist::Out" + connector
+    func_name = "OutputMain"
   else:
     raise Exception("unknown binary naming convention: " + stem)
   capabilities.append({
@@ -63,6 +65,7 @@
     'connector': connector,
     'class_name': class_name,
     'binary_name' : stem,
+    'func_name': func_name,
   })
 
 cap_lines = [
@@ -85,22 +88,27 @@
 
 entrypoint_lines = []
 
+for header_file in header_files:
+  entrypoint_lines.append('#include "' + header_file + '"')
+
 entrypoint_lines.extend([
   '#include <mist/config.h>',
   '#include <mist/defines.h>',
   '#include <mist/socket.h>',
   '#include <mist/util.h>',
   '#include <mist/stream.h>',
+  '#include "src/session.h"',
+  '#include "src/controller/controller.h"',
+  '#include "src/output/mist_out.cpp"',
+  '#include "src/input/mist_in.cpp"',
 ])
 
-for header_file in header_files:
-  entrypoint_lines.append('#include "' + header_file + '"')
 
 entrypoint_lines.extend([
-  '#include "src/output/mist_out.cpp"',
-  '#include "src/input/mist_in.cpp"',
-  '#include "src/session.cpp"',
-  '#include "src/controller/controller.cpp"',
+  # '#include "src/output/mist_out.cpp"',
+  # '#include "src/input/mist_in.cpp"',
+  # '#include "src/session.cpp"',
+  # '#include "src/controller/controller.cpp"',
   'int main(int argc, char *argv[]){',
   '  if (argc < 2) {',
   '    return ControllerMain(argc, argv);',
@@ -121,7 +129,7 @@
 for cap in capabilities:
   entrypoint_lines.extend([
   '  else if (strcmp(argv[1], "' + cap['binary_name'] + '") == 0) {',
-  '    return OutputMain<' + cap['class_name'] + '>(new_argc, new_argv);',
+  '    return ' + cap['func_name'] +'<' + cap['class_name'] + '>(new_argc, new_argv);',
   '  }',
   ])
 

src/controller/controller.h

@@ -0,0 +1 @@
+int ControllerMain(int argc, char **argv);

src/input/meson.build

@@ -74,12 +74,18 @@ foreach input : inputs
       io_cpp,
       header_tgts
     ],
+    'sources_debased' : [
+      files(
+        'input.cpp',
+        'input_'+input.get('format')+'.cpp'
+      )
+    ],
     'deps' : deps,
     'defines': [
       string_opt.format('INPUTTYPE', inputtype_header)
     ],
     'headers': [
-      inputtype_header
+      files(inputtype_header)
     ]
   }
 endforeach

src/input/mist_in.cpp

@@ -2,6 +2,7 @@
 #include INPUTTYPE
 #endif
 #include <mist/util.h>
+#include <mist/config.h>
 
 template<class T>
 int InputMain(int argc, char *argv[]){

src/output/meson.build

@@ -68,9 +68,6 @@ foreach output : outputs
 
   if output.has_key('extra')
     extra = output.get('extra')
-    if not extra.contains('debased')
-      sources += base
-    endif
     if extra.contains('http')
       sources += files('output_http.cpp')
       if extra.contains('ts')
@@ -98,6 +95,18 @@ foreach output : outputs
     if extra.contains('embed')
       sources += embed_tgts
     endif
+  endif
+
+  sources_debased = []
+  foreach source : sources
+    sources_debased += source
+  endforeach
+
+  if output.has_key('extra')
+    extra = output.get('extra')
+    if not extra.contains('debased')
+      sources += base
+    endif
   else
     sources += base
   endif
@@ -110,6 +119,9 @@ foreach output : outputs
       sources,
       header_tgts
     ],
+    'sources_debased' : [
+      sources_debased
+    ],
     'deps' : deps,
     'defines' : [
       string_opt.format('OUTPUTTYPE', outputtype_header),

src/session.h

@@ -0,0 +1,2 @@
+
+int SessionMain(int argc, char **argv);