From d020d8d8965ad999b52096cbf4213ce6122d0451 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Wed, 5 Oct 2016 06:40:02 +0200
Subject: [PATCH] Windows build environment: - Added automatic mode for
 creating git-log - Fixed filename of installer

---
 build_scripts/Windows/build/git-log.bat            | 11 +++++++++++
 build_scripts/Windows/installer/retroshare-Qt4.nsi |  2 +-
 build_scripts/Windows/installer/retroshare-Qt5.nsi |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/build_scripts/Windows/build/git-log.bat b/build_scripts/Windows/build/git-log.bat
index 49cfaef1e..8a36c7537 100644
--- a/build_scripts/Windows/build/git-log.bat
+++ b/build_scripts/Windows/build/git-log.bat
@@ -1,7 +1,13 @@
+:: Usage:
+:: call git-log.bat [no-ask]
+
 @echo off
 
 setlocal
 
+set NoAsk=
+if "%~1"=="no-ask" set NoAsk=1
+
 :: Initialize environment
 call "%~dp0..\env.bat"
 if errorlevel 1 goto error_env
@@ -56,9 +62,11 @@ set RsLastRefFile=%BuildPath%\Qt-%QtVersion%-%RsBuildConfig%-LastRef.txt
 set RsLastRef=
 if exist "%RsLastRefFile%" set /P RsLastRef=<"%RsLastRefFile%"
 
+if "%NoAsk%"=="1" goto no_ask_for_last_revision
 if not "%RsLastRef%"=="" echo Last Revision was %RsLastRef%
 set /P RsLastRefInput=Last Revision: 
 if "%RsLastRefInput%" NEQ "" set RsLastRef=%RsLastRefInput%
+:no_ask_for_last_revision
 
 :: Get current revision
 pushd "%SourcePath%"
@@ -71,8 +79,11 @@ if "%RsRef%"=="" echo Cannot get git revision.& exit /B 1
 echo.
 echo Creating log from %RsLastRef%
 echo                to %RsRef%
+
+if "%NoAsk%"=="1" goto no_confirm
 choice /M "Do you want to proceed?"
 if %errorlevel%==2 exit /B 1
+:no_confirm
 
 if "%RsBuildConfig%" NEQ "release" (
 	set RsGitLog=%DeployPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsRevision%-Qt-%QtVersion%%RsArchiveAdd%-%RsBuildConfig%.txt
diff --git a/build_scripts/Windows/installer/retroshare-Qt4.nsi b/build_scripts/Windows/installer/retroshare-Qt4.nsi
index 517c0745a..4efaa22de 100644
--- a/build_scripts/Windows/installer/retroshare-Qt4.nsi
+++ b/build_scripts/Windows/installer/retroshare-Qt4.nsi
@@ -76,7 +76,7 @@
 # Main Install settings
 Name "${APPNAMEANDVERSION}"
 InstallDirRegKey HKLM "Software\${APPNAME}" ""
-OutFile "${OUTDIR_}RetroShare-${VERSION}-${Date}-${REVISION}-Qt${QTVERSION}${INSTALLERADD}-setup.exe"
+OutFile "${OUTDIR_}RetroShare-${VERSION}-${Date}-${REVISION}-Qt-${QTVERSION}${INSTALLERADD}-setup.exe"
 BrandingText "${APPNAMEANDVERSION}"
 RequestExecutionlevel highest
 # Use compression
diff --git a/build_scripts/Windows/installer/retroshare-Qt5.nsi b/build_scripts/Windows/installer/retroshare-Qt5.nsi
index 916710a5e..cda4aff3a 100644
--- a/build_scripts/Windows/installer/retroshare-Qt5.nsi
+++ b/build_scripts/Windows/installer/retroshare-Qt5.nsi
@@ -76,7 +76,7 @@
 # Main Install settings
 Name "${APPNAMEANDVERSION}"
 InstallDirRegKey HKLM "Software\${APPNAME}" ""
-OutFile "${OUTDIR_}RetroShare-${VERSION}-${Date}-${REVISION}-Qt${QTVERSION}${INSTALLERADD}-setup.exe"
+OutFile "${OUTDIR_}RetroShare-${VERSION}-${Date}-${REVISION}-Qt-${QTVERSION}${INSTALLERADD}-setup.exe"
 BrandingText "${APPNAMEANDVERSION}"
 RequestExecutionlevel highest
 # Use compression