Simone/nsis-plugin-ns7zip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 8 Wiki Activity

build: redirect 25.01 builds to bundle directory

Browse Source 
- tools/linux/build_plugin_linux.py: point VERSION_LAYOUT['25.01'].bundle_dir
  to versions/25.01-bundle/; update comment (all versions now use bundle dirs).
- tools/legacy/build_plugin_2501_vs2026.py: point project_dir to 25.01-bundle/.
- tools/legacy/build_plugin_2501_vs2022.py: point project_dir to 25.01-bundle/.
This commit is contained in:
Simone
2026-05-03 01:38:45 +02:00
parent 8968d0fd0c
commit 56f831017e
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/legacy/build_plugin_2501_vs2022.py
+1 -1
View File
@@ -182,7 +182,7 @@ def get_project_paths() -> Tuple[Path, Path, Path]:
script_dir = Path(__file__).parent.resolve() script_dir = Path(__file__).parent.resolve()
# Project directory containing 7-Zip 25.01 sources # 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 path
project_file = project_dir / 'CPP' / '7zip' / 'Bundles' / 'Nsis7z' / 'Nsis7z.vcxproj' project_file = project_dir / 'CPP' / '7zip' / 'Bundles' / 'Nsis7z' / 'Nsis7z.vcxproj'
tools/legacy/build_plugin_2501_vs2026.py
+1 -1
View File
@@ -200,7 +200,7 @@ def find_msbuild(vs_version: str = 'auto') -> 'Optional[Tuple[Path, str, str]]':
def get_project_paths() -> Tuple[Path, Path, Path]: def get_project_paths() -> Tuple[Path, Path, Path]:
"""Get project directory, project file, and plugins directory""" """Get project directory, project file, and plugins directory"""
script_dir = Path(__file__).parent.absolute() 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' project_file = project_dir / 'CPP' / '7zip' / 'Bundles' / 'Nsis7z' / 'Nsis7z_vs2026.vcxproj'
plugins_dir = script_dir.parent.parent / 'plugins' plugins_dir = script_dir.parent.parent / 'plugins'
tools/linux/build_plugin_linux.py
+2 -7
View File
@@ -24,12 +24,7 @@ BUILD_DIR = ROOT / "_linux_build"
SUPPORTED = {"25.01", "26.00", "26.01", "zstd"} SUPPORTED = {"25.01", "26.00", "26.01", "zstd"}
# For 25.01 the vendor bundle dir already contains our wrapper .cpp files # For all versions the upstream vendor does NOT ship a Nsis7z bundle, so a
# 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
# *-bundle wrapper directory mirrors the vendor tree via symlinks and provides # *-bundle wrapper directory mirrors the vendor tree via symlinks and provides
# project-owned sources (NSIS UI, wrapper cpp files, vcxproj). # project-owned sources (NSIS UI, wrapper cpp files, vcxproj).
# #
@@ -40,7 +35,7 @@ SUPPORTED = {"25.01", "26.00", "26.01", "zstd"}
VERSION_LAYOUT = { VERSION_LAYOUT = {
"25.01": { "25.01": {
"vendor_7zip": ROOT / "versions" / "25.01" / "CPP" / "7zip", "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": { "26.00": {
"vendor_7zip": ROOT / "versions" / "26.00" / "CPP" / "7zip", "vendor_7zip": ROOT / "versions" / "26.00" / "CPP" / "7zip",