beta: add beta config into client-windows and JamiInstaller

Change-Id: I2459d4c66e81e929d6f2c8c055f2e744ca38b72c

.gitignore

@@ -8,6 +8,7 @@ x86/
 .qmake.stash
 debug/
 release/
+beta/
 qrencode-win32/
 *.dll
 *.qm

JamiInstaller/Config.wxi

 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-    <?define Name="Jami"?>
-    <?define Manufacturer="Savoir-Faire Linux"?>
+    <?if $(var.Configuration) = Release ?>
+    <?define Name="Jami" ?>
+    <?else?>
+    <?define Name="Jami (BETA)" ?>
+    <?endif ?>
+
+    <?if $(var.Configuration) = Release ?>
     <?define ReleaseDir="..\x64\Release"?>
+    <?else?>
+    <?define ReleaseDir="..\x64\Beta"?>
+    <?endif ?>
+
+    <?define Manufacturer="Savoir-Faire Linux"?>
     <?define UcrtDir="C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x64"?>
 </Include>

JamiInstaller/JamiInstaller.wixproj

@@ -6,7 +6,8 @@
     <ProductVersion>3.10</ProductVersion>
     <ProjectGuid>dbbfbc55-1c20-4d21-ae3b-6e8b14c4fe48</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>Jami</OutputName>
+    <OutputName Condition="'$(Configuration)' == 'Release'">jami.release.$(Platform)</OutputName>
+    <OutputName Condition="'$(Configuration)' == 'Beta'">jami.beta.$(Platform)</OutputName>
     <OutputType>Package</OutputType>
     <Name>JamiInstaller</Name>
     <InstallerPlatform>x64</InstallerPlatform>
@@ -18,6 +19,18 @@
     <SuppressPdbOutput>True</SuppressPdbOutput>
     <CompilerAdditionalOptions>
     </CompilerAdditionalOptions>
+    <WixVariables>
+    </WixVariables>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Beta|x64' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>HarvestPath=..\x64\Beta</DefineConstants>
+    <SuppressPdbOutput>True</SuppressPdbOutput>
+    <CompilerAdditionalOptions>
+    </CompilerAdditionalOptions>
+    <WixVariables>
+    </WixVariables>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />
@@ -50,7 +63,7 @@
     <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
   </Target>
   <Target Name="BeforeBuild">
-    <HeatDirectory Directory="..\x64\Release" PreprocessorVariable="var.HarvestPath" OutputFile="Components.wxs" ComponentGroupName="HeatGenerated" DirectoryRefId="APPLICATIONFOLDER" AutogenerateGuids="true" ToolPath="$(WixToolPath)" SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="true" Transforms="HarvestFilter.xslt" />
+    <HeatDirectory Directory="..\x64\$(Configuration)" PreprocessorVariable="var.HarvestPath" OutputFile="Components.wxs" ComponentGroupName="HeatGenerated" DirectoryRefId="APPLICATIONFOLDER" AutogenerateGuids="true" ToolPath="$(WixToolPath)" SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="true" Transforms="HarvestFilter.xslt" />
   </Target>
   <Target Name="AfterBuild">
   </Target>

build-client.bat

@@ -9,6 +9,7 @@ if "%~1" == "" goto Usage
 set doDeps=N
 set doCompile=N
 set doBuild=N
+set doBuildBeta=N
 
 set SCRIPTNAME=%~nx0
 
@@ -18,6 +19,8 @@ if "%1"=="compile" (
     set doBuild=Y
 ) else if "%1"=="deps" (
     set doDeps=Y
+) else if "%1"=="beta" (
+    set doBuildBeta=Y
 ) else (
     goto Usage
 )
@@ -85,6 +88,8 @@ if "%arch%" neq "N" (
         goto buildClient
     ) else if "%doDeps%" neq "N" (
         goto buildDeps
+    ) else if "%doBuildBeta%" neq "N" (
+        goto buildBetaClient
     )
     goto :eof
 )
@@ -104,6 +109,10 @@ goto cleanup
 msbuild ring-client-windows.vcxproj /verbosity:normal /p:Configuration=Release %MSBUILD_ARGS%
 goto cleanup
 
+:buildBetaClient
+msbuild ring-client-windows.vcxproj /verbosity:normal /p:Configuration=Beta %MSBUILD_ARGS%
+goto cleanup
+
 @endlocal
 
 :Usage

copy-runtime-files.ps1

 [cmdletbinding()]
 param (
+    [string]$mode,
     [string]$qtver,
     [string]$daemonDir,
     [string]$lrcDir
@@ -9,11 +10,12 @@ write-host "Copying runtime files..." -ForegroundColor Green
 
 # default values
 $qtver = If ($qtver) {$qtver} Else {"5.9.4"}
+$mode  = If ($mode)  {$mode} Else {"Release"}
 
 $QtDir = "C:\Qt\$qtver\msvc2017_64"
 $ClientDir = split-path -parent $MyInvocation.MyCommand.Definition
 
-$OutDir = $ClientDir + "\x64\Release"
+$OutDir = $ClientDir + "\x64\" + $mode
 If(!(test-path $OutDir)) { New-Item -ItemType directory -Path $OutDir -Force }
 
 if (!$daemonDir) { $daemonDir = $ClientDir + '\..\daemon' }