Deaicup/Deshab-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: drop realtest image variant (dev/release only)

Browse Source
This commit is contained in:
Linehu
2026-10-05 21:30:51 +08:00
parent ace5711a1e
commit 14015b78a4
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ISO/run_qemu.bat
+6 -9
View File
@@ -3,9 +3,9 @@ setlocal enabledelayedexpansion
set "SCRIPT_DIR=%~dp0" set "SCRIPT_DIR=%~dp0"
REM ===== Variant selection: dev / release / realtest ===== REM ===== Variant selection: dev / release =====
REM Priority: argument > QEMU_VARIANT env > interactive menu > default dev REM Priority: argument > QEMU_VARIANT env > interactive menu > default dev
REM Usage: run_qemu.bat [dev|release|realtest] REM Usage: run_qemu.bat [dev|release]
set "VARIANT=" set "VARIANT="
if not "%~1"=="" set "VARIANT=%~1" if not "%~1"=="" set "VARIANT=%~1"
if not defined VARIANT if defined QEMU_VARIANT set "VARIANT=%QEMU_VARIANT%" if not defined VARIANT if defined QEMU_VARIANT set "VARIANT=%QEMU_VARIANT%"
@@ -13,18 +13,15 @@ if not defined VARIANT (
echo [qemu] Select image variant to boot: echo [qemu] Select image variant to boot:
echo 1. dev ^(deshab-dev.img, debug all on, auto test^) echo 1. dev ^(deshab-dev.img, debug all on, auto test^)
echo 2. release ^(deshab-release.img, desktop + login^) echo 2. release ^(deshab-release.img, desktop + login^)
echo 3. realtest ^(deshab-realtest.img, real-machine safe options^) set /p CHOICE="Choice [1-2, Enter=dev]: "
set /p CHOICE="Choice [1-3, Enter=dev]: "
if "!CHOICE!"=="2" set "VARIANT=release" if "!CHOICE!"=="2" set "VARIANT=release"
if "!CHOICE!"=="3" set "VARIANT=realtest"
if not defined VARIANT set "VARIANT=dev" if not defined VARIANT set "VARIANT=dev"
) )
REM Validate variant name (also accepts passing 1/2/3 as argument) REM Validate variant name (also accepts passing 1/2 as argument)
if "%VARIANT%"=="1" set "VARIANT=dev" if "%VARIANT%"=="1" set "VARIANT=dev"
if "%VARIANT%"=="2" set "VARIANT=release" if "%VARIANT%"=="2" set "VARIANT=release"
if "%VARIANT%"=="3" set "VARIANT=realtest" if not "%VARIANT%"=="dev" if not "%VARIANT%"=="release" (
if not "%VARIANT%"=="dev" if not "%VARIANT%"=="release" if not "%VARIANT%"=="realtest" ( echo [qemu] Unknown variant: %VARIANT% ^(expected dev / release^)
echo [qemu] Unknown variant: %VARIANT% ^(expected dev / release / realtest^)
exit /b 1 exit /b 1
) )
build.ps1
+1 -7
View File
@@ -1,5 +1,5 @@
param( param(
[ValidateSet('dev','release','realtest','both')][string]$Variant = 'both', [ValidateSet('dev','release','both')][string]$Variant = 'both',
[switch]$Vhd [switch]$Vhd
) )
@@ -15,7 +15,6 @@ $Output = Join-Path $SystemDir 'boot\utsm.elf'
$DskOutput = Join-Path $SystemDir 'system\deshab64\deshab.elf' $DskOutput = Join-Path $SystemDir 'system\deshab64\deshab.elf'
$DevImagePath = Join-Path $IsoDir 'deshab-dev.img' $DevImagePath = Join-Path $IsoDir 'deshab-dev.img'
$ReleaseImagePath = Join-Path $IsoDir 'deshab-release.img' $ReleaseImagePath = Join-Path $IsoDir 'deshab-release.img'
$RealtestImagePath = Join-Path $IsoDir 'deshab-realtest.img'
$BuildTmp = Join-Path $Root '.build_tmp' $BuildTmp = Join-Path $Root '.build_tmp'
# Legacy single-FAT32 ESP size helper (New-GptFat32Image). Dual-partition # Legacy single-FAT32 ESP size helper (New-GptFat32Image). Dual-partition
@@ -1066,11 +1065,6 @@ if ($Variant -in @('release','both')) {
Build-ImageVariant 'release' $ReleaseImagePath Build-ImageVariant 'release' $ReleaseImagePath
Write-Host "[build] RELEASE image done: $ReleaseImagePath" Write-Host "[build] RELEASE image done: $ReleaseImagePath"
} }
if ($Variant -in @('realtest','both')) {
Write-Host '[build] === Building REALTEST image (real hardware, disk_log=1, debug on) ==='
Build-ImageVariant 'realtest' $RealtestImagePath
Write-Host "[build] REALTEST image done: $RealtestImagePath"
}
# Restore SYSTEM to dev config (dev is the primary development target) # Restore SYSTEM to dev config (dev is the primary development target)
if ($Variant -eq 'both') { if ($Variant -eq 'both') {
Write-Host '[build] Restoring SYSTEM to dev config for development...' Write-Host '[build] Restoring SYSTEM to dev config for development...'