Add NSIS plugin support and extraction functionality
- Implemented plugin API in `pluginapi.cpp` and `pluginapi.h` for NSIS integration. - Added resource files `resource.h` and `resource.rc` for versioning and resource management. - Created `ExtractCallbackConsole` class to handle extraction progress and user input. - Developed main extraction logic in `Main.cpp` and `MainAr.cpp` for handling archives. - Introduced user input utilities in `UserInputUtils2.cpp` and `UserInputUtils2.h` for password handling and user prompts. - Added break signal handling in `NSISBreak.cpp` and `NSISBreak.h` for graceful interruption of extraction processes. - Included standard header `StdAfx.h` for precompiled headers and common includes.
This commit is contained in:
@@ -84,6 +84,7 @@ def _find_msbuild_via_vswhere(vs_version: str) -> 'Optional[Tuple[Path, str, str
|
||||
result = subprocess.run(
|
||||
[
|
||||
str(_VSWHERE_PATH),
|
||||
'-products', '*',
|
||||
'-version', _VS_VERSION_RANGE[ver],
|
||||
'-latest',
|
||||
'-requires', 'Microsoft.Component.MSBuild',
|
||||
@@ -102,6 +103,13 @@ def _find_msbuild_via_vswhere(vs_version: str) -> 'Optional[Tuple[Path, str, str
|
||||
return None
|
||||
|
||||
|
||||
# Numeric version folder used by VS2026 installer (version 18.x)
|
||||
_VS_NUMERIC_FOLDER = {
|
||||
'2026': '18',
|
||||
'2022': '2022',
|
||||
}
|
||||
|
||||
|
||||
def find_msbuild(vs_version: str = 'auto') -> 'Optional[Tuple[Path, str, str]]':
|
||||
"""Find MSBuild.exe via vswhere, then well-known fallback paths.
|
||||
|
||||
@@ -114,11 +122,16 @@ def find_msbuild(vs_version: str = 'auto') -> 'Optional[Tuple[Path, str, str]]':
|
||||
vs_editions = ['Community', 'Professional', 'Enterprise', 'BuildTools']
|
||||
versions_to_try = ['2026', '2022'] if vs_version == 'auto' else [vs_version]
|
||||
for version in versions_to_try:
|
||||
base_path = Path(rf'C:\Program Files\Microsoft Visual Studio\{version}')
|
||||
for edition in vs_editions:
|
||||
msbuild_path = base_path / edition / 'MSBuild' / 'Current' / 'Bin' / 'MSBuild.exe'
|
||||
if msbuild_path.exists():
|
||||
return msbuild_path, _VS_TOOLSET[version], version
|
||||
numeric = _VS_NUMERIC_FOLDER.get(version, version)
|
||||
base_paths = [
|
||||
Path(rf'C:\Program Files (x86)\Microsoft Visual Studio\{numeric}'),
|
||||
Path(rf'C:\Program Files\Microsoft Visual Studio\{version}'),
|
||||
]
|
||||
for base_path in base_paths:
|
||||
for edition in vs_editions:
|
||||
msbuild_path = base_path / edition / 'MSBuild' / 'Current' / 'Bin' / 'MSBuild.exe'
|
||||
if msbuild_path.exists():
|
||||
return msbuild_path, _VS_TOOLSET[version], version
|
||||
return None
|
||||
|
||||
def get_project_paths() -> Tuple[Path, Path, Path]:
|
||||
|
||||
@@ -84,6 +84,7 @@ def _find_msbuild_via_vswhere(vs_version: str) -> 'Optional[Tuple[Path, str, str
|
||||
result = subprocess.run(
|
||||
[
|
||||
str(_VSWHERE_PATH),
|
||||
'-products', '*',
|
||||
'-version', _VS_VERSION_RANGE[ver],
|
||||
'-latest',
|
||||
'-requires', 'Microsoft.Component.MSBuild',
|
||||
@@ -102,6 +103,13 @@ def _find_msbuild_via_vswhere(vs_version: str) -> 'Optional[Tuple[Path, str, str
|
||||
return None
|
||||
|
||||
|
||||
# Numeric version folder used by VS2026 installer (version 18.x)
|
||||
_VS_NUMERIC_FOLDER = {
|
||||
'2026': '18',
|
||||
'2022': '2022',
|
||||
}
|
||||
|
||||
|
||||
def find_msbuild(vs_version: str = 'auto') -> 'Optional[Tuple[Path, str, str]]':
|
||||
"""Find MSBuild.exe via vswhere, then well-known fallback paths.
|
||||
|
||||
@@ -114,11 +122,16 @@ def find_msbuild(vs_version: str = 'auto') -> 'Optional[Tuple[Path, str, str]]':
|
||||
vs_editions = ['Community', 'Professional', 'Enterprise', 'BuildTools']
|
||||
versions_to_try = ['2026', '2022'] if vs_version == 'auto' else [vs_version]
|
||||
for version in versions_to_try:
|
||||
base_path = Path(rf'C:\Program Files\Microsoft Visual Studio\{version}')
|
||||
for edition in vs_editions:
|
||||
msbuild_path = base_path / edition / 'MSBuild' / 'Current' / 'Bin' / 'MSBuild.exe'
|
||||
if msbuild_path.exists():
|
||||
return msbuild_path, _VS_TOOLSET[version], version
|
||||
numeric = _VS_NUMERIC_FOLDER.get(version, version)
|
||||
base_paths = [
|
||||
Path(rf'C:\Program Files (x86)\Microsoft Visual Studio\{numeric}'),
|
||||
Path(rf'C:\Program Files\Microsoft Visual Studio\{version}'),
|
||||
]
|
||||
for base_path in base_paths:
|
||||
for edition in vs_editions:
|
||||
msbuild_path = base_path / edition / 'MSBuild' / 'Current' / 'Bin' / 'MSBuild.exe'
|
||||
if msbuild_path.exists():
|
||||
return msbuild_path, _VS_TOOLSET[version], version
|
||||
return None
|
||||
|
||||
def get_project_paths(toolset: str = 'v145') -> Tuple[Path, Path, Path]:
|
||||
|
||||
@@ -84,6 +84,7 @@ def _find_msbuild_via_vswhere(vs_version: str) -> 'Optional[Tuple[Path, str, str
|
||||
result = subprocess.run(
|
||||
[
|
||||
str(_VSWHERE_PATH),
|
||||
'-products', '*',
|
||||
'-version', _VS_VERSION_RANGE[ver],
|
||||
'-latest',
|
||||
'-requires', 'Microsoft.Component.MSBuild',
|
||||
@@ -102,6 +103,13 @@ def _find_msbuild_via_vswhere(vs_version: str) -> 'Optional[Tuple[Path, str, str
|
||||
return None
|
||||
|
||||
|
||||
# Numeric version folder used by VS2026 installer (version 18.x)
|
||||
_VS_NUMERIC_FOLDER = {
|
||||
'2026': '18',
|
||||
'2022': '2022',
|
||||
}
|
||||
|
||||
|
||||
def find_msbuild(vs_version: str = 'auto') -> 'Optional[Tuple[Path, str, str]]':
|
||||
"""Find MSBuild.exe via vswhere, then well-known fallback paths.
|
||||
|
||||
@@ -114,11 +122,16 @@ def find_msbuild(vs_version: str = 'auto') -> 'Optional[Tuple[Path, str, str]]':
|
||||
vs_editions = ['Community', 'Professional', 'Enterprise', 'BuildTools']
|
||||
versions_to_try = ['2026', '2022'] if vs_version == 'auto' else [vs_version]
|
||||
for version in versions_to_try:
|
||||
base_path = Path(rf'C:\Program Files\Microsoft Visual Studio\{version}')
|
||||
for edition in vs_editions:
|
||||
msbuild_path = base_path / edition / 'MSBuild' / 'Current' / 'Bin' / 'MSBuild.exe'
|
||||
if msbuild_path.exists():
|
||||
return msbuild_path, _VS_TOOLSET[version], version
|
||||
numeric = _VS_NUMERIC_FOLDER.get(version, version)
|
||||
base_paths = [
|
||||
Path(rf'C:\Program Files (x86)\Microsoft Visual Studio\{numeric}'),
|
||||
Path(rf'C:\Program Files\Microsoft Visual Studio\{version}'),
|
||||
]
|
||||
for base_path in base_paths:
|
||||
for edition in vs_editions:
|
||||
msbuild_path = base_path / edition / 'MSBuild' / 'Current' / 'Bin' / 'MSBuild.exe'
|
||||
if msbuild_path.exists():
|
||||
return msbuild_path, _VS_TOOLSET[version], version
|
||||
return None
|
||||
|
||||
def get_project_paths() -> Tuple[Path, Path, Path]:
|
||||
|
||||
@@ -0,0 +1,700 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Build script for nsis7z plugin (7-Zip ZS / mcmilk/7-Zip-zstd) - Visual Studio 2026
|
||||
Supports multiple build configurations with flexible parameters.
|
||||
Uses PlatformToolset v145 (Visual Studio 2026 Build Tools).
|
||||
|
||||
The 7-Zip ZS source is pulled from the git submodule at versions/7-zip-zstd/.
|
||||
The NSIS plugin wrapper (nsis7z.cpp, vcxproj, …) lives in versions/zstd/.
|
||||
|
||||
NOTE: VS2026 Build Tools use v145 toolset (version 18.x)
|
||||
"""
|
||||
|
||||
import argparse
|
||||
import os
|
||||
import sys
|
||||
import subprocess
|
||||
import shutil
|
||||
import time
|
||||
import multiprocessing
|
||||
import threading
|
||||
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||
from pathlib import Path
|
||||
from typing import List, Tuple, Optional
|
||||
import xml.etree.ElementTree as ET
|
||||
|
||||
|
||||
class BuildConfig:
|
||||
"""Configuration for a single build target"""
|
||||
def __init__(self, name: str, config: str, platform: str, dest_dir: str):
|
||||
self.name = name
|
||||
self.config = config
|
||||
self.platform = platform
|
||||
self.dest_dir = dest_dir
|
||||
|
||||
|
||||
# Predefined build configurations
|
||||
CONFIGS = {
|
||||
'x86-unicode': BuildConfig(
|
||||
name='x86-unicode',
|
||||
config='Release Unicode',
|
||||
platform='Win32',
|
||||
dest_dir='x86-unicode'
|
||||
),
|
||||
'x64-unicode': BuildConfig(
|
||||
name='x64-unicode',
|
||||
config='Release Unicode',
|
||||
platform='x64',
|
||||
dest_dir='amd64-unicode'
|
||||
),
|
||||
'x86-ansi': BuildConfig(
|
||||
name='x86-ansi',
|
||||
config='Release',
|
||||
platform='Win32',
|
||||
dest_dir='x86-ansi'
|
||||
),
|
||||
}
|
||||
|
||||
|
||||
# Standard vswhere.exe location (installed with any VS 2017+ setup)
|
||||
_VSWHERE_PATH = Path(r'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe')
|
||||
|
||||
# vswhere version range per VS year
|
||||
_VS_VERSION_RANGE = {
|
||||
'2026': '[18.0,19.0)',
|
||||
'2022': '[17.0,18.0)',
|
||||
}
|
||||
|
||||
# MSBuild toolset per VS year
|
||||
_VS_TOOLSET = {
|
||||
'2026': 'v145', # VS 2026 uses v145 toolset
|
||||
'2022': 'v143', # VS 2022 uses v143 toolset
|
||||
}
|
||||
|
||||
|
||||
def _find_msbuild_via_vswhere(vs_version: str) -> 'Optional[Tuple[Path, str, str]]':
|
||||
"""Locate MSBuild via vswhere.exe."""
|
||||
if not _VSWHERE_PATH.exists():
|
||||
return None
|
||||
versions_to_try = ['2026', '2022'] if vs_version == 'auto' else [vs_version]
|
||||
for ver in versions_to_try:
|
||||
if ver not in _VS_VERSION_RANGE:
|
||||
continue
|
||||
try:
|
||||
result = subprocess.run(
|
||||
[
|
||||
str(_VSWHERE_PATH),
|
||||
'-products', '*',
|
||||
'-version', _VS_VERSION_RANGE[ver],
|
||||
'-latest',
|
||||
'-requires', 'Microsoft.Component.MSBuild',
|
||||
'-find', r'MSBuild\**\Bin\MSBuild.exe',
|
||||
],
|
||||
capture_output=True, text=True, timeout=15,
|
||||
)
|
||||
if result.returncode == 0:
|
||||
lines = [ln.strip() for ln in result.stdout.splitlines() if ln.strip()]
|
||||
if lines:
|
||||
msbuild_path = Path(lines[0])
|
||||
if msbuild_path.exists():
|
||||
return msbuild_path, _VS_TOOLSET[ver], ver
|
||||
except Exception:
|
||||
pass
|
||||
return None
|
||||
|
||||
|
||||
# Numeric version folder used by VS2026 installer (version 18.x)
|
||||
_VS_NUMERIC_FOLDER = {
|
||||
'2026': '18',
|
||||
'2022': '2022',
|
||||
}
|
||||
|
||||
|
||||
def find_msbuild(vs_version: str = 'auto') -> 'Optional[Tuple[Path, str, str]]':
|
||||
"""Find MSBuild.exe via vswhere, then well-known fallback paths.
|
||||
|
||||
Returns (msbuild_path, toolset_version, vs_year) or None.
|
||||
"""
|
||||
result = _find_msbuild_via_vswhere(vs_version)
|
||||
if result is not None:
|
||||
return result
|
||||
|
||||
vs_editions = ['Community', 'Professional', 'Enterprise', 'BuildTools']
|
||||
versions_to_try = ['2026', '2022'] if vs_version == 'auto' else [vs_version]
|
||||
for version in versions_to_try:
|
||||
numeric = _VS_NUMERIC_FOLDER.get(version, version)
|
||||
base_paths = [
|
||||
Path(rf'C:\Program Files (x86)\Microsoft Visual Studio\{numeric}'),
|
||||
Path(rf'C:\Program Files\Microsoft Visual Studio\{version}'),
|
||||
]
|
||||
for base_path in base_paths:
|
||||
for edition in vs_editions:
|
||||
msbuild_path = base_path / edition / 'MSBuild' / 'Current' / 'Bin' / 'MSBuild.exe'
|
||||
if msbuild_path.exists():
|
||||
return msbuild_path, _VS_TOOLSET[version], version
|
||||
return None
|
||||
|
||||
|
||||
def get_project_paths(toolset: str = 'v145') -> 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' / 'zstd'
|
||||
vcxproj = 'Nsis7z_vs2026.vcxproj'
|
||||
project_file = project_dir / 'CPP' / '7zip' / 'Bundles' / 'Nsis7z' / vcxproj
|
||||
plugins_dir = script_dir.parent.parent / 'plugins'
|
||||
|
||||
return project_dir, project_file, plugins_dir
|
||||
|
||||
|
||||
def get_cpu_info() -> dict:
|
||||
"""Get CPU information for parallel build optimization"""
|
||||
try:
|
||||
import psutil
|
||||
logical_cores = psutil.cpu_count(logical=True)
|
||||
physical_cores = psutil.cpu_count(logical=False)
|
||||
|
||||
return {
|
||||
'logical_cores': logical_cores,
|
||||
'physical_cores': physical_cores,
|
||||
'has_hyperthreading': logical_cores > physical_cores,
|
||||
'has_psutil': True
|
||||
}
|
||||
except ImportError:
|
||||
cpu_count = multiprocessing.cpu_count()
|
||||
return {
|
||||
'logical_cores': cpu_count,
|
||||
'physical_cores': cpu_count,
|
||||
'has_hyperthreading': False,
|
||||
'has_psutil': False
|
||||
}
|
||||
|
||||
|
||||
def get_optimal_thread_count() -> int:
|
||||
"""Get optimal thread count for compilation"""
|
||||
cpu_info = get_cpu_info()
|
||||
if cpu_info['has_hyperthreading'] and cpu_info['physical_cores'] > 1:
|
||||
return cpu_info['physical_cores']
|
||||
return cpu_info['logical_cores']
|
||||
|
||||
|
||||
def get_build_optimizations() -> List[str]:
|
||||
"""Get additional build optimization flags"""
|
||||
return [
|
||||
'/p:BuildInParallel=true',
|
||||
'/p:MultiProcessorCompilation=true',
|
||||
'/p:PreferredToolArchitecture=x64',
|
||||
'/p:UseSharedCompilation=true',
|
||||
'/p:TrackFileAccess=false',
|
||||
'/nodeReuse:true',
|
||||
'/p:GenerateResourceUsePreserializedResources=true'
|
||||
]
|
||||
|
||||
|
||||
def get_memory_optimizations() -> List[str]:
|
||||
"""Get memory optimization flags for faster builds"""
|
||||
try:
|
||||
import psutil
|
||||
memory_gb = psutil.virtual_memory().total / (1024 ** 3)
|
||||
if memory_gb >= 16:
|
||||
return [
|
||||
'/p:DisableFastUpToDateCheck=false',
|
||||
'/p:BuildProjectReferences=true',
|
||||
'/p:UseCommonOutputDirectory=false'
|
||||
]
|
||||
elif memory_gb >= 8:
|
||||
return ['/p:DisableFastUpToDateCheck=false']
|
||||
else:
|
||||
return []
|
||||
except ImportError:
|
||||
return ['/p:DisableFastUpToDateCheck=false']
|
||||
|
||||
|
||||
def print_cpu_info(use_parallel: bool, use_optimizations: bool = True) -> None:
|
||||
"""Print CPU information for build optimization"""
|
||||
if not use_parallel:
|
||||
print("Build mode: Single-threaded")
|
||||
if use_optimizations:
|
||||
print("Optimizations: ENABLED (memory, caching)")
|
||||
return
|
||||
|
||||
cpu_info = get_cpu_info()
|
||||
optimal_threads = get_optimal_thread_count()
|
||||
|
||||
print("Build mode: Parallel")
|
||||
print(f"Logical cores: {cpu_info['logical_cores']}")
|
||||
print(f"Physical cores: {cpu_info['physical_cores']}")
|
||||
|
||||
if cpu_info['has_hyperthreading']:
|
||||
print("Hyperthreading: ENABLED")
|
||||
print(f"Optimal threads: {optimal_threads} (using physical cores)")
|
||||
else:
|
||||
print("Hyperthreading: NOT AVAILABLE")
|
||||
print(f"Optimal threads: {optimal_threads}")
|
||||
|
||||
print(f"MSBuild threads: {optimal_threads}")
|
||||
|
||||
if use_optimizations:
|
||||
print("Optimizations: ENABLED (parallel, memory, caching)")
|
||||
try:
|
||||
import psutil
|
||||
memory_gb = psutil.virtual_memory().total / (1024 ** 3)
|
||||
print(f"Available memory: {memory_gb:.1f} GB")
|
||||
except ImportError:
|
||||
print("Available memory: Unknown (install psutil for details)")
|
||||
else:
|
||||
print("Optimizations: DISABLED")
|
||||
|
||||
if not cpu_info['has_psutil']:
|
||||
print("Note: Install 'psutil' for detailed CPU/memory info (pip install psutil)")
|
||||
|
||||
print()
|
||||
|
||||
|
||||
def build_configuration(
|
||||
msbuild_path: Path,
|
||||
project_file: Path,
|
||||
config: BuildConfig,
|
||||
rebuild: bool = True,
|
||||
verbosity: str = 'quiet',
|
||||
parallel: bool = True,
|
||||
optimizations: bool = True,
|
||||
counter: str = "",
|
||||
capture_output: bool = False,
|
||||
toolset: str = 'v145',
|
||||
) -> Tuple[bool, float, str]:
|
||||
"""Build a single configuration.
|
||||
|
||||
Returns (success, elapsed_time, captured_output).
|
||||
"""
|
||||
cmd = [
|
||||
str(msbuild_path),
|
||||
str(project_file),
|
||||
f'/t:{"Rebuild" if rebuild else "Build"}',
|
||||
f'/p:Configuration={config.config}',
|
||||
f'/p:Platform={config.platform}',
|
||||
f'/p:OutDir=Build\\{config.name}\\',
|
||||
f'/p:IntDir=Build\\{config.name}\\obj\\',
|
||||
'/p:WindowsTargetPlatformVersion=10.0',
|
||||
f'/p:PlatformToolset={toolset}',
|
||||
f'/v:{verbosity}',
|
||||
]
|
||||
|
||||
if parallel:
|
||||
optimal_threads = get_optimal_thread_count()
|
||||
cmd.extend([
|
||||
f'/maxcpucount:{optimal_threads}',
|
||||
'/p:UseMultiToolTask=true',
|
||||
f'/p:CL_MPCount={optimal_threads}'
|
||||
])
|
||||
|
||||
if optimizations:
|
||||
cmd.extend(get_build_optimizations())
|
||||
cmd.extend(get_memory_optimizations())
|
||||
cache_dir = setup_build_cache()
|
||||
if cache_dir:
|
||||
cmd.append('/p:MSBuildCacheEnabled=true')
|
||||
|
||||
if not capture_output:
|
||||
print(f"\n{'=' * 50}")
|
||||
if counter:
|
||||
print(f"Building {config.name} [{counter}]")
|
||||
else:
|
||||
print(f"Building {config.name}...")
|
||||
print('=' * 50)
|
||||
|
||||
start_time = time.time()
|
||||
try:
|
||||
if capture_output:
|
||||
result = subprocess.run(cmd, check=False, capture_output=True, text=True)
|
||||
elapsed = time.time() - start_time
|
||||
return result.returncode == 0, elapsed, result.stdout + result.stderr
|
||||
else:
|
||||
result = subprocess.run(cmd, check=False)
|
||||
elapsed = time.time() - start_time
|
||||
return result.returncode == 0, elapsed, ""
|
||||
except Exception as e:
|
||||
elapsed = time.time() - start_time
|
||||
msg = f"ERROR: Build failed with exception: {e}"
|
||||
if capture_output:
|
||||
return False, elapsed, msg
|
||||
print(msg)
|
||||
return False, elapsed, ""
|
||||
|
||||
|
||||
def copy_output(
|
||||
project_dir: Path,
|
||||
plugins_dir: Path,
|
||||
config: BuildConfig
|
||||
) -> Tuple[bool, int, Optional[Path]]:
|
||||
"""Copy built DLL to destination directory.
|
||||
|
||||
Returns (success, file_size, dest_path).
|
||||
"""
|
||||
output_file = (
|
||||
project_dir / 'CPP' / '7zip' / 'Bundles' / 'Nsis7z'
|
||||
/ 'Build' / config.name / 'nsis7z.dll'
|
||||
)
|
||||
dest_dir = plugins_dir / config.dest_dir
|
||||
|
||||
if not output_file.exists():
|
||||
print(f"ERROR: {config.name} DLL not found at {output_file}")
|
||||
return False, 0, None
|
||||
|
||||
dest_dir.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
try:
|
||||
dest_path = dest_dir / 'nsis7z.dll'
|
||||
shutil.copy2(output_file, dest_path)
|
||||
file_size = output_file.stat().st_size
|
||||
print(f"SUCCESS: {config.name} - {file_size:,} bytes - Copied to {dest_dir}")
|
||||
return True, file_size, dest_path
|
||||
except Exception as e:
|
||||
print(f"ERROR: Failed to copy {config.name}: {e}")
|
||||
return False, 0, None
|
||||
|
||||
|
||||
def clean_build_artifacts(project_dir: Path, configs: List[BuildConfig]) -> None:
|
||||
"""Clean up build artifacts"""
|
||||
print("\nCleaning build artifacts...")
|
||||
|
||||
build_base_dir = (
|
||||
project_dir / 'CPP' / '7zip' / 'Bundles' / 'Nsis7z' / 'Build'
|
||||
)
|
||||
|
||||
dirs_to_clean = {build_base_dir / config.name for config in configs}
|
||||
|
||||
for dir_path in dirs_to_clean:
|
||||
if dir_path.exists():
|
||||
try:
|
||||
shutil.rmtree(dir_path)
|
||||
print(f" - Cleaned: {dir_path.name}")
|
||||
except Exception as e:
|
||||
print(f" - Failed to clean {dir_path.name}: {e}")
|
||||
|
||||
print("Build artifacts cleaned successfully.")
|
||||
|
||||
|
||||
def format_time(seconds: float) -> str:
|
||||
"""Format seconds to human-readable string"""
|
||||
if seconds < 60:
|
||||
return f"{seconds:.2f}s"
|
||||
elif seconds < 3600:
|
||||
minutes = int(seconds // 60)
|
||||
secs = seconds % 60
|
||||
return f"{minutes}m {secs:.1f}s"
|
||||
else:
|
||||
hours = int(seconds // 3600)
|
||||
minutes = int((seconds % 3600) // 60)
|
||||
secs = seconds % 60
|
||||
return f"{hours}h {minutes}m {secs:.0f}s"
|
||||
|
||||
|
||||
def setup_build_cache() -> Optional[str]:
|
||||
"""Setup build cache directory for faster incremental builds"""
|
||||
try:
|
||||
cache_dir = Path.home() / '.msbuild_cache' / 'nsis7z-zstd-vs2026'
|
||||
cache_dir.mkdir(parents=True, exist_ok=True)
|
||||
return str(cache_dir)
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
|
||||
def get_available_configurations(project_file: Path) -> List[Tuple[str, str]]:
|
||||
"""Parse .vcxproj file to get available configurations"""
|
||||
try:
|
||||
tree = ET.parse(project_file)
|
||||
root = tree.getroot()
|
||||
ns = {'ms': 'http://schemas.microsoft.com/developer/msbuild/2003'}
|
||||
configs = []
|
||||
for item_group in root.findall('.//ms:ItemGroup', ns):
|
||||
for proj_config in item_group.findall('ms:ProjectConfiguration', ns):
|
||||
include = proj_config.get('Include')
|
||||
if include:
|
||||
parts = include.split('|')
|
||||
if len(parts) == 2:
|
||||
configs.append((parts[0], parts[1]))
|
||||
return configs
|
||||
except Exception as e:
|
||||
print(f"Warning: Could not parse project file: {e}")
|
||||
return []
|
||||
|
||||
|
||||
def print_available_configurations(project_file: Path) -> None:
|
||||
"""Print all configurations available in the project"""
|
||||
configs = get_available_configurations(project_file)
|
||||
if not configs:
|
||||
print("No configurations found or could not read project file.")
|
||||
return
|
||||
|
||||
print("Available configurations in project:")
|
||||
print("-" * 60)
|
||||
from collections import defaultdict
|
||||
grouped = defaultdict(list)
|
||||
for config, platform in configs:
|
||||
grouped[config].append(platform)
|
||||
for config_name in sorted(grouped.keys()):
|
||||
platforms = ', '.join(sorted(grouped[config_name]))
|
||||
print(f" {config_name:25s} - {platforms}")
|
||||
print(f"\nTotal: {len(configs)} configuration(s)")
|
||||
print()
|
||||
print("Configurations mapped in this build script:")
|
||||
print("-" * 60)
|
||||
for name, config in CONFIGS.items():
|
||||
print(f" {name:15s} -> {config.config} / {config.platform}")
|
||||
print()
|
||||
|
||||
|
||||
_print_lock = threading.Lock()
|
||||
|
||||
|
||||
def _build_configs_parallel(
|
||||
msbuild_path: Path,
|
||||
project_file: Path,
|
||||
configs: 'List[BuildConfig]',
|
||||
*,
|
||||
rebuild: bool,
|
||||
verbosity: str,
|
||||
parallel: bool,
|
||||
optimizations: bool,
|
||||
project_dir: Path,
|
||||
plugins_dir: Path,
|
||||
toolset: str = 'v145',
|
||||
) -> list:
|
||||
"""Build all configurations simultaneously, printing output atomically."""
|
||||
n = len(configs)
|
||||
print(f"\nParallel-configs: launching {n} builds simultaneously...")
|
||||
print("=" * 50)
|
||||
|
||||
total_start = time.time()
|
||||
results_by_idx: dict = {}
|
||||
idx_lock = threading.Lock()
|
||||
|
||||
def _build_one(idx: int, config: 'BuildConfig'):
|
||||
success, build_time, captured = build_configuration(
|
||||
msbuild_path, project_file, config,
|
||||
rebuild=rebuild, verbosity=verbosity,
|
||||
parallel=parallel, optimizations=optimizations,
|
||||
capture_output=True, toolset=toolset,
|
||||
)
|
||||
import io, contextlib
|
||||
copy_buf = io.StringIO()
|
||||
if success:
|
||||
with contextlib.redirect_stdout(copy_buf):
|
||||
copy_ok, file_size, dest_path = copy_output(project_dir, plugins_dir, config)
|
||||
else:
|
||||
copy_ok, file_size, dest_path = False, 0, None
|
||||
|
||||
with _print_lock:
|
||||
all_ok = success and copy_ok
|
||||
tag = "OK" if all_ok else "FAILED"
|
||||
size_str = f"{file_size:,} bytes" if file_size > 0 else "N/A"
|
||||
print(f"[{tag}] {config.name} ({format_time(build_time)}) {size_str}")
|
||||
if dest_path:
|
||||
print(f" -> {dest_path}")
|
||||
if not all_ok:
|
||||
copy_out = copy_buf.getvalue()
|
||||
if copy_out.strip():
|
||||
print(copy_out.rstrip())
|
||||
if captured.strip():
|
||||
print("--- Build output ---")
|
||||
print(captured.rstrip())
|
||||
|
||||
with idx_lock:
|
||||
results_by_idx[idx] = (config, success and copy_ok, build_time, file_size, dest_path)
|
||||
|
||||
with ThreadPoolExecutor(max_workers=n) as executor:
|
||||
futures = {executor.submit(_build_one, i, cfg): i for i, cfg in enumerate(configs)}
|
||||
for fut in as_completed(futures):
|
||||
exc = fut.exception()
|
||||
if exc:
|
||||
idx = futures[fut]
|
||||
with _print_lock:
|
||||
print(f"ERROR: worker for config index {idx} raised: {exc}")
|
||||
with idx_lock:
|
||||
results_by_idx[idx] = (configs[idx], False, 0.0, 0, None)
|
||||
|
||||
wall_time = time.time() - total_start
|
||||
print(f"\nAll {n} configs finished in {format_time(wall_time)} (wall clock)")
|
||||
return [results_by_idx[i] for i in range(n)]
|
||||
|
||||
|
||||
def main():
|
||||
"""Main build function"""
|
||||
parser = argparse.ArgumentParser(
|
||||
description='Build nsis7z plugin (7-Zip ZS / mcmilk/7-Zip-zstd, Visual Studio 2026)',
|
||||
formatter_class=argparse.RawDescriptionHelpFormatter,
|
||||
epilog="""
|
||||
Examples:
|
||||
%(prog)s # Build all configurations
|
||||
%(prog)s --list # List script configurations
|
||||
%(prog)s --list-project # List all project configurations
|
||||
%(prog)s --configs x86-unicode # Build only x86-unicode
|
||||
%(prog)s --configs x86-unicode x64-unicode
|
||||
%(prog)s --no-rebuild # Incremental build
|
||||
%(prog)s --no-parallel # Single-threaded build
|
||||
%(prog)s --no-clean # Skip cleanup
|
||||
%(prog)s --verbosity minimal # Show more build output
|
||||
"""
|
||||
)
|
||||
|
||||
parser.add_argument(
|
||||
'--configs', nargs='+',
|
||||
choices=list(CONFIGS.keys()) + ['all'],
|
||||
default=['all'],
|
||||
help='Configurations to build (default: all)'
|
||||
)
|
||||
parser.add_argument('--rebuild', action='store_true', default=True)
|
||||
parser.add_argument('--no-rebuild', action='store_false', dest='rebuild',
|
||||
help='Incremental build (only changed files)')
|
||||
parser.add_argument('--parallel', action='store_true', default=True)
|
||||
parser.add_argument('--no-parallel', action='store_false', dest='parallel')
|
||||
parser.add_argument('--verbosity',
|
||||
choices=['quiet', 'minimal', 'normal', 'detailed', 'diagnostic'],
|
||||
default='quiet')
|
||||
parser.add_argument('--clean', action='store_true', default=True)
|
||||
parser.add_argument('--no-clean', action='store_false', dest='clean')
|
||||
parser.add_argument('--list', action='store_true',
|
||||
help='List script configurations and exit')
|
||||
parser.add_argument('--list-project', action='store_true',
|
||||
help='List all configurations in the .vcxproj and exit')
|
||||
parser.add_argument('--pause', action='store_true',
|
||||
help='Wait for key press at the end')
|
||||
parser.add_argument('--no-optimizations', action='store_true',
|
||||
help='Disable additional build optimizations')
|
||||
parser.add_argument('--vs-version', choices=['auto', '2026', '2022'], default='auto',
|
||||
help='Visual Studio version to use (default: auto)')
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
# Find MSBuild
|
||||
msbuild_result = find_msbuild(args.vs_version)
|
||||
if not msbuild_result:
|
||||
print("ERROR: MSBuild not found!")
|
||||
return 1
|
||||
msbuild_path, platform_toolset, vs_version_name = msbuild_result
|
||||
|
||||
# Get project paths
|
||||
project_dir, project_file, plugins_dir = get_project_paths(platform_toolset)
|
||||
|
||||
if args.list_project:
|
||||
if not project_file.exists():
|
||||
print(f"ERROR: Project file not found: {project_file}")
|
||||
return 1
|
||||
print_available_configurations(project_file)
|
||||
return 0
|
||||
|
||||
if args.list:
|
||||
print("Build script configurations (7-Zip ZS / mcmilk, VS2026):")
|
||||
print("-" * 60)
|
||||
for name, config in CONFIGS.items():
|
||||
print(f" {name:15s} -> {config.config} / {config.platform}")
|
||||
print(f"\nTotal: {len(CONFIGS)} configuration(s)")
|
||||
return 0
|
||||
|
||||
if not project_file.exists():
|
||||
print(f"ERROR: Project file not found: {project_file}")
|
||||
print()
|
||||
print("Make sure the submodule is initialised:")
|
||||
print(" git submodule update --init versions/7-zip-zstd")
|
||||
return 1
|
||||
|
||||
# Determine configurations to build
|
||||
if 'all' in args.configs:
|
||||
configs_to_build = list(CONFIGS.values())
|
||||
else:
|
||||
configs_to_build = [CONFIGS[name] for name in args.configs]
|
||||
|
||||
# Print header
|
||||
print("=" * 60)
|
||||
print(
|
||||
f"Building nsis7z plugin (7-Zip ZS, VS2026)"
|
||||
f" - {len(configs_to_build)} configuration(s)"
|
||||
)
|
||||
print("=" * 60)
|
||||
print(f"Visual Studio: {vs_version_name} (toolset {platform_toolset})")
|
||||
print(f"MSBuild: {msbuild_path}")
|
||||
print(f"Project: {project_file}")
|
||||
print(f"Plugins: {plugins_dir}")
|
||||
print(f"Rebuild: {args.rebuild}")
|
||||
print(f"Verbosity: {args.verbosity}")
|
||||
print()
|
||||
|
||||
use_optimizations = not args.no_optimizations
|
||||
print_cpu_info(args.parallel, use_optimizations)
|
||||
|
||||
# Build
|
||||
build_results = []
|
||||
total_start_time = time.time()
|
||||
|
||||
if args.parallel and len(configs_to_build) > 1:
|
||||
build_results = _build_configs_parallel(
|
||||
msbuild_path, project_file, configs_to_build,
|
||||
rebuild=args.rebuild, verbosity=args.verbosity,
|
||||
parallel=args.parallel, optimizations=use_optimizations,
|
||||
project_dir=project_dir, plugins_dir=plugins_dir,
|
||||
toolset=platform_toolset,
|
||||
)
|
||||
else:
|
||||
for i, config in enumerate(configs_to_build, 1):
|
||||
success, build_time, _ = build_configuration(
|
||||
msbuild_path, project_file, config,
|
||||
rebuild=args.rebuild, verbosity=args.verbosity,
|
||||
parallel=args.parallel, optimizations=use_optimizations,
|
||||
counter=f"{i}/{len(configs_to_build)}",
|
||||
toolset=platform_toolset,
|
||||
)
|
||||
|
||||
if not success:
|
||||
print(f"ERROR: {config.name} build failed! (Time: {format_time(build_time)})")
|
||||
build_results.append((config, False, build_time, 0, None))
|
||||
continue
|
||||
|
||||
success, file_size, dest_path = copy_output(project_dir, plugins_dir, config)
|
||||
print(f"Build time: {format_time(build_time)}")
|
||||
build_results.append((config, success, build_time, file_size, dest_path))
|
||||
|
||||
total_time = time.time() - total_start_time
|
||||
|
||||
# Summary
|
||||
print("\n" + "=" * 50)
|
||||
all_success = all(success for _, success, _, _, _ in build_results)
|
||||
|
||||
if all_success:
|
||||
print("ALL BUILDS SUCCESSFUL!")
|
||||
print("=" * 50)
|
||||
print("\nPlugins copied to:")
|
||||
for config, _, build_time, file_size, dest_path in build_results:
|
||||
dest = dest_path or plugins_dir / config.dest_dir / 'nsis7z.dll'
|
||||
print(f" - {dest}")
|
||||
if args.clean:
|
||||
print()
|
||||
clean_build_artifacts(project_dir, configs_to_build)
|
||||
else:
|
||||
print("SOME BUILDS FAILED!")
|
||||
print("=" * 50)
|
||||
print("\nFailed configurations:")
|
||||
for config, success, build_time, file_size, dest_path in build_results:
|
||||
if not success:
|
||||
print(f" - {config.name}")
|
||||
|
||||
print("\n" + "-" * 50)
|
||||
print("Build Summary:")
|
||||
for config, success, build_time, file_size, dest_path in build_results:
|
||||
status = "OK" if success else "FAIL"
|
||||
size_str = f"{file_size:,} bytes" if file_size > 0 else "N/A"
|
||||
print(f" {status} {config.name:15s} - {format_time(build_time):8s} - {size_str}")
|
||||
print("-" * 50)
|
||||
print(f"Total time: {format_time(total_time)}")
|
||||
print()
|
||||
|
||||
if args.pause:
|
||||
try:
|
||||
input("Press Enter to continue...")
|
||||
except EOFError:
|
||||
pass
|
||||
|
||||
return 0 if all_success else 1
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main())
|
||||
Reference in New Issue
Block a user