From 4887149d3815fa551503287dfa34b355e8062b5b Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Wed, 30 Nov 2022 03:42:56 +0800 Subject: [PATCH] Cabana: execute generate_dbc_json.py after building (#26620) * use env.command to generete json after build * Update tools/cabana/SConscript Co-authored-by: Shane Smiskol old-commit-hash: f9bb024a464f8714a1edc7190985fcb612415eec --- tools/cabana/SConscript | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/cabana/SConscript b/tools/cabana/SConscript index 3ff4862800..52fe9e346d 100644 --- a/tools/cabana/SConscript +++ b/tools/cabana/SConscript @@ -17,10 +17,13 @@ cabana_env = qt_env.Clone() prev_moc_path = cabana_env['QT_MOCHPREFIX'] cabana_env['QT_MOCHPREFIX'] = os.path.dirname(prev_moc_path) + '/cabana/moc_' -cabana_env.Execute('./generate_dbc_json.py --out car_fingerprint_to_dbc.json') cabana_lib = cabana_env.Library("cabana_lib", ['mainwin.cc', 'binaryview.cc', 'chartswidget.cc', 'historylog.cc', 'videowidget.cc', 'signaledit.cc', 'dbcmanager.cc', 'canmessages.cc', 'commands.cc', 'messageswidget.cc', 'settings.cc', 'detailwidget.cc'], LIBS=cabana_libs, FRAMEWORKS=base_frameworks) cabana_env.Program('_cabana', ['cabana.cc', cabana_lib], LIBS=cabana_libs, FRAMEWORKS=base_frameworks) if GetOption('test'): cabana_env.Program('tests/_test_cabana', ['tests/test_runner.cc', 'tests/test_cabana.cc', cabana_lib], LIBS=[cabana_libs]) + +def generate_dbc_json(target, source, env): + env.Execute('tools/cabana/generate_dbc_json.py --out tools/cabana/car_fingerprint_to_dbc.json') +cabana_env.Command('generate_dbc_json', [], generate_dbc_json)