Windows build environment

- Use date of last git commit instead of current date for filename
- Added download of Tor installation
- Added section Tor to installer

build_scripts/Windows/installer/lang/ca_ES.nsh

@@ -1,5 +1,7 @@
 !insertmacro LANG_STRING Section_Main "${APPNAME}"
 !insertmacro LANG_STRING Section_Main_Desc "Instal·la ${APPNAME} i els components necessaris."
+!insertmacro LANG_STRING Section_Tor "Tor"
+!insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
 !insertmacro LANG_STRING Section_Data "Pells"
 !insertmacro LANG_STRING Section_Data_Desc "Instal·la pells."
 !insertmacro LANG_STRING Section_Shortcuts "Icones d'accés directe"

build_scripts/Windows/installer/lang/de.nsh

@@ -1,5 +1,7 @@
 !insertmacro LANG_STRING Section_Main "${APPNAME}"
 !insertmacro LANG_STRING Section_Main_Desc "Installiert ${APPNAME} und die benötigten Komponenten."
+!insertmacro LANG_STRING Section_Tor "Tor"
+!insertmacro LANG_STRING Section_Tor_Desc "Installiert Tor."
 !insertmacro LANG_STRING Section_Data "Skins"
 !insertmacro LANG_STRING Section_Data_Desc "Skins installieren."
 !insertmacro LANG_STRING Section_Shortcuts "Verknüpfungssymbole"

build_scripts/Windows/installer/lang/en.nsh

@@ -1,5 +1,7 @@
 !insertmacro LANG_STRING Section_Main "${APPNAME}"
 !insertmacro LANG_STRING Section_Main_Desc "Installs ${APPNAME} and required components."
+!insertmacro LANG_STRING Section_Tor "Tor"
+!insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
 !insertmacro LANG_STRING Section_Data "Skins"
 !insertmacro LANG_STRING Section_Data_Desc "Installs skins."
 !insertmacro LANG_STRING Section_Shortcuts "Shortcut icons"

build_scripts/Windows/installer/lang/es.nsh

@@ -1,5 +1,7 @@
 !insertmacro LANG_STRING Section_Main "${APPNAME}"
 !insertmacro LANG_STRING Section_Main_Desc "Instala ${APPNAME} y los componentes requeridos."
+!insertmacro LANG_STRING Section_Tor "Tor"
+!insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
 !insertmacro LANG_STRING Section_Data "Coberturas (skins)"
 !insertmacro LANG_STRING Section_Data_Desc "Instalar coberturas"
 !insertmacro LANG_STRING Section_Shortcuts "Iconos de accesos directos"

build_scripts/Windows/installer/lang/fr.nsh

@@ -1,5 +1,7 @@
 !insertmacro LANG_STRING Section_Main "${APPNAME}"
 !insertmacro LANG_STRING Section_Main_Desc "Installe ${APPNAME} et les composants requis."
+!insertmacro LANG_STRING Section_Tor "Tor"
+!insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
 !insertmacro LANG_STRING Section_Data "Habillages"
 !insertmacro LANG_STRING Section_Data_Desc "Installe des habillages."
 !insertmacro LANG_STRING Section_Shortcuts "Icônes de raccourci"

build_scripts/Windows/installer/lang/pl.nsh

@@ -1,5 +1,7 @@
 !insertmacro LANG_STRING Section_Main "${APPNAME}"
 !insertmacro LANG_STRING Section_Main_Desc "Instaluje ${APPNAME} oraz wymagane komponenty."
+!insertmacro LANG_STRING Section_Tor "Tor"
+!insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
 !insertmacro LANG_STRING Section_Data "Skórki"
 !insertmacro LANG_STRING Section_Data_Desc "Instaluje skórki."
 !insertmacro LANG_STRING Section_Shortcuts "Ikony skrótów"

build_scripts/Windows/installer/lang/ru.nsh

@@ -1,5 +1,7 @@
 !insertmacro LANG_STRING Section_Main "${APPNAME}"
 !insertmacro LANG_STRING Section_Main_Desc "Установка ${APPNAME} и необходимых компонентов."
+!insertmacro LANG_STRING Section_Tor "Tor"
+!insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
 !insertmacro LANG_STRING Section_Data "Оболочки"
 !insertmacro LANG_STRING Section_Data_Desc "Установка оболочек."
 !insertmacro LANG_STRING Section_Shortcuts "Ярлыки"

