Skip to content

[build] Package the scripts in bin alongside the executables #2853

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
fabiencastan merged 5 commits into from
Sep 9, 2025
Merged

[build] Package the scripts in bin alongside the executables #2853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
197fb60
[build] `setup.py`: Add the content of `bin` to the packaged setup
cbentejac Aug 22, 2025
beece54
[build] `setup.py`: Remove pytest from the `install_requires`
cbentejac Aug 22, 2025
571de38
[build] `setup.py`: Use double quotes everywhere
cbentejac Aug 22, 2025
9b75a9b
Update `.git-blame-ignore-revs` with changes in `setup.py`
cbentejac Aug 22, 2025
37c6111
[core] desc.node: Always use the same path to `meshroom_compute`
cbentejac Aug 22, 2025
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
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# [build] `setup.py`: Use double quotes everywhere
571de38ef1a9e72e6c1d2a997b60de5bd3caa5bf
# [bin] `meshroom_batch`: Minor clean-up in the file
15d9ecd888faa7216cfc5d97d473f5717a3118a3
# [core] Linting following CI's flake8 report
Expand Down
8 changes: 2 additions & 6 deletions meshroom/core/desc/node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,8 @@
from meshroom.core import cgroup

_MESHROOM_ROOT = Path(meshroom.__file__).parent.parent.as_posix()
if getattr(sys, "frozen", False): # When in release package mode, the path to meshroom_compute differs
_MESHROOM_COMPUTE = (Path(_MESHROOM_ROOT).parent / "meshroom_compute").as_posix()
_MESHROOM_COMPUTE_EXE = _MESHROOM_COMPUTE
else:
_MESHROOM_COMPUTE = (Path(_MESHROOM_ROOT) / "bin" / "meshroom_compute").as_posix()
_MESHROOM_COMPUTE_EXE = f"python {_MESHROOM_COMPUTE}"
_MESHROOM_COMPUTE = (Path(_MESHROOM_ROOT) / "bin" / "meshroom_compute").as_posix()
_MESHROOM_COMPUTE_EXE = f"python {_MESHROOM_COMPUTE}"
Copy link

Copilot AI Aug 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The removal of the frozen/release mode check may break functionality when running from a packaged executable. In release mode, the script should be executed directly without the 'python' prefix, but now it will always prepend 'python' even when the script is a standalone executable.

Suggested change
_MESHROOM_COMPUTE_EXE = f"python {_MESHROOM_COMPUTE}"
if getattr(sys, 'frozen', False):
_MESHROOM_COMPUTE_EXE = _MESHROOM_COMPUTE
else:
_MESHROOM_COMPUTE_EXE = f"python {_MESHROOM_COMPUTE}"

Copilot uses AI. Check for mistakes.


class MrNodeType(enum.Enum):
Expand Down
6 changes: 3 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def __init__(self, script, initScript=None, base=None, targetName=None, icons=No
"cmath",
"numpy"
],
"include_files": ["CHANGES.md", "COPYING.md", "LICENSE-MPL2.md", "README.md"]
"include_files": ["CHANGES.md", "COPYING.md", "LICENSE-MPL2.md", "README.md", "bin"]
}
if os.path.isdir(os.path.join(currentDir, "tractor")):
build_exe_options["packages"].append("tractor")
Expand Down Expand Up @@ -143,9 +143,9 @@ def __init__(self, script, initScript=None, base=None, targetName=None, icons=No
setup(
name="Meshroom",
description="Meshroom",
install_requires=['psutil', 'pytest', 'PySide6', 'markdown'],
install_requires=["psutil", "PySide6", "markdown"],
setup_requires=[
'cx_Freeze'
"cx_Freeze"
],
version=meshroom.__version__,
options={"build_exe": build_exe_options},
Expand Down
Loading