From ed9ca450894dcc4109bc9f543952ec8436364e65 Mon Sep 17 00:00:00 2001
From: Andrew Senetar <arsenetar@gmail.com>
Date: Fri, 21 Jul 2017 21:41:49 -0500
Subject: [PATCH 01/13] Update run.py & .gitignore for windows

- Update run.py to execute on windows as SIGQUIT is not available.
- Update .gitignore to ignore the generate .pyd files
Ref #300, #393
---
 .gitignore | 2 ++
 run.py     | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index f66b475c..5f02f9c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@ cocoa/autogen
 /qt/*_rc.py
 /help/*/conf.py
 /help/*/changelog.rst
+
+*.pyd
diff --git a/run.py b/run.py
index 6dfcf752..297a5bd8 100644
--- a/run.py
+++ b/run.py
@@ -20,7 +20,12 @@ from qt import dg_rc
 from qt.platform import BASE_PATH
 from core import __version__, __appname__
 
-from signal import signal, SIGINT, SIGTERM, SIGQUIT
+# SIGQUIT is not defined on Windows
+if sys.platform == 'win32':
+    from signal import signal, SIGINT, SIGTERM
+    SIGQUIT = SIGTERM
+else:
+    from signal import signal, SIGINT, SIGTERM, SIGQUIT
 
 global dgapp
 dgapp = None

From 0870bf0bfa3c3a3bca9369f69cb3f8c207080a4a Mon Sep 17 00:00:00 2001
From: Andrew Senetar <arsenetar@gmail.com>
Date: Sat, 22 Jul 2017 14:15:58 -0500
Subject: [PATCH 02/13] Update package.py for windows

Add package_windows back into package.py
- Using cx_freeze for freezing installation
- Will be using nsis for actual installer
Tested with python 3.5 64bit on windows 10
Ref #393
---
 package.py | 75 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 67 insertions(+), 8 deletions(-)

diff --git a/package.py b/package.py
index 78e90abe..5c122f54 100644
--- a/package.py
+++ b/package.py
@@ -4,6 +4,7 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
+import sys
 import os
 import os.path as op
 import compileall
@@ -112,6 +113,62 @@ def package_source_tgz():
         print_and_do('tar -A {} -f {}'.format(archive_path, dest))
     print_and_do('gzip {}'.format(dest))
 
+def package_windows():
+    from cx_Freeze import setup, Executable
+    app_version = get_module_version('core')
+    arch = platform.architecture()[0]
+    buildpath = op.join('build', 'dupeguru-win{}'.format(arch))
+    # remove existing build directory
+    if op.exists(buildpath):
+        shutil.rmtree(buildpath)
+    include_files = []
+    # include locale files if they are built otherwise exit as it will break
+    # the localization
+    if op.exists('build/locale'):
+        include_files.append(('build/locale', 'locale'))
+    else:
+        print("Locale files not built, exiting...")
+        return
+    # include help files if they are built otherwise exit as they should be included?
+    if op.exists('build/help'):
+        include_files.append(('build/help', 'help'))
+    else:
+        print("Help files not built, exiting...")
+        return
+    # options for cx_Freeze
+    # if zip_include packages is not used, the cx_Freeze packager will include
+    # the whole PyQT5 directory
+    options = {
+        'build_exe': {
+            'build_exe': buildpath,
+            'excludes': [],
+            'includes': ['atexit'],
+            'include_files': include_files,
+            'include_msvcr': True,
+            'zip_include_packages': ['*'],
+            'zip_exclude_packages': []
+        },
+    }
+    # executables to build, uses se edition icon
+    executables = [
+        Executable(
+            script='run.py',
+            base='Win32GUI',
+            targetName='dupeguru.exe',
+            icon='images/dgse_logo.ico',
+            copyright='Copyright (C) 2017 Hardcoded Software'
+        )
+    ]
+    # call cx_freeze
+    setup(
+        name='dupeguru',
+        version=app_version,
+        description='Tool to find duplicate files on your computer.',
+        options=options,
+        executables=executables,
+        script_args=['build']
+        )
+
 def main():
     args = parse_args()
     if args.src_pkg:
@@ -119,15 +176,17 @@ def main():
         package_source_tgz()
         return
     print("Packaging dupeGuru with UI qt")
-    if not args.arch_pkg:
-        distname, _, _ = platform.dist()
+    if sys.platform == 'win32':
+        package_windows()
     else:
-        distname = 'arch'
-    if distname == 'arch':
-        package_arch()
-    else:
-        package_debian()
+        if not args.arch_pkg:
+            distname, _, _ = platform.dist()
+        else:
+            distname = 'arch'
+        if distname == 'arch':
+            package_arch()
+        else:
+            package_debian()
 
 if __name__ == '__main__':
     main()
-

From 3a2f865fca07ac97e581d982552ecbc248915a1b Mon Sep 17 00:00:00 2001
From: Andrew Senetar <arsenetar@gmail.com>
Date: Sun, 23 Jul 2017 20:42:52 -0500
Subject: [PATCH 03/13] Update makefile for windows (+2 misc)

- Update the makefile to support windows
- Use different bin path in virtualenv
- Use pyd instead of so files
- Tested with Msys2
- Add *.exe to .gitignore
- Fix minor format error in package.py
Ref #393
---
 .gitignore |  1 +
 Makefile   | 30 +++++++++++++++++++++---------
 package.py |  2 +-
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5f02f9c6..7bf76a09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ cocoa/autogen
 /help/*/changelog.rst
 
 *.pyd
+*.exe
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 5bd83dc1..914b740b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,18 @@ PYTHON ?= python3
 REQ_MINOR_VERSION = 4
 PREFIX ?= /usr/local
 
+# Window compatability via Msys2 
+# - venv creates Scripts instead of bin
+# - compile generates .pyd instead of .so
+
+ifeq ($(shell uname -o), Msys)
+	BIN = Scripts
+	SO = pyd
+else
+	BIN = bin
+	SO = so
+endif
+
 # Set this variable if all dependencies are already met on the system. We will then avoid the
 # whole vitualenv creation and pip install dance.
 NO_VENV ?=
