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

Added .gitignore for env-mod.bat

Browse Source 
Added variable for clang
This commit is contained in:
hunbernd 2020-06-06 17:59:11 +02:00
parent fdead2e491
commit 4f6356d7dd
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build_scripts/Windows-msys2/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/build/env-mod.bat

1
build_scripts/Windows-msys2/build/build.bat
View File

@ -66,6 +66,7 @@ echo %RS_QMAKE_CONFIG% > buildinfo.txt
echo %RsBuildConfig% >> buildinfo.txt echo %RsBuildConfig% >> buildinfo.txt
echo %RsArchitecture% >> buildinfo.txt echo %RsArchitecture% >> buildinfo.txt
echo Qt %QtVersion% >> buildinfo.txt echo Qt %QtVersion% >> buildinfo.txt
echo %RsCompiler% >> buildinfo.txt
call "%ToolsPath%\msys2-path.bat" "%SourcePath%" MSYS2SourcePath call "%ToolsPath%\msys2-path.bat" "%SourcePath%" MSYS2SourcePath
call "%ToolsPath%\msys2-path.bat" "%EnvMSYS2Path%" MSYS2EnvMSYS2Path call "%ToolsPath%\msys2-path.bat" "%EnvMSYS2Path%" MSYS2EnvMSYS2Path

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

@ -71,7 +71,9 @@ if "%Param64%"=="1" (
) )
if "%ParamClang%"=="1" ( if "%ParamClang%"=="1" (
set RsArchitecture=%RsArchitecture%-Clang set RsCompiler=Clang
) else (
set RsCompiler=GCC
) )
if "%RsBit%"=="" goto :usage if "%RsBit%"=="" goto :usage

4
build_scripts/Windows-msys2/build/env.bat
View File

@ -16,8 +16,8 @@ if "%QtVersion%"=="" %cecho% error "Cannot get Qt version." & exit /B 1
set RsMinGWPath=%EnvMSYS2BasePath%\mingw%RsBit% set RsMinGWPath=%EnvMSYS2BasePath%\mingw%RsBit%
set RsBuildPath=%BuildPath%\Qt-%QtVersion%-%RsArchitecture%-%RsBuildConfig% set RsBuildPath=%BuildPath%\Qt-%QtVersion%-%RsArchitecture%-%RsCompiler%-%RsBuildConfig%
set RsDeployPath=%DeployPath%\Qt-%QtVersion%%RsType%-%RsArchitecture%-%RsBuildConfig% set RsDeployPath=%DeployPath%\Qt-%QtVersion%%RsType%-%RsArchitecture%-%RsCompiler%-%RsBuildConfig%
set RsPackPath=%DeployPath% set RsPackPath=%DeployPath%
set RsArchiveAdd= set RsArchiveAdd=
set RsWebuiPath=%RootPath%\%SourceName%-webui set RsWebuiPath=%RootPath%\%SourceName%-webui

4
build_scripts/Windows-msys2/build/pack.bat
View File

@ -98,6 +98,7 @@ mkdir "%RsDeployPath%\qss"
mkdir "%RsDeployPath%\stylesheets" mkdir "%RsDeployPath%\stylesheets"
mkdir "%RsDeployPath%\sounds" mkdir "%RsDeployPath%\sounds"
mkdir "%RsDeployPath%\translations" mkdir "%RsDeployPath%\translations"
mkdir "%RsDeployPath%\license"
copy nul "%RsDeployPath%\portable" %Quite% copy nul "%RsDeployPath%\portable" %Quite%
@ -148,6 +149,9 @@ rmdir /S /Q "%RsDeployPath%\stylesheets\__MACOSX__Bubble" %Quite%
echo copy sounds echo copy sounds
xcopy /S "%SourcePath%\retroshare-gui\src\sounds" "%RsDeployPath%\sounds" %Quite% xcopy /S "%SourcePath%\retroshare-gui\src\sounds" "%RsDeployPath%\sounds" %Quite%
echo copy license
xcopy /S "%SourcePath%\retroshare-gui\src\license" "%RsDeployPath%\license" %Quite%
echo copy translation echo copy translation
copy "%SourcePath%\retroshare-gui\src\translations\qt_tr.qm" "%RsDeployPath%\translations" %Quite% copy "%SourcePath%\retroshare-gui\src\translations\qt_tr.qm" "%RsDeployPath%\translations" %Quite%
copy "%QtSharePath%\translations\qt_*.qm" "%RsDeployPath%\translations" %Quite% copy "%QtSharePath%\translations\qt_*.qm" "%RsDeployPath%\translations" %Quite%