From 30b4102abdb47785eab67825343cb4e50f75d97d Mon Sep 17 00:00:00 2001 From: Andrew Senetar Date: Wed, 23 Aug 2017 16:47:52 -0500 Subject: [PATCH] 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 $ 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.