@@ -9,7 +21,7 @@ NO_VENV ?=
 ifdef NO_VENV
 	VENV_PYTHON = $(PYTHON)
 else
-	VENV_PYTHON = ./env/bin/python
+	VENV_PYTHON = ./env/$(BIN)/python
 endif
 
 # If you're installing into a path that is not going to be the final path prefix (such as a
@@ -72,19 +84,19 @@ i18n: $(mofiles)
 %.mo : %.po
 	msgfmt -o $@ $<	
 
-core/pe/_block.*.so : core/pe/modules/block.c core/pe/modules/common.c | env
+core/pe/_block.*.$(SO) : core/pe/modules/block.c core/pe/modules/common.c | env
 	$(VENV_PYTHON) hscommon/build_ext.py $^ _block
-	mv _block.*.so core/pe
+	mv _block.*.$(SO) core/pe
 
-core/pe/_cache.*.so : core/pe/modules/cache.c core/pe/modules/common.c | env
+core/pe/_cache.*.$(SO) : core/pe/modules/cache.c core/pe/modules/common.c | env
 	$(VENV_PYTHON) hscommon/build_ext.py $^ _cache
-	mv _cache.*.so core/pe
+	mv _cache.*.$(SO) core/pe
 
-qt/pe/_block_qt.*.so : qt/pe/modules/block.c | env
+qt/pe/_block_qt.*.$(SO) : qt/pe/modules/block.c | env
 	$(VENV_PYTHON) hscommon/build_ext.py $^ _block_qt
-	mv _block_qt.*.so qt/pe
+	mv _block_qt.*.$(SO) qt/pe
 
-modules : core/pe/_block.*.so core/pe/_cache.*.so qt/pe/_block_qt.*.so
+modules : core/pe/_block.*.$(SO) core/pe/_cache.*.$(SO) qt/pe/_block_qt.*.$(SO)
 
 mergepot :
 	$(VENV_PYTHON) build.py --mergepot
