Skip to content
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

Jump to bottom

Fix missing files in MSI #1241

Merged
merged 1 commit into from
Apr 11, 2022
Merged

Fix missing files in MSI #1241

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
29 changes: 16 additions & 13 deletions SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1690,6 +1690,22 @@ env['debian'] = any(name.endswith('dist-packages') for name in sys.path)
selected_options = set(line.split("=")[0].strip()
for line in cantera_conf.splitlines())

# Always set the stage directory before building an MSI installer
if "msi" in COMMAND_LINE_TARGETS:
COMMAND_LINE_TARGETS.append("install")
env["stage_dir"] = "stage"
env["prefix"] = "."
selected_options.add("prefix")
selected_options.add("stage_dir")
env["python_package"] = "none"
elif env["layout"] == "debian":
COMMAND_LINE_TARGETS.append("install")
env["stage_dir"] = "stage/cantera"
env["PYTHON_INSTALLER"] = "debian"
env["INSTALL_MANPAGES"] = False
else:
env["PYTHON_INSTALLER"] = "direct"

env["default_prefix"] = True
if "prefix" in selected_options:
env["default_prefix"] = False
Expand Down Expand Up @@ -1754,19 +1770,6 @@ else:
env["ct_matlab_dir"] = pjoin(
env["prefix"], env["libdirname"], "cantera", "matlab", "toolbox")

# Always set the stage directory before building an MSI installer
if 'msi' in COMMAND_LINE_TARGETS:
COMMAND_LINE_TARGETS.append('install')
env['stage_dir'] = 'stage'
env['prefix'] = '.'
elif env['layout'] == 'debian':
COMMAND_LINE_TARGETS.append('install')
env['stage_dir'] = 'stage/cantera'
env['PYTHON_INSTALLER'] = 'debian'
env['INSTALL_MANPAGES'] = False
else:
env['PYTHON_INSTALLER'] = 'direct'


addInstallActions = ('install' in COMMAND_LINE_TARGETS or
'uninstall' in COMMAND_LINE_TARGETS)
Expand Down