From: W. Trevor King <wking@tremily.us>
Date: Sat, 18 Oct 2014 18:13:29 +0000 (-0700)
Subject: Merge branch 'python'
X-Git-Tag: v0.2^0
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=HEAD;p=swc-setup-windows-installer.git

Merge branch 'python'

Significant changes:
* Bump version to 0.2
* Install GNU Make (cherry-picked from the msysGit repository)
* Mention that R should be installed before running our installer

* python:
  swc-windows-installer.py: Bump version to 0.2
  swc-windows-installer.py: Fix "it's hash" -> "its hash" typo
  swc-windows-installer.py: Add install_msysgit_binary and install Make
  swc-windows-installer.py: Add a trailing paren to get_r_bin_directory.__doc__
  Replace 'Anaconda CE' -> 'Anaconda'
  Mention that R should be installed before running our installer

Conflicts:
	README.md (due to different usage instructions between the Python
	  branch and the Inno branch).
---

1ba2d19eb8355efc852bd53da530da00eb7cc075
diff --cc README.md
index 928b2bb,c628c3a..af88ba0
--- a/README.md
+++ b/README.md
@@@ -10,39 -10,23 +10,41 @@@ The script
  * Provides standard [nosetests][] behavior for msysGit
  * Adds [R][]'s bin directory to the path (if we can find it)
  
 -To use:
 +Building
 +========
  
 -1. Install [Python][], [IPython][], and [Nose][nose].  An easy way to
 -   do this is with the [Anaconda][] Python distribution.
 -2. [Install msysGit][msysgit-install]
 -3. [Install R][R-install] (if your workshop uses R).
 -4. Run `swc-windows-installer.py`.  You should be able to simply
 -   double click the file in Windows.
 +Building the Windows installer requires a Windows machine with [Python][],
 +[py2exe][] and [Inno Setup][inno]. `py2exe` can be installed using `pip` and
 +Inno Setup can be installed using the self-installing package from
 +[the download page][inno-download].
 +
 +```
 +python setup.py install
 +python setup.py py2exe
 +ISCC.exe swc-installer.iss
 +```
 +
 +For folks who don't want to build their own version, the most recent
 +version is also [available here][compiled].
 +
 +Using
 +=====
 +
 +Just have your students download and double-click the compiled
- installer.  If you're using [R][], you'll have to install R before
- running this installer (because this installer searches likely paths
- to find R's `bin` directory).  Otherwise, you can run it whenever you
- like (e.g. either before or after installing [Python][]).
++installer.  If you're using [R][], you'll have to [install
++R][R-install] before running this installer (because this installer
++searches likely paths to find R's `bin` directory).  Otherwise, you
++can run it whenever you like (e.g. either before or after installing
++[Python][]).
  
  [msysGit]: http://msysgit.github.io/
 -[msysgit-install]: https://github.com/msysgit/msysgit/releases
  [nano]: http://www.nano-editor.org/
  [SQLite]: http://www.sqlite.org/
 -[Python]: https://www.python.org/
 -[IPython]: http://ipython.org/
 -[Nose]: https://nose.readthedocs.org/en/latest/
  [nosetests]: https://nose.readthedocs.org/en/latest/usage.html
  [R]: http://www.r-project.org/
+ [R-install]: http://cran.r-project.org/bin/windows/base/rw-FAQ.html#Installation-and-Usage
 -[Anaconda]: http://continuum.io/downloads
 +[Python]: https://www.python.org/
 +[py2exe]: http://py2exe.org/
 +[inno]: http://www.jrsoftware.org/isinfo.php
 +[inno-download]: http://www.jrsoftware.org/isdl.php
 +[compiled]: https://github.com/swcarpentry/windows-installer/releases/latest