Make prompts CI capable 2/30 completed

pal1000 · Oct 31, 2024 · 902b925 · 902b925
1 parent 87a2333
commit 902b925
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/bin/modules/abiselect.cmd b/bin/modules/abiselect.cmd
@@ -2,8 +2,7 @@
 @if /I NOT %PROCESSOR_ARCHITECTURE%==X86 echo 1. x86 32-bit (Default)
 @if /I NOT %PROCESSOR_ARCHITECTURE%==X86 echo 2. x64 (x86 64-bit)
 @if /I %PROCESSOR_ARCHITECTURE%==ARM64 echo 3. ARM64
-@if /I NOT %PROCESSOR_ARCHITECTURE%==X86 set /p cpuchoice=Enter choice:
-@if /I NOT %PROCESSOR_ARCHITECTURE%==X86 echo.
+@if /I NOT %PROCESSOR_ARCHITECTURE%==X86 call "%~dp0prompt.cmd" cpuchoice "Enter choice:"
 @set invalidcpuchoice=0
 @if /I %PROCESSOR_ARCHITECTURE%==X86 set cpuchoice=1
 @if /I %PROCESSOR_ARCHITECTURE%==AMD64 IF NOT "%cpuchoice%"=="1" IF NOT "%cpuchoice%"=="2" set invalidcpuchoice=1

diff --git a/bin/modules/prompt.cmd b/bin/modules/prompt.cmd
@@ -0,0 +1,5 @@
+@IF NOT defined cimode set cimode=0
+@if %cimode% EQU 0 set /p %1=%~2
+@setlocal ENABLEDELAYEDEXPANSION
+@if %cimode% EQU 1 IF NOT "!%1!"=="" echo %~2!%1!
+@echo.
diff --git a/buildscript/modules/abi.cmd b/buildscript/modules/abi.cmd
@@ -8,8 +8,7 @@
 @rem Select MinGW shell based on ABI
 @set MSYSTEM=UCRT64
 @set LMSYSTEM=ucrt64
-@if %abi%==x64 IF NOT %toolchain%==msvc set /p gccmsvcrt=Use MSVCRT compatible toolchain for MinGW GCC x64 build (y/n):
-@if %abi%==x64 IF NOT %toolchain%==msvc echo.
+@if %abi%==x64 IF NOT %toolchain%==msvc call "%devroot%\%projectname%\bin\modules\prompt.cmd" gccmsvcrt "Use MSVCRT compatible toolchain for MinGW GCC x64 build (y/n):"
 @if /I "%gccmsvcrt%"=="y" set MSYSTEM=MINGW64
 @IF /I "%gccmsvcrt%"=="y" set LMSYSTEM=mingw64
 @IF %abi%==x86 set MSYSTEM=MINGW32