Mirror the 26.01-bundle approach for 26.00:
- versions/26.00-bundle/CPP/7zip/Bundles/Nsis7z/: project-owned NSIS plugin
wrapper sources (api.h, nsis7z.cpp, pluginapi.*, resource.*, StdAfx*,
Nsis7z.sln, Nsis7z.vcxproj, Nsis7z.vcxproj.filters, Nsis7z_vs2026.vcxproj).
- versions/26.00-bundle/CPP/7zip/UI/NSIS/: NSIS UI sources (Main.cpp,
ExtractCallbackConsole.*, NSISBreak.*, UserInputUtils2.*, StdAfx.h).
- versions/26.00-bundle/CPP/7zip/LzmaDec_gcc.mak: forwarding stub so that
the CWD-relative `include ../../LzmaDec_gcc.mak` in Arc_gcc.mak resolves
correctly when make runs from the Nsis7z bundle dir.
- versions/26.00-bundle/{C,Asm} and CPP sub-trees: symlinks into versions/26.00/
so the vendor headers and sources are visible without modifying the submodule.
- tools/linux/setup_26_00_bundle_symlinks.py: idempotent script to recreate
all symlinks after a fresh clone + submodule initialisation.
7-Zip 26.01 (ip7z/7zip) never shipped NSIS plugin sources, so they live in
a separate bundle directory (versions/26.01-bundle/) that mirrors the layout
expected by the shared overlay makefile and by MSBuild.
Bundle contents:
- CPP/7zip/Bundles/Nsis7z/: NSIS plugin wrapper sources (nsis7z.cpp,
pluginapi.cpp, api.h, resource.rc, StdAfx.h, …) and the Windows build
project file (Nsis7z_vs2026.vcxproj, adapted from versions/26.00/).
The vcxproj references the vendor submodule tree via relative paths
(../../../../../26.01/…), keeping the submodule pristine.
- CPP/7zip/UI/NSIS/: NSIS UI adapter sources (Main.cpp, MainAr.cpp,
NSISBreak.cpp, ExtractCallbackConsole.cpp, UserInputUtils2.cpp and
corresponding headers), copied from versions/26.00/.
- CPP/7zip/LzmaDec_gcc.mak: forwarding stub; GNU make resolves relative
`include` paths against the CWD, so when make runs from Bundles/Nsis7z
the upstream Arc_gcc.mak's `include ../../LzmaDec_gcc.mak` lands here.
The stub re-includes the real file via $(VENDOR_7ZIP).
- Symlinks (C, Asm, CPP/7zip/*, CPP/Common, CPP/Windows, …) pointing into
the versions/26.01 submodule. These are required because the vendor
makefile uses CWD-relative source paths (../../../../C/…, ../../Common/…).
tools/linux/setup_26_01_bundle_symlinks.py recreates them if needed.
Replaces the per-version in-tree build files with a shared overlay that
keeps all project-owned build infrastructure outside the vendor source trees,
making it safe to use vendor directories as pristine git submodules.
Changes:
- Add tools/linux/overlay/makefile.gcc: parameterised makefile that drives
MinGW cross-compilation; VENDOR_7ZIP, DEF_FILE and NSIS_DIR are all
overridable from the command line so no files are written into the vendor
tree at build time.
- Add tools/linux/overlay/include/: case-sensitivity shim headers
(Windows.h, CommCtrl.h, MAPI.h, NTSecAPI.h, Psapi.h, ShlObj.h) that
redirect to the lowercase MinGW system headers; also adds
z7_idecl_noexcept_strip.h which resolves the noexcept-specifier mismatch
in 7-zip 25.01 NSIS UI code.
- Move Nsis7z.def from versions/26.00/…/Bundles/Nsis7z/ to overlay/ (git
rename; content unchanged).
- Delete versions/26.00/…/Bundles/Nsis7z/makefile.gcc (superseded by the
overlay).
- Rewrite tools/linux/build_plugin_linux.py to drive the overlay makefile,
support multiple 7-zip versions (25.01, 26.00, 26.01, zstd) with a
VERSION_LAYOUT table, and add NSIS_DIR auto-detection for bundle-based
builds.
- Add _linux_build/ to .gitignore.
Simone