Skip to content

MINIFICPP-2864 Handle paths containing spaces in the bootstrap script #2215

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

Open
fgerlits wants to merge 2 commits into
base: MINIFICPP-2859
Choose a base branch
from
+13 −13
Open

MINIFICPP-2864 Handle paths containing spaces in the bootstrap script #2215

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
545e659
MINIFICPP-2864 Handle paths containing spaces in the bootstrap script
fgerlits Jul 20, 2026
6ad7695
changes suggested by claude
fgerlits Jul 21, 2026
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
16 changes: 8 additions & 8 deletions bootstrap/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def export_custom_conan_recipes(minifi_options: MinifiOptions, package_manager:
version = next(iter(data["versions"]))

print(f"Exporting the custom Conan recipe {root} with version {version}")
if not package_manager.run_cmd(f"conan export {root} --version={version} --user=minifi --channel=develop"):
if not package_manager.run_cmd(f'conan export "{root}" --version={version} --user=minifi --channel=develop'):
print(f"Exporting the custom Conan recipe {root} failed")
return False
return True
Expand Down Expand Up @@ -79,8 +79,8 @@ def run_conan_install(minifi_options: MinifiOptions, package_manager: PackageMan
if not package_manager.run_cmd(conan_remote_add_cmd):
print("Adding the nifi-conan remote failed")
return False
build_cmd = f"conan install {minifi_options.source_dir} --output-folder={minifi_options.build_dir} --build=missing {conan_options} " \
f"--settings=build_type={minifi_options.build_type.value}{generator_setting}{compiler_settings}"
build_cmd = f'conan install "{minifi_options.source_dir}" --output-folder="{minifi_options.build_dir}" --build=missing {conan_options} ' \
f'--settings=build_type={minifi_options.build_type.value}{generator_setting}{compiler_settings}'
res = package_manager.run_cmd(build_cmd)
print("Conan install was successful" if res else "Conan install was unsuccessful")
return res
Expand All @@ -96,27 +96,27 @@ def _conan_build_env_prefix(minifi_options: MinifiOptions) -> str:
def run_cmake(minifi_options: MinifiOptions, package_manager: PackageManager):
if not os.path.exists(minifi_options.build_dir):
os.mkdir(minifi_options.build_dir)
cmake_cmd = f"{_conan_build_env_prefix(minifi_options)}cmake {minifi_options.create_cmake_generator_str()} {minifi_options.create_cmake_use_conan_str()} " \
f"{minifi_options.create_cmake_options_str()} {minifi_options.source_dir} -B {minifi_options.build_dir}"
cmake_cmd = f'{_conan_build_env_prefix(minifi_options)}cmake {minifi_options.create_cmake_generator_str()} {minifi_options.create_cmake_use_conan_str()} ' \
f'{minifi_options.create_cmake_options_str()} "{minifi_options.source_dir}" -B "{minifi_options.build_dir}"'
res = package_manager.run_cmd(cmake_cmd)
print("CMake command run successfully" if res else "CMake command run unsuccessfully")
return res


def do_build(minifi_options: MinifiOptions, package_manager: PackageManager):
build_cmd = f"{_conan_build_env_prefix(minifi_options)}cmake --build {str(minifi_options.build_dir)} {minifi_options.create_cmake_build_flags_str()}"
build_cmd = f'{_conan_build_env_prefix(minifi_options)}cmake --build "{str(minifi_options.build_dir)}" {minifi_options.create_cmake_build_flags_str()}'
res = package_manager.run_cmd(build_cmd)
print("Build was successful" if res else "Build was unsuccessful")
return res


def do_package(minifi_options: MinifiOptions, package_manager: PackageManager):
build_cmd = f"{_conan_build_env_prefix(minifi_options)}cmake --build {str(minifi_options.build_dir)} --target package {minifi_options.create_cmake_build_flags_str()}"
build_cmd = f'{_conan_build_env_prefix(minifi_options)}cmake --build "{str(minifi_options.build_dir)}" --target package {minifi_options.create_cmake_build_flags_str()}'
return package_manager.run_cmd(build_cmd)


def do_docker_build(minifi_options: MinifiOptions, package_manager: PackageManager):
build_cmd = f"cmake --build {str(minifi_options.build_dir)} --target docker"
build_cmd = f'cmake --build "{str(minifi_options.build_dir)}" --target docker'
return package_manager.run_cmd(build_cmd)


Expand Down
4 changes: 2 additions & 2 deletions bootstrap/package_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ def _minifi_setup_env_str(vs_where_location: VsWhereLocation) -> str:
set PATH=!PATH:C:\\Strawberry\\c\\bin;=!;C:\\Program Files\\NASM;
endlocal & set PATH=%PATH%
set build_platform=x64
call {_get_activate_venv_path()}
call "{_get_activate_venv_path()}"

"""

Expand Down Expand Up @@ -302,7 +302,7 @@ def install_compiler(self) -> str:

def run_cmd(self, cmd: str) -> bool:
env_bat_path = pathlib.Path(__file__).parent.resolve() / "build_environment.bat"
res = subprocess.run(f"{env_bat_path} & {cmd}", check=True, text=True)
res = subprocess.run(f'"{env_bat_path}" & {cmd}', check=True, text=True)

return res.returncode == 0

Expand Down
Loading