build_scripts/Windows/installer/lang/tr.nsh

@@ -1,5 +1,7 @@
 !insertmacro LANG_STRING Section_Main "${APPNAME}"
 !insertmacro LANG_STRING Section_Main_Desc "${APPNAME} ve gerekli bileşenleri kurar."
+!insertmacro LANG_STRING Section_Tor "Tor"
+!insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
 !insertmacro LANG_STRING Section_Data "Temalar"
 !insertmacro LANG_STRING Section_Data_Desc "Tema yükleyin."
 !insertmacro LANG_STRING Section_Shortcuts "Kısayol simgeleri"

build_scripts/Windows/installer/lang/ts/en.ts

@@ -8,6 +8,20 @@
     <translation type="unfinished"></translation> 
   </message> 
 </context> 
+<context> 
+  <name>Section_Tor</name> 
+  <message> 
+    <source>Tor</source> 
+    <translation type="unfinished"></translation> 
+  </message> 
+</context> 
+<context> 
+  <name>Section_Tor_Desc</name> 
+  <message> 
+    <source>Installs Tor.</source> 
+    <translation type="unfinished"></translation> 
+  </message> 
+</context> 
 <context> 
   <name>Section_Data</name> 
   <message> 

build_scripts/Windows/installer/lang/zh_CN.nsh

@@ -1,5 +1,7 @@
 !insertmacro LANG_STRING Section_Main "${APPNAME}"
 !insertmacro LANG_STRING Section_Main_Desc "Installs ${APPNAME} and required components."
+!insertmacro LANG_STRING Section_Tor "Tor"
+!insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
 !insertmacro LANG_STRING Section_Data "皮肤"
 !insertmacro LANG_STRING Section_Data_Desc "安装皮肤"
 !insertmacro LANG_STRING Section_Shortcuts "快捷方式图标"

build_scripts/Windows/installer/retroshare-Qt5.nsi

@@ -56,7 +56,17 @@
 !endif
 
 # Date
-!define /date Date "%Y%m%d"
+!ifndef DATE
+!define /date DATE "%Y%m%d"
+!endif
+
+# Tor
+!ifdef TORDIR
+${!defineifexist} TOR_EXISTS "${TORDIR}\tor.exe"
+!ifndef TOR_EXISTS
+!error "tor.exe not found"
+!endif
+!endif
 
 # Application name and version
 !define APPNAME "RetroShare"
@@ -78,7 +88,7 @@
 # Main Install settings
 Name "${APPNAMEANDVERSION}"
 InstallDirRegKey HKLM "Software\${APPNAME}" ""
-OutFile "${OUTDIR_}RetroShare-${VERSION}-${Date}-${REVISION}-Qt-${QTVERSION}-${ARCHITECTURE}${INSTALLERADD}-setup.exe"
+OutFile "${OUTDIR_}RetroShare-${VERSION}-${DATE}-${REVISION}-Qt-${QTVERSION}-${ARCHITECTURE}${INSTALLERADD}-setup.exe"
 BrandingText "${APPNAMEANDVERSION}"
 RequestExecutionlevel highest
 # Use compression
@@ -271,6 +281,14 @@ Section $(Section_Main) Section_Main
   File /r "${SOURCEDIR}\retroshare-gui\src\license\*.*"
 SectionEnd
 
+# Tor
+!ifdef TOR_EXISTS
+  Section /o $(Section_Tor) Section_Tor
+    SetOutPath "$INSTDIR"
+    File /r "${TORDIR}\*"
+  SectionEnd
+!endif
+
 # Plugins
 ${!defineifexist} PLUGIN_FEEDREADER_EXISTS "${RELEASEDIR}\plugins\FeedReader\release\FeedReader.dll"
 ${!defineifexist} PLUGIN_VOIP_EXISTS "${RELEASEDIR}\plugins\VOIP\release\VOIP.dll"
@@ -385,6 +403,7 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${Section_Plugin_VOIP} $(Section_Plugin_VOIP_Desc)
 ;  !insertmacro MUI_DESCRIPTION_TEXT ${Section_Link} $(Section_Link_Desc)
   !insertmacro MUI_DESCRIPTION_TEXT ${Section_AutoStart} $(Section_AutoStart_Desc)
+  !insertmacro MUI_DESCRIPTION_TEXT ${Section_Tor} $(Section_Tor_Desc)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 # Uninstall