mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-17 10:31:05 -04:00
Changed Windows build environment
- Fixed deploy path with tor - Disabled webui in installer - Optimized file get-gcc-version.bat - Optimized file get-qt-version.bat - Renamed file msys-path.bat to msys2-path.bat - Removed file download-file-wildcard.bat - Removed file winhttpjs.bat - Removed download and usage of wget.exe
This commit is contained in:
parent
035010af76
commit
8c7920b545
13 changed files with 43 additions and 739 deletions
|
@ -19,45 +19,19 @@ if "%VarArchitecture%"=="" (
|
|||
|
||||
set GCCVersion=
|
||||
set GCCArchitecture=
|
||||
set _Architecture=
|
||||
|
||||
call "%~dp0find-in-path.bat" GCCPath gcc.exe
|
||||
if "%GCCPath%"=="" (
|
||||
echo.
|
||||
echo Cannot find gcc.exe in PATH.
|
||||
goto exit
|
||||
exit /B 1
|
||||
)
|
||||
|
||||
gcc --version >"%~dp0gccversion.tmp"
|
||||
for /F "tokens=1*" %%A in (%~sdp0gccversion.tmp) do (
|
||||
if "%%A"=="gcc" (
|
||||
call :find_version %%B
|
||||
call :find_architecture %%B
|
||||
goto exit
|
||||
)
|
||||
)
|
||||
for /F "tokens=1-8* delims= " %%A in ('gcc --version') do if "%%A"=="gcc" set _Architecture=%%B& set GCCVersion=%%G
|
||||
|
||||
:exit
|
||||
if exist "%~dp0gccversion.tmp" del /Q "%~dp0gccversion.tmp"
|
||||
|
||||
endlocal & set %VarVersion%=%GCCVersion%& set %VarArchitecture%=%GCCArchitecture%
|
||||
goto :EOF
|
||||
|
||||
:find_version
|
||||
:loop_version
|
||||
if "%2" NEQ "" (
|
||||
shift
|
||||
goto loop_version
|
||||
)
|
||||
set GCCVersion=%1
|
||||
goto :EOF
|
||||
|
||||
:find_architecture
|
||||
:loop_architecture
|
||||
if "%7" NEQ "" (
|
||||
shift
|
||||
goto loop_architecture
|
||||
)
|
||||
set _Architecture=%1
|
||||
if "%_Architecture:~1,4%"=="i686" set GCCArchitecture=x86
|
||||
if "%_Architecture:~1,6%"=="x86_64" set GCCArchitecture=x64
|
||||
goto :EOF
|
||||
|
||||
endlocal & set %VarVersion%=%GCCVersion%& set %VarArchitecture%=%GCCArchitecture%
|
||||
exit /B 0
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue