Skip to content

Fix for missing choice.exe on XP #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brickviking wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix for missing choice.exe on XP #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bfb244c
Work around missing CHOICE.EXE
brickviking Sep 11, 2022
a568095
Check if we downloaded curl previously
brickviking Sep 11, 2022
24f1893
Correcting variable test
brickviking Sep 12, 2022
3fead70
Checking if user has 7zip already
brickviking Sep 12, 2022
fcc61cc
Checking Windows version
brickviking Sep 12, 2022
319fc32
Reprodding CI build
brickviking Sep 17, 2022
97be38e
Correcting text to be the same as above string
brickviking Sep 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions findcurl.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,18 @@ rem Check if curl exists
curl --version 2>NUL 1>&2


if %ERRORLEVEL == 9009 (
if %ERRORLEVEL% == 9009 (
rem check if we have it already
if exist internal\curl\curl.exe goto gotcurl
mkdir internal\curl >NUL
echo Fetching %LINK%
explorer %LINK%

rem we should wait until the file is downloaded, because explorer returns straight away
:keeptesting
rem sleep 5 - we need to find something that'll work on XP, as timeout doesn't exist
rem if not exist "%USERPROFILE%\Desktop\%CURLVERSION%" goto keeptesting
"%SystemRoot%\system32\expand.exe" "%USERPROFILE%\Desktop\%CURLVERSION%" /F:%ARCH%\* internal\curl

:gotcurl
rem Add to path
PATH=%PATH%;%~dp0\internal\curl
) ELSE (
Expand Down
36 changes: 28 additions & 8 deletions setup_win.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,12 @@ rem )
reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && goto chose32 || goto choose

:choose
choice /c 12 /M "Use (1) 64-bit or (2) 32-bit MINGW? "
if errorlevel == 1 goto chose64
if not exist %SystemRoot%\system32\choice.exe (
set /p errorlevel="Install (1) 64-bit or (2) 32-bit MINGW? "
) else (
choice /c 12 /M "Install (1) 64-bit or (2) 32-bit MINGW? "
)
if errorlevel 1 goto chose64
goto chose32

:chose32
Expand All @@ -74,18 +78,34 @@ goto chosen
echo Downloading %url%...
curl -L %url% -o temp.7z

echo Downloading 7zr.exe...
curl -L https://www.7-zip.org/a/7zr.exe -o 7zr.exe

echo Extracting C++ Compiler...
7zr.exe x temp.7z -y
echo Testing for 7zip
7z >NUL 2>&1

if ERRORLEVEL 9009 (

echo Downloading 7zr.exe...
rem Check for XP (either 32-bit or 64-bit)
ver | findstr /R /C:"Version 5.[12]"
if errorlevel 0 (
curl -Lk https://www.7-zip.org/a/7zr.exe -o 7zr.exe
) else (
curl -L https://www.7-zip.org/a/7zr.exe -o 7zr.exe
)

echo Extracting C++ Compiler...
7zr.exe x temp.7z -y
) else (
echo Extracting C++ Compiler...
7z x temp.7z -y
)

echo Moving C++ compiler...
for /f %%a in ('dir %MINGW% /b') do move /y "%MINGW%\%%a" internal\c\c_compiler\

echo Cleaning up..
rd %MINGW%
del 7zr.exe
if exist 7zr.exe del 7zr.exe

del temp.7z

:skipccompsetup
Expand Down