From d2a3f1e8d0c82fe2237c2ddc93c64ac320f5d9ae Mon Sep 17 00:00:00 2001 From: hunbernd Date: Mon, 1 Jun 2020 15:28:12 +0200 Subject: [PATCH] Changed default configuration: 64 -plugins +nativedialogs Changed msys2 download version Added x64 or x86 into the pack filename --- build_scripts/Windows-msys2/build-tor.bat | 4 ++-- build_scripts/Windows-msys2/build.bat | 4 ++-- build_scripts/Windows-msys2/build/pack.bat | 4 ++-- build_scripts/Windows-msys2/env/tools/prepare-msys2.bat | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build_scripts/Windows-msys2/build-tor.bat b/build_scripts/Windows-msys2/build-tor.bat index 2f81e098c..aa2b4ea06 100644 --- a/build_scripts/Windows-msys2/build-tor.bat +++ b/build_scripts/Windows-msys2/build-tor.bat @@ -9,11 +9,11 @@ call "%EnvPath%\env.bat" if errorlevel 1 goto error_env %cecho% info "Build %SourceName%" -call "%~dp0build\build.bat" 32 release tor autologin plugins +call "%~dp0build\build.bat" 64 release tor autologin "CONFIG+=rs_use_native_dialogs" if errorlevel 1 %cecho% error "Failed to build %SourceName%." & exit /B %ERRORLEVEL% %cecho% info "Pack %SourceName%" -call "%~dp0build\pack.bat" 32 release tor +call "%~dp0build\pack.bat" 64 release tor autologin "CONFIG+=rs_use_native_dialogs" if errorlevel 1 %cecho% error "Failed to pack %SourceName%." & exit /B %ERRORLEVEL% exit /B 0 diff --git a/build_scripts/Windows-msys2/build.bat b/build_scripts/Windows-msys2/build.bat index 42c4b557d..529a1350f 100644 --- a/build_scripts/Windows-msys2/build.bat +++ b/build_scripts/Windows-msys2/build.bat @@ -9,11 +9,11 @@ call "%EnvPath%\env.bat" if errorlevel 1 goto error_env %cecho% info "Build %SourceName%" -call "%~dp0build\build.bat" 32 release autologin plugins +call "%~dp0build\build.bat" 64 release autologin "CONFIG+=rs_use_native_dialogs" if errorlevel 1 %cecho% error "Failed to build %SourceName%." & exit /B %ERRORLEVEL% %cecho% info "Pack %SourceName%" -call "%~dp0build\pack.bat" 32 release +call "%~dp0build\pack.bat" 64 release autologin "CONFIG+=rs_use_native_dialogs" if errorlevel 1 %cecho% error "Failed to pack %SourceName%." & exit /B %ERRORLEVEL% exit /B 0 diff --git a/build_scripts/Windows-msys2/build/pack.bat b/build_scripts/Windows-msys2/build/pack.bat index 10d426e57..ceae42ae3 100644 --- a/build_scripts/Windows-msys2/build/pack.bat +++ b/build_scripts/Windows-msys2/build/pack.bat @@ -74,9 +74,9 @@ if "%QtMainVersion%"=="4" set QtMainVersion2=4 if "%QtMainVersion%"=="5" set QtMainVersion1=5 if "%RsBuildConfig%" NEQ "release" ( - set Archive=%RsPackPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsVersion.Extra%-Qt-%QtVersion%-msys2%RsType%%RsArchiveAdd%-%RsBuildConfig%.7z + set Archive=%RsPackPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsVersion.Extra%-%RsArchitecture%-msys2%RsType%%RsArchiveAdd%-%RsBuildConfig%.7z ) else ( - set Archive=%RsPackPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsVersion.Extra%-Qt-%QtVersion%-msys2%RsType%%RsArchiveAdd%.7z + set Archive=%RsPackPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsVersion.Extra%-%RsArchitecture%-msys2%RsType%%RsArchiveAdd%.7z ) if exist "%Archive%" del /Q "%Archive%" diff --git a/build_scripts/Windows-msys2/env/tools/prepare-msys2.bat b/build_scripts/Windows-msys2/env/tools/prepare-msys2.bat index ddf8b00a6..f055a19c4 100644 --- a/build_scripts/Windows-msys2/env/tools/prepare-msys2.bat +++ b/build_scripts/Windows-msys2/env/tools/prepare-msys2.bat @@ -25,7 +25,7 @@ if exist "%EnvMSYS2Path%\msys%MSYS2Base%\usr\bin\pacman.exe" ( ) ) -set MSYS2Install=msys2-base-%MSYS2Architecture%-20180531.tar.xz +set MSYS2Install=msys2-base-%MSYS2Architecture%-20190524.tar.xz set MSYS2Url=http://sourceforge.net/projects/msys2/files/Base/%MSYS2Architecture%/%MSYS2Install%/download %cecho% info "Remove previous MSYS2 version"