Skip to content

Quick fix for the Additional make build arguments issue #124

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

Merged
robertobucher merged 1 commit into from
Oct 10, 2026
Merged

Quick fix for the Additional make build arguments issue #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions toolbox/supsisim/supsisim/RCPgen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ def genCode(model, Tsamp, blocks, rkMethod='standard_RK4', epsAbs = 1e-6, epsRel
f.write('}\n\n')
f.close()

def genMake(model, template, addObj = '', addCDefs = ''):
def genMake(model, template, addObj = '', addCDefs = '', addMakeArgs = ''):
"""Generate the Makefile

Call: genMake(model, template)
Expand All @@ -421,7 +421,8 @@ def genMake(model, template, addObj = '', addCDefs = ''):
template : Template makefile
addObj : Additional object files
addCDefs : Additional C Defines

addMakeArgs : Additional Make Defines

Returns
-------
-
Expand All @@ -441,6 +442,7 @@ def genMake(model, template, addObj = '', addCDefs = ''):
addCDefs += ' \'-DCONF_SHV_UPDATES_USED\''

mf = mf.replace('$$ADDITIONAL_DEFINES$$', addCDefs)
mf = mf.replace('$$ADDITIONAL_MAKE_ARGS$$', addMakeArgs)
f = open('Makefile','w')
f.write(mf)
f.close()
Expand Down
12 changes: 8 additions & 4 deletions toolbox/supsisim/supsisim/scene.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ def cleanBlkList(self, items):
return items

def codegen(self, flag):
def _parseAddCDefs(addCDefs: str) -> str:
def _parseAddDefs(addCDefs: str, defFormatFunc) -> str:
ret = ''
# the splitter is a comma, then check the syntax
addCDefs = addCDefs.strip()
Expand All @@ -523,13 +523,17 @@ def _parseAddCDefs(addCDefs: str) -> str:
if not re.fullmatch("[0-9a-zA-Z_]+", left):
# the macro contains forbidden characters
raise ValueError("Bad format of additional build args!")
ret += "\\\'-D" + str(left) + '=' + str(right) + "\\\' "
ret += defFormatFunc(str(left), str(right))
return ret

CDefFormatFunc = lambda l, r : "\\\'-D" + l + '=' + r + "\\\' "
MakeArgFormatFunc = lambda l, r : l + '=' + r + " "

# REVISIT: might check all passed arguments in the dialog.

try:
self.parsedAddCDefs = _parseAddCDefs(self.addCDefs)
self.parsedAddCDefs = _parseAddDefs(self.addCDefs, CDefFormatFunc)
self.parsedAddMakeArgs = _parseAddDefs(self.addMakeArgs, MakeArgFormatFunc)
except ValueError as e:
print(e)
self.mainw.statusLabel.setText('Error by Code generation!')
Expand Down Expand Up @@ -763,7 +767,7 @@ def generateCCode(self, items):
fn.write('genCode(fname, ' + self.Ts + ', blks, ' + "'" + self.intgMethod + "', " + \
self.epsAbs + ', ' + self.epsRel +')\n')
fn.write("genMake(fname, '" + self.template + "', addObj = '" +
self.addObjs + "', addCDefs = '" + self.parsedAddCDefs + "')\n")
self.addObjs + "', addCDefs = '" + self.parsedAddCDefs + "', addMakeArgs= '" + self.parsedAddMakeArgs + "')\n")
fn.write('\nimport os\n')
fn.write('os.system("make clean")\n')
fn.write('if (os.system("make")) != 0:\n')
Expand Down