Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-23 00:09:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small fixes:

Browse Source 
- Documenting CONFIG+=
- Changed back msys2 download to an older version, the current one had bugs
This commit is contained in:
hunbernd 2020-06-06 23:50:04 +02:00
parent 2f3a8a9815
commit 03b4c69ae9
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_scripts/Windows-msys2/build/build-webui.bat
View File

@ -7,8 +7,6 @@ call "%~dp0..\env.bat"
if errorlevel 1 goto error_env if errorlevel 1 goto error_env
call "%EnvPath%\env.bat" call "%EnvPath%\env.bat"
if errorlevel 1 goto error_env if errorlevel 1 goto error_env
call "%EnvPath%\env.bat"
if errorlevel 1 goto error_env
call "%EnvPath%\env-msys2.bat" call "%EnvPath%\env-msys2.bat"
if errorlevel 1 goto error_env if errorlevel 1 goto error_env

3
build_scripts/Windows-msys2/build/env-base.bat
View File

@ -108,7 +108,7 @@ exit /B 0
:usage :usage
echo. echo.
echo Usage: 32^|64 release^|debug [autologin plugins webui singlethread clang indexing noupdate] echo Usage: 32^|64 release^|debug [autologin plugins webui singlethread clang indexing noupdate] ["CONFIG+=..."]
echo. echo.
echo Mandatory parameter echo Mandatory parameter
echo 32^|64 32-bit or 64-bit Version echo 32^|64 32-bit or 64-bit Version
@ -122,6 +122,7 @@ echo singlethread Use only 1 thread for building
echo clang Use clang compiler instead of GCC echo clang Use clang compiler instead of GCC
echo indexing Build with deep channel and file indexing support echo indexing Build with deep channel and file indexing support
echo noupdate Skip updating the libraries echo noupdate Skip updating the libraries
echo "CONFIG+=..." Enable some extra features, you can find the almost complete list in retroshare.pri
echo. echo.
echo Parameter for pack echo Parameter for pack
echo tor Pack tor version echo tor Pack tor version

2
build_scripts/Windows-msys2/env/tools/prepare-msys2.bat vendored
View File

@ -25,7 +25,7 @@ if exist "%EnvMSYS2Path%\msys%MSYS2Base%\usr\bin\pacman.exe" (
) )
) )
set MSYS2Install=msys2-base-%MSYS2Architecture%-20190524.tar.xz set MSYS2Install=msys2-base-%MSYS2Architecture%-20180531.tar.xz
set MSYS2Url=http://sourceforge.net/projects/msys2/files/Base/%MSYS2Architecture%/%MSYS2Install%/download set MSYS2Url=http://sourceforge.net/projects/msys2/files/Base/%MSYS2Architecture%/%MSYS2Install%/download
%cecho% info "Remove previous MSYS2 version" %cecho% info "Remove previous MSYS2 version"