From 4f6356d7dd4aa7d83f14ccc31c32ae8011da3452 Mon Sep 17 00:00:00 2001
From: hunbernd <hunbernd@outlook.com>
Date: Sat, 6 Jun 2020 17:59:11 +0200
Subject: [PATCH] Added .gitignore for env-mod.bat Added variable for clang

---
 build_scripts/Windows-msys2/.gitignore         | 1 +
 build_scripts/Windows-msys2/build/build.bat    | 1 +
 build_scripts/Windows-msys2/build/env-base.bat | 4 +++-
 build_scripts/Windows-msys2/build/env.bat      | 4 ++--
 build_scripts/Windows-msys2/build/pack.bat     | 4 ++++
 5 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 build_scripts/Windows-msys2/.gitignore

diff --git a/build_scripts/Windows-msys2/.gitignore b/build_scripts/Windows-msys2/.gitignore
new file mode 100644
index 000000000..a7b500b79
--- /dev/null
+++ b/build_scripts/Windows-msys2/.gitignore
@@ -0,0 +1 @@
+/build/env-mod.bat
\ No newline at end of file
diff --git a/build_scripts/Windows-msys2/build/build.bat b/build_scripts/Windows-msys2/build/build.bat
index b07562b7c..0921bd65c 100644
--- a/build_scripts/Windows-msys2/build/build.bat
+++ b/build_scripts/Windows-msys2/build/build.bat
@@ -66,6 +66,7 @@ echo %RS_QMAKE_CONFIG% > buildinfo.txt
 echo %RsBuildConfig% >> buildinfo.txt
 echo %RsArchitecture% >> buildinfo.txt
 echo Qt %QtVersion% >> buildinfo.txt
+echo %RsCompiler% >> buildinfo.txt
 
 call "%ToolsPath%\msys2-path.bat" "%SourcePath%" MSYS2SourcePath
 call "%ToolsPath%\msys2-path.bat" "%EnvMSYS2Path%" MSYS2EnvMSYS2Path
diff --git a/build_scripts/Windows-msys2/build/env-base.bat b/build_scripts/Windows-msys2/build/env-base.bat
index f4d36b1cc..aeead45a5 100644
--- a/build_scripts/Windows-msys2/build/env-base.bat
+++ b/build_scripts/Windows-msys2/build/env-base.bat
@@ -71,7 +71,9 @@ if "%Param64%"=="1" (
 )
 
 if "%ParamClang%"=="1" (
-	set RsArchitecture=%RsArchitecture%-Clang
+	set RsCompiler=Clang
+) else (
+	set RsCompiler=GCC
 )
 
 if "%RsBit%"=="" goto :usage
diff --git a/build_scripts/Windows-msys2/build/env.bat b/build_scripts/Windows-msys2/build/env.bat
index 8443d6218..bfe2afeba 100644
--- a/build_scripts/Windows-msys2/build/env.bat
+++ b/build_scripts/Windows-msys2/build/env.bat
@@ -16,8 +16,8 @@ if "%QtVersion%"=="" %cecho% error "Cannot get Qt version." & exit /B 1
 
 set RsMinGWPath=%EnvMSYS2BasePath%\mingw%RsBit%
 
-set RsBuildPath=%BuildPath%\Qt-%QtVersion%-%RsArchitecture%-%RsBuildConfig%
-set RsDeployPath=%DeployPath%\Qt-%QtVersion%%RsType%-%RsArchitecture%-%RsBuildConfig%
+set RsBuildPath=%BuildPath%\Qt-%QtVersion%-%RsArchitecture%-%RsCompiler%-%RsBuildConfig%
+set RsDeployPath=%DeployPath%\Qt-%QtVersion%%RsType%-%RsArchitecture%-%RsCompiler%-%RsBuildConfig%
 set RsPackPath=%DeployPath%
 set RsArchiveAdd=
 set RsWebuiPath=%RootPath%\%SourceName%-webui
diff --git a/build_scripts/Windows-msys2/build/pack.bat b/build_scripts/Windows-msys2/build/pack.bat
index 07f3b0114..013a48bb2 100644
--- a/build_scripts/Windows-msys2/build/pack.bat
+++ b/build_scripts/Windows-msys2/build/pack.bat
@@ -98,6 +98,7 @@ mkdir "%RsDeployPath%\qss"
 mkdir "%RsDeployPath%\stylesheets"
 mkdir "%RsDeployPath%\sounds"
 mkdir "%RsDeployPath%\translations"
+mkdir "%RsDeployPath%\license"
 
 copy nul "%RsDeployPath%\portable" %Quite%
 
@@ -148,6 +149,9 @@ rmdir /S /Q "%RsDeployPath%\stylesheets\__MACOSX__Bubble" %Quite%
 echo copy sounds
 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
 copy "%SourcePath%\retroshare-gui\src\translations\qt_tr.qm" "%RsDeployPath%\translations" %Quite%
 copy "%QtSharePath%\translations\qt_*.qm" "%RsDeployPath%\translations" %Quite%