Skip to content
Snippets Groups Projects
Commit 8854ace9 authored by Jonathan Hanks's avatar Jonathan Hanks
Browse files

Merge branch 'post_build_script_fix' into 'master'

RCG: Fix post process script to handle $bdroot simulink variable

See merge request cds/advligorts!281
parents 1b0f8d3c 5cdb6ff3
No related branches found
No related tags found
1 merge request!281RCG: Fix post process script to handle $bdroot simulink variable
......@@ -22,7 +22,7 @@ else:
ifo_initial = model_name[0:2]
site_initial = model_name[0]
sysname = model_name[2:]
sysname = model_name
global top_names
top_names = None
global model_params
......@@ -132,14 +132,14 @@ def parse_block(data_lines,line_number,reference_name,system_name):
if (temp_block.data['BlockType'] == 'Reference') & (not (simulink_reference[0] in temp_block.data['SourceBlock'])) & (not (simulink_reference[1] in temp_block.data['SourceBlock'])):
#If we did find a reference block, get the reference data
current_name = temp_block.data['Name']
library_lines = find_library(temp_block.data['SourceBlock'], system_name)
scratch_block, scratch = parse_block(library_lines,0,temp_block.data['SourceBlock'], system_name)
library_lines, library_name = find_library(temp_block.data['SourceBlock'], system_name)
scratch_block, scratch = parse_block(library_lines,0,temp_block.data['SourceBlock'], library_name)
#Keep the farthest back reference description for screen generation as well - allows changes to just the library part
if ('Description' in list(scratch_block.data.keys())):
if not ('Reference_Descrip' in list(scratch_block.data.keys())):
scratch_block.data['Reference_Descrip'] = [scratch_block.data['Description']]
else:
scrach_block.data['Reference_Descrip'].append(scratch_block.data['Description'])
scratch_block.data['Reference_Descrip'].append(scratch_block.data['Description'])
#Overwrite reference block data with data from the calling block (i.e. 'Name', etc)
if not ('Description' in list(temp_block.data.keys())):
temp_block.data['Description'] = ""
......@@ -239,7 +239,7 @@ def find_library(library_name, system_name):
sys.stderr.write("Could not open reference file: " + reference_file_name + "\n")
sys.stderr.write("Exiting\n")
sys.exit(1)
return reference_file.readlines()
return reference_file.readlines(), reference_file_name
sys.stderr.write("ERROR: For part referencing: " + library_name + "\n")
sys.stderr.write("Could not find reference file: " + reference_file_name + "\n")
sys.stderr.write("Exiting\n")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment