diff --git a/tools/legacy/build_plugin_2501_vs2022.py b/tools/legacy/build_plugin_2501_vs2022.py index d44e9cb..c6c2a22 100644 --- a/tools/legacy/build_plugin_2501_vs2022.py +++ b/tools/legacy/build_plugin_2501_vs2022.py @@ -182,7 +182,7 @@ def get_project_paths() -> Tuple[Path, Path, Path]: script_dir = Path(__file__).parent.resolve() # Project directory containing 7-Zip 25.01 sources - project_dir = script_dir.parent.parent / 'versions' / '25.01' + project_dir = script_dir.parent.parent / 'versions' / '25.01-bundle' # Project file path project_file = project_dir / 'CPP' / '7zip' / 'Bundles' / 'Nsis7z' / 'Nsis7z.vcxproj' diff --git a/tools/legacy/build_plugin_2501_vs2026.py b/tools/legacy/build_plugin_2501_vs2026.py index 1e5b8c8..1bf8916 100644 --- a/tools/legacy/build_plugin_2501_vs2026.py +++ b/tools/legacy/build_plugin_2501_vs2026.py @@ -200,7 +200,7 @@ def find_msbuild(vs_version: str = 'auto') -> 'Optional[Tuple[Path, str, str]]': def get_project_paths() -> Tuple[Path, Path, Path]: """Get project directory, project file, and plugins directory""" script_dir = Path(__file__).parent.absolute() - project_dir = script_dir.parent.parent / 'versions' / '25.01' + project_dir = script_dir.parent.parent / 'versions' / '25.01-bundle' project_file = project_dir / 'CPP' / '7zip' / 'Bundles' / 'Nsis7z' / 'Nsis7z_vs2026.vcxproj' plugins_dir = script_dir.parent.parent / 'plugins' diff --git a/tools/linux/build_plugin_linux.py b/tools/linux/build_plugin_linux.py index 73b1f90..b9682ba 100644 --- a/tools/linux/build_plugin_linux.py +++ b/tools/linux/build_plugin_linux.py @@ -24,12 +24,7 @@ BUILD_DIR = ROOT / "_linux_build" SUPPORTED = {"25.01", "26.00", "26.01", "zstd"} -# For 25.01 the vendor bundle dir already contains our wrapper .cpp files -# alongside the upstream 7-zip sources. make is run with -C pointing there so -# relative paths (../../UI/…) resolve correctly, but the makefile itself comes -# from OVERLAY and the output objects go to BUILD_DIR. -# -# For 26.00, 26.01: the upstream vendor does NOT ship a Nsis7z bundle, so a +# For all versions the upstream vendor does NOT ship a Nsis7z bundle, so a # *-bundle wrapper directory mirrors the vendor tree via symlinks and provides # project-owned sources (NSIS UI, wrapper cpp files, vcxproj). # @@ -40,7 +35,7 @@ SUPPORTED = {"25.01", "26.00", "26.01", "zstd"} VERSION_LAYOUT = { "25.01": { "vendor_7zip": ROOT / "versions" / "25.01" / "CPP" / "7zip", - "bundle_dir": ROOT / "versions" / "25.01" / "CPP" / "7zip" / "Bundles" / "Nsis7z", + "bundle_dir": ROOT / "versions" / "25.01-bundle" / "CPP" / "7zip" / "Bundles" / "Nsis7z", }, "26.00": { "vendor_7zip": ROOT / "versions" / "26.00" / "CPP" / "7zip",