# HG changeset patch
# User Chris Cannam
# Date 1545072511 0
# Node ID 7942b7633505611f38fa5bb539419cb1afe7f1a5
# Parent  66284838b373ef77494d598a24756ac7c15ea81b
Further to adding Plink component

diff -r 66284838b373 -r 7942b7633505 .hgignore
--- a/.hgignore	Mon Dec 17 13:35:48 2018 +0000
+++ b/.hgignore	Mon Dec 17 18:48:31 2018 +0000
@@ -36,3 +36,5 @@
 squashfs-root
 *.gen
 *.deb
+TortoiseSVN
+.svn
diff -r 66284838b373 -r 7942b7633505 deploy/win32/build-and-package.bat
--- a/deploy/win32/build-and-package.bat	Mon Dec 17 13:35:48 2018 +0000
+++ b/deploy/win32/build-and-package.bat	Mon Dec 17 18:48:31 2018 +0000
@@ -10,7 +10,7 @@
 @   exit /b 2
 )
 
-if not exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.15.26706\x86\Microsoft.VC141.CRT" (
+if not exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x86\Microsoft.VC141.CRT" (
 @   echo Could not find Windows CRT directory
 @   exit /b 2
 )
@@ -27,7 +27,7 @@
 
 set ORIGINALPATH=%PATH%
 set PATH=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin;%PATH%
-set CRTDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.15.26706\x86\Microsoft.VC141.CRT
+set CRTDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x86\Microsoft.VC141.CRT
 set PYPACKAGEDIR=C:/Python27/Lib/site-packages
 set PYQTDIR=%PYPACKAGEDIR%/PyQt5/
 set PYCRYPTODIR=%PYPACKAGEDIR%/Crypto/
diff -r 66284838b373 -r 7942b7633505 deploy/win32/build.bat
--- a/deploy/win32/build.bat	Mon Dec 17 13:35:48 2018 +0000
+++ b/deploy/win32/build.bat	Mon Dec 17 18:48:31 2018 +0000
@@ -27,6 +27,10 @@
 set KDIFFDIR=%STARTPWD%\easyhg-kdiff3\kdiff3\src-QT4
 
 if not exist TortoiseSVN (
+rem  NB the "svn" command is actually installed as part of TortoiseSVN, but
+rem  only if you specifically check the "command-line programs" option when
+rem  installing it. We rebuild TortoisePlink rather than using the one already
+rem  installed, because that is probably 64-bit and we want a 32-bit one
      svn co http://svn.osdn.net/svnroot/tortoisesvn/trunk TortoiseSVN
 )
 if %errorlevel% neq 0 exit /b %errorlevel%
diff -r 66284838b373 -r 7942b7633505 deploy/win32/easyhg.wxs
--- a/deploy/win32/easyhg.wxs	Mon Dec 17 13:35:48 2018 +0000
+++ b/deploy/win32/easyhg.wxs	Mon Dec 17 18:48:31 2018 +0000
@@ -73,7 +73,7 @@
             </Component>
 
             <Component
-                Id="HelperScripts"
+                Id="Helpers"
                 Guid="971EA788-347E-4CDE-9899-69EEBE117BDD">
 
               <File
@@ -82,6 +82,11 @@
                   DiskId="1"
                   Source="..\..\easyhg-merge.bat"
                   KeyPath="yes"/>
+              <File
+                  Id="plink"
+                  Name="TortoisePlink.exe"
+                  DiskId="1"
+                  Source="TortoisePlink.exe"/>
             </Component>		  
 
             <Component
@@ -216,13 +221,6 @@
                     Name="library.zip"
                     DiskId="1"
                     Source="lib\library.zip"/>
-                <!--
-                <File
-                    Id="plink"
-                    Name="TortoisePlink.exe"
-                    DiskId="1"
-                    Source="lib\TortoisePlink.exe"/>
-                    -->
                 <File
                     Id="ctypes"
                     Name="_ctypes.pyd"
@@ -441,7 +439,7 @@
       <ComponentRef Id="MainExecutable"/>
       <ComponentRef Id="VCLIBS140"/>
       <ComponentRef Id="VCLIBS90"/>
-      <ComponentRef Id="HelperScripts"/>
+      <ComponentRef Id="Helpers"/>
       <ComponentRef Id="Qt5"/>
       <ComponentRef Id="qtplatforms"/>
       <ComponentRef Id="qtstyles"/>