@@ -120,6 +132,6 @@ uninstall :
 clean:
 	-rm -rf build
 	-rm locale/*/LC_MESSAGES/*.mo
-	-rm core/pe/*.so qt/pe/*.so
+	-rm core/pe/*.$(SO) qt/pe/*.$(SO)
 
 .PHONY : clean srcpkg normpo mergepot modules i18n reqs run pyc install uninstall all
diff --git a/package.py b/package.py
index 5c122f54..1f899d4f 100644
--- a/package.py
+++ b/package.py
@@ -167,7 +167,7 @@ def package_windows():
         options=options,
         executables=executables,
         script_args=['build']
-        )
+    )
 
 def main():
     args = parse_args()

From 4e8baa18a32997fcac07590a6b14b1c5ca6ed60d Mon Sep 17 00:00:00 2001
From: Andrew Senetar <arsenetar@gmail.com>
Date: Wed, 26 Jul 2017 18:34:34 -0500
Subject: [PATCH 04/13] Add requirements-windows

Add the requirements-windows.txt
- contains cx-Freeze for bundling
Ref #393
---
 requirements-windows.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 requirements-windows.txt

diff --git a/requirements-windows.txt b/requirements-windows.txt
new file mode 100644
index 00000000..35b4b144
--- /dev/null
+++ b/requirements-windows.txt
@@ -0,0 +1 @@
+cx-Freeze>=5.0.2,<6.0.0
\ No newline at end of file

From d8ca6ed4eba2551d790958c15c51d22ddafe6032 Mon Sep 17 00:00:00 2001
From: Andrew Senetar <arsenetar@gmail.com>
Date: Wed, 26 Jul 2017 18:37:24 -0500
Subject: [PATCH 05/13] Add initial setup.nsi

Initial Version of a NSIS installer script
- Multi-user install (install for just one or all)
- Registers uninstaller (more values need to finish up)
- Tested both single and all install / uninstall and works
- Still need to add parameters instead of hardcoded values in some spots
- Need to clean up vendor folders / keys if empty on uninstall
- Need to add the other dupeGuru languages to the language list
- Minor cleanup of script needed as well
Ref #393
---
 setup.nsi | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 148 insertions(+)
 create mode 100644 setup.nsi

diff --git a/setup.nsi b/setup.nsi
new file mode 100644
index 00000000..68129482
--- /dev/null
+++ b/setup.nsi
@@ -0,0 +1,148 @@
+SetCompressor /SOLID lzma
+
+; General Defines
+    !define REGKEY "Software\Hardcoded Software\dupeGuru"
+    !define INSTPATH "Hardcoded Software\dupeGuru"
+    var StartMenuFolder
+
+    ; todo include a way to point between x64 and x32 builds via env
+    ; need to also change between PROGRAMS64 and PROGRAMS
+;--------------------------------
+
+;MultiUser
+
+    !define MULTIUSER_EXECUTIONLEVEL Highest
+    !define MULTIUSER_MUI
+    !define MULTIUSER_INSTALLMODE_COMMANDLINE
+    !define MULTIUSER_INSTALLMODE_INSTDIR "${INSTPATH}"
+    !define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "${REGKEY}"
+    !define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME "InstallPath"
+    !define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "${REGKEY}"
+    !define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME "InstallType"
+    !include MultiUser.nsh
+    
+;--------------------------------
+
+;--------------------------------
+;Modern UI 2
+
+    !include "MUI2.nsh"
+    !define MUI_ICON "images\dgse_logo.ico"
+
+;--------------------------------
+
+;General
+
+    ;Name and file
+    Name "dupeGuru"
+    OutFile "DupeGuruInstaller.exe"
+
+;--------------------------------
+
+;Interface Settings
+
+    !define MUI_ABORTWARNING
+    !define !define MUI_UNABORTWARNING
+    
+;--------------------------------
+;Pages
+
+    !insertmacro MUI_PAGE_WELCOME
+    !insertmacro MUI_PAGE_LICENSE LICENSE
+    !insertmacro MULTIUSER_PAGE_INSTALLMODE
+    
+    !insertmacro MUI_PAGE_DIRECTORY
+
+    !define MUI_STARTMENUPAGE_REGISTRY_ROOT "SHCTX" 
+    !define MUI_STARTMENUPAGE_REGISTRY_KEY "${REGKEY}" 
+    !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+    !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
+    !insertmacro MUI_PAGE_INSTFILES
+    !insertmacro MUI_PAGE_FINISH
+  
+    !insertmacro MUI_UNPAGE_CONFIRM
+    !insertmacro MUI_UNPAGE_INSTFILES
+  
+;--------------------------------
+;Languages
+ 
+  !insertmacro MUI_LANGUAGE "English" ;first language is the default language
+
+;--------------------------------
+
+;Reserve Files
+ 
+  ;If you are using solid compression, files that are required before
+  ;the actual installation should be stored first in the data block,
+  ;because this will make your installer start faster.
+ 
+  !insertmacro MUI_RESERVEFILE_LANGDLL
+  ReserveFile /nonfatal "${NSISDIR}\Plugins\*.dll"
+ 
+;--------------------------------
+
+;Installer Sections
+
+Section "DupeGuru" SecDupeGuru
+
+  SetOutPath "$INSTDIR"
+  
+  ;Files to install
+  File /r "build\dupeguru-win64bit\*"
+  File "images\dgse_logo.ico" ; image for ?
+
+  ;Store installation folder
+  WriteRegStr SHCTX "${REGKEY}" "Path" $INSTDIR
+
+  ;Uninstall Entry
+  WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\dupeGuru" \
+                 "DisplayName" "dupeGuru"
+  WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\dupeGuru" \
+                 "UninstallString" "$\"$INSTDIR\uninstall.exe$\" /$MultiUser.InstallMode"
+  WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\dupeGuru" "QuietUninstallString" \
+                 "$\"$INSTDIR\uninstall.exe$\" /$MultiUser.InstallMode /S"
+  ;todo add the rest of the keys needed here
+  ;Create uninstaller
+  WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+    
+    ;Create shortcuts
+    CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
+    CreateShortcut "$SMPROGRAMS\$StartMenuFolder\dupeGuru.lnk" "$INSTDIR\dupeGuru.exe"
+    CreateShortcut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+  
+  !insertmacro MUI_STARTMENU_WRITE_END
+
+SectionEnd
+
+;--------------------------------
+;Descriptions
+
+
+;--------------------------------
+;Uninstaller Section
+
+Section "Uninstall"
+
+  ;ADD YOUR OWN FILES HERE...
+  !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
+  RMDir /r "$SMPROGRAMS\$StartMenuFolder"
+  Delete "$INSTDIR\Uninstall.exe"
+
+  RMDir /r "$INSTDIR"
+  ; todo delete vendor dir and keys if empty
+  DeleteRegKey SHCTX "${REGKEY}"
+  DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\dupeGuru"
+
+SectionEnd
+
+Function .onInit
+  !insertmacro MULTIUSER_INIT
+  !insertmacro MUI_LANGDLL_DISPLAY
+FunctionEnd
+
+Function un.onInit
+  !insertmacro MULTIUSER_UNINIT
+  !insertmacro MUI_UNGETLANGUAGE
+FunctionEnd
\ No newline at end of file

From 2f0ceb596894521d62d8b675349e54d6256b5884 Mon Sep 17 00:00:00 2001
From: Andrew Senetar <arsenetar@gmail.com>
Date: Wed, 26 Jul 2017 21:38:17 -0500
Subject: [PATCH 06/13] Update setup.nsi

Updates to setup.nsi including:
- Defines from CLI
- Version information (MAJOR, MINOR, PATCH)
- Bits (64 / 32)
- SourcePath (if we wanted something other than build)
- Added extra defines to move application specifics to one location
- Added extra defines for uninstall information
- Added calculation of install size
- Added switching between 64 and 32 bit contexts (need to verify
functionality)
- Updated output file naming
- Added NSIS supported languages which are also supported by dupeGuru
- Added rest of registry keys for uninstall information
- Added missing registry key for installType
- Added removeing Vendor folder and registry key if empty on uninstall

Should be very close to having this installer script ready to integrate
into the package.py script if desired.
Ref #393
---
 setup.nsi | 328 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 220 insertions(+), 108 deletions(-)

diff --git a/setup.nsi b/setup.nsi
index 68129482..90d0b959 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -1,148 +1,260 @@
+;==============================================================================
+; dupeGuru Installer Script for Windows via NSIS
+;
+; When calling makensis use the following:
+; makensis /DVERSIONMAJOR=x /DVERSIONMINOR=x /DVERSIONPATCH=x /DBITS=x \
+;   /DSOURCEPATH=x
+; NOTE:
+; If SOURCEPATH is not set it will default to build (uses subdir based on app).
+;==============================================================================
+
+; Compression Setting
 SetCompressor /SOLID lzma
+; General Headers
+!include "FileFunc.nsh"
 
-; General Defines
-    !define REGKEY "Software\Hardcoded Software\dupeGuru"
-    !define INSTPATH "Hardcoded Software\dupeGuru"
-    var StartMenuFolder
+;==============================================================================
+; Configuration Defines
+;==============================================================================
 
-    ; todo include a way to point between x64 and x32 builds via env
-    ; need to also change between PROGRAMS64 and PROGRAMS
-;--------------------------------
+; Environment Defines
+!verbose push
+!verbose 4
+!ifndef VERSIONMAJOR
+  !echo "VERSIONMAJOR is NOT defined"
+!endif
+!ifndef VERSIONMINOR
+  !echo "VERSIONMINOR is NOT defined"
+!endif
+!ifndef VERSIONPATCH
+  !echo "VERSIONPATCH is NOT defined"
+!endif
+!ifndef BITS
+  !echo "BITS is NOT defined"
+!endif
+!ifndef SOURCEPATH
+  !echo "SOURCEPATH is NOT defined"
+  !define SOURCEPATH "build"
+!endif
+!ifndef VERSIONMAJOR | VERSIONMINOR | VERSIONPATCH | BITS | SOURCEPATH
+  !error "Command line Defines missing use /DDEFINE=VALUE to define before script"
+!endif
+!verbose pop
 
-;MultiUser
+; Application Specific Defines
+!define APPNAME "dupeGuru"
+!define COMPANYNAME "Hardcoded Software"
+!define DESCRIPTION "dupeGuru is a tool to find duplicate files on your computer."
+!define APPLICENSE "LICENSE"           ; License is not in build directory
+!define APPICON "images\dgse_logo.ico" ; nor is the icon
+!define DISTDIR "dist"
+!define HELPURL "http://www.hardcoded.net/support/"
+!define UPDATEURL "http://www.hardcoded.net/dupeguru/" 
+!define ABOUTURL "http://www.hardcoded.net/dupeguru/"
 
-    !define MULTIUSER_EXECUTIONLEVEL Highest
-    !define MULTIUSER_MUI
-    !define MULTIUSER_INSTALLMODE_COMMANDLINE
-    !define MULTIUSER_INSTALLMODE_INSTDIR "${INSTPATH}"
-    !define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "${REGKEY}"
-    !define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME "InstallPath"
-    !define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "${REGKEY}"
-    !define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME "InstallType"
-    !include MultiUser.nsh
+; Static Defines
+!define UNINSTALLREGBASE "Software\Microsoft\Windows\CurrentVersion\Uninstall"
+
+; Derived Defines
+!define BASEREGKEY "Software\${COMPANYNAME}\${APPNAME}" ;without root key
+!define VENDORREGKEY "Software\${COMPANYNAME}" ;without root key
+!define UNINSTALLREG "${UNINSTALLREGBASE}\${APPNAME}" ;without root key
+!define INSTPATH "${COMPANYNAME}\${APPNAME}" ;without programs / appdata
+
+; Global vars
+var StartMenuFolder
+var InstallSize
+
+;==============================================================================
+; Plugin Setup
+;==============================================================================
+
+; MultiUser Plugin - Allow single user or all install based on execution level
+!define MULTIUSER_EXECUTIONLEVEL Highest
+!define MULTIUSER_MUI
+!define MULTIUSER_INSTALLMODE_COMMANDLINE
+!define MULTIUSER_INSTALLMODE_INSTDIR "${INSTPATH}" ; without programs /appdata
+; allow for next run of installer to automatically find install path and type
+!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "${BASEREGKEY}"
+!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME "InstallPath"
+!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "${BASEREGKEY}"
+!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME "InstallType"
+!if ${BITS} == "64"
+  !define MULTIUSER_USE_PROGRAMFILES64
+!endif
+!include MultiUser.nsh
     
-;--------------------------------
+; Modern UI 2
+!include "MUI2.nsh"
+!define MUI_ICON "${APPICON}"
+!define MUI_ABORTWARNING
+!define MUI_UNABORTWARNING
 
-;--------------------------------
-;Modern UI 2
+;==============================================================================
+; NSIS Variables
+;==============================================================================
 
-    !include "MUI2.nsh"
-    !define MUI_ICON "images\dgse_logo.ico"
+Name "${APPNAME}"
+!system 'mkdir "${DISTDIR}"'
+OutFile "${DISTDIR}\${APPNAME}_win${BITS}_${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}.exe"
+Icon "${APPICON}"
 
-;--------------------------------
+;==============================================================================
+; Pages
+;==============================================================================
 
-;General
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "${APPLICENSE}"
+!insertmacro MULTIUSER_PAGE_INSTALLMODE
+!insertmacro MUI_PAGE_DIRECTORY
 
-    ;Name and file
-    Name "dupeGuru"
-    OutFile "DupeGuruInstaller.exe"
+; values for start menu page
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT "SHCTX" ; uses shell context 
+!define MUI_STARTMENUPAGE_REGISTRY_KEY "${BASEREGKEY}" 
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
 
-;--------------------------------
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
 
-;Interface Settings
-
-    !define MUI_ABORTWARNING
-    !define !define MUI_UNABORTWARNING
-    
-;--------------------------------
-;Pages
-
-    !insertmacro MUI_PAGE_WELCOME
-    !insertmacro MUI_PAGE_LICENSE LICENSE
-    !insertmacro MULTIUSER_PAGE_INSTALLMODE
-    
-    !insertmacro MUI_PAGE_DIRECTORY
-
-    !define MUI_STARTMENUPAGE_REGISTRY_ROOT "SHCTX" 
-    !define MUI_STARTMENUPAGE_REGISTRY_KEY "${REGKEY}" 
-    !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
-    !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
-    !insertmacro MUI_PAGE_INSTFILES
-    !insertmacro MUI_PAGE_FINISH
+; uninstaller pages
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
   
-    !insertmacro MUI_UNPAGE_CONFIRM
-    !insertmacro MUI_UNPAGE_INSTFILES
+;==============================================================================
+; Languages
+;==============================================================================
+ 
+!insertmacro MUI_LANGUAGE "English" ;first language is the default language
+!insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Greek"
+!insertmacro MUI_LANGUAGE "Italian"
+!insertmacro MUI_LANGUAGE "Korean"
+!insertmacro MUI_LANGUAGE "Polish"
+!insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "Spanish"
+!insertmacro MUI_LANGUAGE "Ukrainian"
+!insertmacro MUI_LANGUAGE "Vietnamese"
+!insertmacro MUI_LANGUAGE "Dutch"
+!insertmacro MUI_LANGUAGE "Czech"
+;!insertmacro MUI_LANGUAGE "Chinese" ; no NSIS builtin support
+;!insertmacro MUI_LANGUAGE "Brazilian" ; no NSIS builtin support
+;!insertmacro MUI_LANGUAGE "Armenian" ; requires UNICODE
+
+;==============================================================================
+; Reserve Files
+;==============================================================================
+ 
+; If you are using solid compression, files that are required before
+; the actual installation should be stored first in the data block,
+; because this will make your installer start faster.
+ 
+!insertmacro MUI_RESERVEFILE_LANGDLL
+ReserveFile /nonfatal "${NSISDIR}\Plugins\*.dll" ;reserve if needed
+ 
+;==============================================================================
+; Installer Sections
+;==============================================================================
+
+Section "!Application" AppSec
+  SetOutPath "$INSTDIR" ; set from result of installer pages
   
-;--------------------------------
-;Languages
+  ; Files to install
+  File /r "${SOURCEPATH}\${APPNAME}-win${BITS}bit\*"
  
-  !insertmacro MUI_LANGUAGE "English" ;first language is the default language
-
-;--------------------------------
-
-;Reserve Files
- 
-  ;If you are using solid compression, files that are required before
-  ;the actual installation should be stored first in the data block,
-  ;because this will make your installer start faster.
- 
-  !insertmacro MUI_RESERVEFILE_LANGDLL
-  ReserveFile /nonfatal "${NSISDIR}\Plugins\*.dll"
- 
-;--------------------------------
-
-;Installer Sections
-
-Section "DupeGuru" SecDupeGuru
-
-  SetOutPath "$INSTDIR"
-  
-  ;Files to install
-  File /r "build\dupeguru-win64bit\*"
-  File "images\dgse_logo.ico" ; image for ?
-
-  ;Store installation folder
-  WriteRegStr SHCTX "${REGKEY}" "Path" $INSTDIR
-
-  ;Uninstall Entry
-  WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\dupeGuru" \
-                 "DisplayName" "dupeGuru"
-  WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\dupeGuru" \
-                 "UninstallString" "$\"$INSTDIR\uninstall.exe$\" /$MultiUser.InstallMode"
-  WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\dupeGuru" "QuietUninstallString" \
-                 "$\"$INSTDIR\uninstall.exe$\" /$MultiUser.InstallMode /S"
-  ;todo add the rest of the keys needed here
-  ;Create uninstaller
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
-
+  ; Create Start Menu Items
   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-    
-    ;Create shortcuts
     CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
-    CreateShortcut "$SMPROGRAMS\$StartMenuFolder\dupeGuru.lnk" "$INSTDIR\dupeGuru.exe"
+    CreateShortcut "$SMPROGRAMS\$StartMenuFolder\${APPNAME}.lnk" "$INSTDIR\${APPNAME}.exe"
     CreateShortcut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-  
   !insertmacro MUI_STARTMENU_WRITE_END
 
+  ; Store installation folder
+  WriteRegStr SHCTX "${BASEREGKEY}" "InstallPath" $INSTDIR
+  WriteRegStr SHCTX "${BASEREGKEY}" "InstallType" $MultiUser.InstallMode
+
+  ; get installed size
+  Push $R0
+  Push $R1
+  Push $R2
+  ${GetSize} "$INSTDIR" "/S=0K" $R0 $R1 $R2 ; look into locate
+  IntFmt $InstallSize "0x%08X" $R0
+  Pop $R2
+  Pop $R1
+  Pop $R0
+
+  ; Uninstall Entry 
+  WriteRegStr SHCTX "${UNINSTALLREG}" "DisplayName" "${APPNAME} ${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}"
+  WriteRegStr SHCTX "${UNINSTALLREG}" "DisplayVersion" "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}"
+  WriteRegStr SHCTX "${UNINSTALLREG}" "DisplayIcon" "$INSTDIR\${APPNAME}.exe"
+  WriteRegDWORD SHCTX "${UNINSTALLREG}" "VersionMajor" ${VERSIONMAJOR}
+  WriteRegDWORD SHCTX "${UNINSTALLREG}" "VersionMinor" ${VERSIONMINOR}
+  WriteRegDWORD SHCTX "${UNINSTALLREG}" "VersionPatch" ${VERSIONPATCH}
+  WriteRegStr SHCTX "${UNINSTALLREG}" "Comments" "${APPNAME} installer"
+  WriteRegStr SHCTX "${UNINSTALLREG}" "InstallLocation" "$INSTDIR"
+  WriteRegStr SHCTX "${UNINSTALLREG}" "Publisher" "${COMPANYNAME}"
+  WriteRegStr SHCTX "${UNINSTALLREG}" "Contact" "${HELPURL}"
+  WriteRegStr SHCTX "${UNINSTALLREG}" "HelpLink" "${HELPURL}"
+  WriteRegStr SHCTX "${UNINSTALLREG}" "URLUpdateInfo" "${UPDATEURL}"
+  WriteRegStr SHCTX "${UNINSTALLREG}" "URLInfoAbout" "${ABOUTURL}"
+  WriteRegDWORD SHCTX "${UNINSTALLREG}" "NoModify" 1
+  WriteRegDWORD SHCTX "${UNINSTALLREG}" "NoRepair" 1
+  WriteRegDWORD SHCTX "${UNINSTALLREG}" "EstimatedSize" $InstallSize
+  WriteRegStr SHCTX "${UNINSTALLREG}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\" /$MultiUser.InstallMode"
+  WriteRegStr SHCTX "${UNINSTALLREG}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /$MultiUser.InstallMode /S"
+
+  ; Create uninstaller
+  WriteUninstaller "$INSTDIR\Uninstall.exe"
 SectionEnd
 
-;--------------------------------
-;Descriptions
+;==============================================================================
+; Descriptions
+;==============================================================================
+; Add descriptions as needed
 
-
-;--------------------------------
-;Uninstaller Section
+;==============================================================================
+; Uninstaller Sections
+;==============================================================================
 
 Section "Uninstall"
-
-  ;ADD YOUR OWN FILES HERE...
+  ; Remove Start Menu Folder
   !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
   RMDir /r "$SMPROGRAMS\$StartMenuFolder"
-  Delete "$INSTDIR\Uninstall.exe"
 
-  RMDir /r "$INSTDIR"
-  ; todo delete vendor dir and keys if empty
-  DeleteRegKey SHCTX "${REGKEY}"
-  DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\dupeGuru"
+  ; Delete the Install Directory and vendor directory (if empty)
+  Push $R0
+  RMDir /r "$INSTDIR" ;NSIS seems to recomend against this... look into options
+  ${GetParent} "$INSTDIR" $R0
+  RMDir $R0
+  Pop $R0
 
+  ; Remove registry keys and vendor keys (if empty)
+  DeleteRegKey  SHCTX "${BASEREGKEY}"
+  DeleteRegKey /ifempty SHCTX "${VENDORREGKEY}"
+  DeleteRegKey SHCTX "${UNINSTALLREG}"
 SectionEnd
 
+;==============================================================================
+; Functions
+;==============================================================================
+
 Function .onInit
+  !if ${BITS} == "64"
+    SetRegView 64
+  !else
+    SetRegView 32
+  !endif
   !insertmacro MULTIUSER_INIT
-  !insertmacro MUI_LANGDLL_DISPLAY
+  !insertmacro MUI_LANGDLL_DISPLAY 
 FunctionEnd
 
 Function un.onInit
+  !if ${BITS} == "64"
+    SetRegView 64
+  !else
+    SetRegView 32
+  !endif
   !insertmacro MULTIUSER_UNINIT
   !insertmacro MUI_UNGETLANGUAGE
 FunctionEnd
\ No newline at end of file

From 450770c8f7bc014052f11d536c4ebd669f522650 Mon Sep 17 00:00:00 2001
From: Andrew Senetar <arsenetar@gmail.com>
Date: Mon, 7 Aug 2017 20:08:17 -0500
Subject: [PATCH 07/13] Update README & requirements-windows

Minor update to README to indicate windows is supported.  Add PyQt5 to
requirements-windows.txt to make installation easier.
---
 README.md                | 2 +-
 requirements-windows.txt | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a1e7c6da..edacd9bc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # dupeGuru
 
-[dupeGuru][dupeguru] is a cross-platform (Linux and OS X) GUI tool to find duplicate files in
+[dupeGuru][dupeguru] is a cross-platform (Linux, OS X, Windows) GUI tool to find duplicate files in
 a system. It's written mostly in Python 3 and has the peculiarity of using
 [multiple GUI toolkits][cross-toolkit], all using the same core Python code. On OS X, the UI layer
 is written in Objective-C and uses Cocoa. On Linux, it's written in Python and uses Qt5.
diff --git a/requirements-windows.txt b/requirements-windows.txt
index 35b4b144..ebd54dc4 100644
--- a/requirements-windows.txt
+++ b/requirements-windows.txt
@@ -1 +1,2 @@
-cx-Freeze>=5.0.2,<6.0.0
\ No newline at end of file
+PyQt5 >=5.4,<6.0
+cx-Freeze>=5.0.2,<6.0.0

From 29fbc7553d2fe302c33e74edec29da36d5c61894 Mon Sep 17 00:00:00 2001
From: Andrew Senetar <arsenetar@gmail.com>
Date: Mon, 7 Aug 2017 21:48:40 -0500
Subject: [PATCH 08/13] Update packaging for windows

- Update package.py to integrate NSIS for windows
- Update makefile to deal with a few additional windows issues
- Add Windows.md to contain specific windows instructions, if we want
this can be merged with README.md
- Minor formatting update to setup.nsi
Ref #393
---
 Makefile   | 12 +++++++++---
 Windows.md | 37 +++++++++++++++++++++++++++++++++++++
 package.py |  9 +++++++++
 setup.nsi  |  2 +-
 4 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 Windows.md

diff --git a/Makefile b/Makefile
index 914b740b..e73b15a5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,23 @@
 PYTHON ?= python3
+PYRCC5 ?= pyrcc5
 REQ_MINOR_VERSION = 4
 PREFIX ?= /usr/local
 
 # Window compatability via Msys2 
 # - venv creates Scripts instead of bin
 # - compile generates .pyd instead of .so
+# - venv with --sytem-site-packages has issues on windows as well...
 
 ifeq ($(shell uname -o), Msys)
 	BIN = Scripts
 	SO = pyd
+	VENV_OPTIONS = 
+	PIP_OPTIONS =
 else
 	BIN = bin
 	SO = so
+	VENV_OPTIONS = --system-site-packages
+	PIP_OPTIONS = --user
 endif
 
 # Set this variable if all dependencies are already met on the system. We will then avoid the
@@ -69,15 +75,15 @@ $(submodules_target) :
 env : | $(submodules_target) reqs
 ifndef NO_VENV
 	@echo "Creating our virtualenv"
-	${PYTHON} -m venv env --system-site-packages
-	$(VENV_PYTHON) -m pip install --user -r requirements.txt
+	${PYTHON} -m venv env ${VENV_OPTIONS}
+	$(VENV_PYTHON) -m pip install ${PIP_OPTIONS} -r requirements.txt
 endif
 
 build/help : | env
 	$(VENV_PYTHON) build.py --doc
 
 qt/dg_rc.py : qt/dg.qrc
-	pyrcc5 qt/dg.qrc > qt/dg_rc.py
+	$(PYRCC5) qt/dg.qrc > qt/dg_rc.py
 
 i18n: $(mofiles)
 
diff --git a/Windows.md b/Windows.md
new file mode 100644
index 00000000..71a284dc
--- /dev/null
+++ b/Windows.md
@@ -0,0 +1,37 @@
+## How to build dupeGuru for Windows
+
+### Prerequisites
+
+- [Python 3.4+][python]
+- [nsis](http://nsis.sourceforge.net/Main_Page) (for installer creation)
+
+### With build.py (preferred)
+
+    $ cd <dupeGuru directory>
+    $ git submodule init
+    $ git submodule update
+    $ py -3.5 -m venv .\env
+    $ .\env\Scripts\activate
+    $ pip install -r requirements.txt -r requirements-windows.txt
+    $ python build.py
+    $ python run.py
+
+### With makefile
+It is possible to build dupeGuru with the makefile on windows using msys2. There are a few additional considerations:
+1. Install PyQt5 globally
+2. pass the correct value for PYTHON to the makefile if not on the path as python3
+3. Install PyQt5 & cx-Freeze with requirements-windows.txt into the venv 
+
+Then the following should work
+
+    $ make PYTHON='py -3.5'
+    $ make run
+
+### Generate Windows Installer Packages
+You need to use the respective x86 or x64 version of python to build the 32 bit and 64 bit versions. The build scripts will automatically detect the python architecture for you. When using build.py make sure the resulting python works before continuing to package.py.
+
+    $ python package.py
+    $ python package.py --installer_windows    
+
+### Running tests
+The complete test suite can be run with tox just like on linux.
diff --git a/package.py b/package.py
index 1f899d4f..cca98b12 100644
--- a/package.py
+++ b/package.py
@@ -12,6 +12,7 @@ import shutil
 import json
 from argparse import ArgumentParser
 import platform
+import re
 
 from hscommon.build import (
     print_and_do, copy_packages, build_debian_changelog,
@@ -168,6 +169,14 @@ def package_windows():
         executables=executables,
         script_args=['build']
     )
+    # Information to pass to NSIS
+    version_array = app_version.split('.')
+    match = re.search('[0-9]+', arch)
+    bits = match.group(0)
+    # Call NSIS (TODO update to not use hardcoded path)
+    cmd = ('"C:\\Program Files (x86)\\NSIS\\Bin\\makensis.exe" '
+           '/DVERSIONMAJOR={0} /DVERSIONMINOR={1} /DVERSIONPATCH={2} /DBITS={3} setup.nsi')
+    print_and_do(cmd.format(version_array[0], version_array[1], version_array[2], bits))
 
 def main():
     args = parse_args()
diff --git a/setup.nsi b/setup.nsi
index 90d0b959..ce2f3d84 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -85,7 +85,7 @@ var InstallSize
 !include MultiUser.nsh
     
 ; Modern UI 2
-!include "MUI2.nsh"
+!include MUI2.nsh
 !define MUI_ICON "${APPICON}"
 !define MUI_ABORTWARNING
 !define MUI_UNABORTWARNING

From 30b4102abdb47785eab67825343cb4e50f75d97d Mon Sep 17 00:00:00 2001
From: Andrew Senetar <arsenetar@gmail.com>
Date: Wed, 23 Aug 2017 16:47:52 -0500
Subject: [PATCH 09/13] Update README & Windows Instructions

- Update the README to include a reference to the Windows instructions.
-  Add some additional notes into Windows Instructions and remove one
incorrect command.
- Update .gitignore to ignore all permutations of env* to allow for
multiple side by side virtual environments (used to build different
versions for windows)
Ref:  #393
---
 .gitignore | 2 +-
 README.md  | 3 +++
 Windows.md | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7bf76a09..439b333d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@ __pycache__
 
 build
 dist
-env
+env*
 /deps
 cocoa/autogen
 
diff --git a/README.md b/README.md
index edacd9bc..6697c21f 100644
--- a/README.md
+++ b/README.md
@@ -66,6 +66,9 @@ git submodules:
 
 ## How to build dupeGuru from source
 
+### Windows
+For windows instructions see the [Windows Instructions](Windows.md).
+
 ### Prerequisites
 
 * [Python 3.4+][python]
diff --git a/Windows.md b/Windows.md
index 71a284dc..c54d035d 100644
--- a/Windows.md
+++ b/Windows.md
@@ -6,6 +6,7 @@
 - [nsis](http://nsis.sourceforge.net/Main_Page) (for installer creation)
 
 ### With build.py (preferred)
+To build with a different python version 3.5 vs 3.6 or 32 bit vs 64 bit specify that version instead of -3.5 to the `py` command below.  If you want to build additional versions while keeping all virtual environments setup use a different location for each vritual environment.
 
     $ cd <dupeGuru directory>
     $ git submodule init
@@ -28,10 +29,9 @@ Then the following should work
     $ make run
 
 ### Generate Windows Installer Packages
-You need to use the respective x86 or x64 version of python to build the 32 bit and 64 bit versions. The build scripts will automatically detect the python architecture for you. When using build.py make sure the resulting python works before continuing to package.py.
+You need to use the respective x86 or x64 version of python to build the 32 bit and 64 bit versions. The build scripts will automatically detect the python architecture for you. When using build.py make sure the resulting python works before continuing to package.py. NOTE: package.py looks for the 'makensis' executable in the default location for a 64 bit windows system.
 
     $ python package.py
-    $ python package.py --installer_windows    
 
 ### Running tests
 The complete test suite can be run with tox just like on linux.

From 49077bbe2709ee68c8aba2f31aa69711825d5ce0 Mon Sep 17 00:00:00 2001
From: Andrew Senetar <arsenetar@gmail.com>
Date: Wed, 23 Aug 2017 16:51:11 -0500
Subject: [PATCH 10/13] Update Window.md

Fix broken python link and move nsis link for consistency.
---
 Windows.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Windows.md b/Windows.md
index c54d035d..a1b121f0 100644
--- a/Windows.md
+++ b/Windows.md
@@ -3,7 +3,7 @@
 ### Prerequisites
 
 - [Python 3.4+][python]
-- [nsis](http://nsis.sourceforge.net/Main_Page) (for installer creation)
+- [nsis][nsis] (for installer creation)
 
 ### With build.py (preferred)
 To build with a different python version 3.5 vs 3.6 or 32 bit vs 64 bit specify that version instead of -3.5 to the `py` command below.  If you want to build additional versions while keeping all virtual environments setup use a different location for each vritual environment.
@@ -35,3 +35,6 @@ You need to use the respective x86 or x64 version of python to build the 32 bit
 
 ### Running tests
 The complete test suite can be run with tox just like on linux.
+
+[python]: http://www.python.org/
+[nsis]: http://nsis.sourceforge.net/Main_Page

From 8d6826515b5491c3b67d8e6c0f5638245a881a19 Mon Sep 17 00:00:00 2001
From: Andrew Senetar <arsenetar@gmail.com>
Date: Fri, 25 Aug 2017 22:08:01 -0500
Subject: [PATCH 11/13] More Details in Windows.md

Update Windows.md including:
- Information on compilier requirements for windows
- Notes about the windows 10 sdk
- Some clarification around some of the steps
- Addition of msys2 links

Going to review this a bit more to polish it up.

Ref #393.
---
 Windows.md | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/Windows.md b/Windows.md
index a1b121f0..74295e1a 100644
--- a/Windows.md
+++ b/Windows.md
@@ -2,8 +2,18 @@
 
 ### Prerequisites
 
-- [Python 3.4+][python]
+- [Python 3.5+][python]
+- [Visual Studio 2017][vs] or [Visual Studio Build Tools 2017][vsBuildTools] with the Windows 10 SDK
 - [nsis][nsis] (for installer creation)
+- [msys2][msys2] (for using makefile method)
+
+When installing Visual Studio or the Visual Studio Build Tools with the Windows 10 SDK on versions of Windows below 10 be sure to make sure that the Universal CRT is installed before installing Visual studio as noted in the [Windows 10 SDK Notes][win10sdk] and found at [KB2999226][KB2999226].
+
+After installing python it is recommended to update setuptools before compiling packages.  To update run (example is for python launcher and 3.5):
+
+    $ py -3.5 -m pip install --upgrade setuptools
+
+More details on setting up python for compiling packages on windows can be found on the [python wiki][pythonWindowsCompilers]
 
 ### With build.py (preferred)
 To build with a different python version 3.5 vs 3.6 or 32 bit vs 64 bit specify that version instead of -3.5 to the `py` command below.  If you want to build additional versions while keeping all virtual environments setup use a different location for each vritual environment.
@@ -18,18 +28,21 @@ To build with a different python version 3.5 vs 3.6 or 32 bit vs 64 bit specify
     $ python run.py
 
 ### With makefile
-It is possible to build dupeGuru with the makefile on windows using msys2. There are a few additional considerations:
-1. Install PyQt5 globally
-2. pass the correct value for PYTHON to the makefile if not on the path as python3
-3. Install PyQt5 & cx-Freeze with requirements-windows.txt into the venv 
+It is possible to build dupeGuru with the makefile on windows using a compatable POSIX environment.  The following steps have been tested using [msys2][msys2]. Before running make:
+1. Install msys2 or other POSIX environment
+2. Install PyQt5 globally via pip
+3. Use the respective console for msys2 it is `msys2 msys` 
 
-Then the following should work
+Then the following execution of the makefile should work.  Pass the correct value for PYTHON to the makefile if not on the path as python3.
 
+    $ cd <dupeGuru directory>
     $ make PYTHON='py -3.5'
     $ make run
 
+NOTE: Install PyQt5 & cx-Freeze with requirements-windows.txt into the venv before runing the packaging scripts in the section below.
+
 ### Generate Windows Installer Packages
-You need to use the respective x86 or x64 version of python to build the 32 bit and 64 bit versions. The build scripts will automatically detect the python architecture for you. When using build.py make sure the resulting python works before continuing to package.py. NOTE: package.py looks for the 'makensis' executable in the default location for a 64 bit windows system.
+You need to use the respective x86 or x64 version of python to build the 32 bit and 64 bit versions.  The build scripts will automatically detect the python architecture for you. When using build.py make sure the resulting python works before continuing to package.py.  NOTE: package.py looks for the 'makensis' executable in the default location for a 64 bit windows system.  Run the following in the respective virtual environment.
 
     $ python package.py
 
@@ -38,3 +51,9 @@ The complete test suite can be run with tox just like on linux.
 
 [python]: http://www.python.org/
 [nsis]: http://nsis.sourceforge.net/Main_Page
+[vs]: https://www.visualstudio.com/downloads/#visual-studio-community-2017
+[vsBuildTools]: https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
+[win10sdk]: https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk
+[KB2999226]: https://support.microsoft.com/en-us/help/2999226/update-for-universal-c-runtime-in-windows
+[pythonWindowsCompilers]: https://wiki.python.org/moin/WindowsCompilers
+[msys2]: http://www.msys2.org/

From 9cb07dcf551fbb4491115490eae4517338e836ff Mon Sep 17 00:00:00 2001
From: Andrew Senetar <arsenetar@gmail.com>
Date: Sat, 14 Oct 2017 12:23:06 -0500
Subject: [PATCH 12/13] Update qtlib Update qtlib to prevent error on multiple
 calls to close the progress window.  I have not been able to duplicate the
 issue again, to track down the root cause. Ref #449

---
 qtlib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qtlib b/qtlib
index f2dce13c..45cf0cbf 160000
--- a/qtlib
+++ b/qtlib
@@ -1 +1 @@
-Subproject commit f2dce13c3e7289948623de66c4d1277560df0cee
+Subproject commit 45cf0cbf77c87eb591914f0235b3b2e36ef09bb8

From 5d3e34334b70f34f4c1adefadb7b56b8f1aca807 Mon Sep 17 00:00:00 2001
From: Andrew Senetar <arsenetar@gmail.com>
Date: Mon, 13 Nov 2017 18:53:18 -0600
Subject: [PATCH 13/13] Fix syntax error in translation file.

Fix #451
---
 locale/it/LC_MESSAGES/core.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/it/LC_MESSAGES/core.po b/locale/it/LC_MESSAGES/core.po
index 5d90847a..18d4662e 100644
--- a/locale/it/LC_MESSAGES/core.po
+++ b/locale/it/LC_MESSAGES/core.po
@@ -22,8 +22,8 @@ msgstr "Non ci sono duplicati selezionati. Nessuna operazione è stata completat
 msgid ""
 "You're about to open many files at once. Depending on what those files are "
 "opened with, doing so can create quite a mess. Continue?"
-msgstr "Stai per aprire molti file contemporaneamente. A seconda di quale programma
-li aprirà, potrebbe crearsi un bel casino. Vuoi continuare?"
+msgstr "Stai per aprire molti file contemporaneamente. A seconda di quale programma "
+"li aprirà, potrebbe crearsi un bel casino. Vuoi continuare?"
 
 #: core/app.py:65
 msgid "Scanning for duplicates"