Merge lp:~bkidwell/zim/win32-build-0.63-fixes into lp:~jaap.karssenberg/zim/pyzim

[Brendan Kidwell]

Windows build: exclude system DNSAPI.DLL from installer to fix conflict; better compression in installer; support GtkSourceView.

=== modified file 'setup.py'
--- setup.py	2014-10-14 05:42:43 +0000
+++ setup.py	2015-07-06 06:07:34 +0000
@@ -354,6 +354,9 @@
 				"ascii": 1,
 				"bundle_files": 3,
 				"packages": ["encodings", "cairo", "atk", "pangocairo", "zim"],
+				"dll_excludes": {
+					"DNSAPI.DLL"
+				}
 			}
 		}
 	}

=== modified file 'windows/README-BUILD-win32.txt'
--- windows/README-BUILD-win32.txt	2012-04-04 00:03:31 +0000
+++ windows/README-BUILD-win32.txt	2015-07-06 06:07:34 +0000
@@ -18,36 +18,23 @@
 Requirements
 ------------
 
-1. Install Python 2.6 or greater for Windows from
+1. Install Python 2.7 for Windows from
 
    http://www.python.org/download/
 
-   Note: Python version must be 2.6 or greater, but less than 3.0
+   Note: Zim has not yet been ported to Python 3.
 
 2. Install the py2exe library from
 
    http://sourceforge.net/projects/py2exe/files/
 
-3. Download GTK+ Bundle from
-
-   http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.24/
-
-   Or a newer version if one exists. Extract this Zip file to a
-   convenient place such as
-
-   C:\Program Files (x86)\Common Files\GTK+ Bundle
-
-4. Install PyCairo, PyGObject, and PyGTK from
-
-   http://ftp.gnome.org/pub/GNOME/binaries/win32/pycairo/[newest version]/pycairo-VERSION.win32-pyVER.msi
-   http://ftp.gnome.org/pub/GNOME/binaries/win32/pygobject/[newest version]/pygobject-VERSION.win32-pyVER.msi
-   http://ftp.gnome.org/pub/GNOME/binaries/win32/pygtk/[newest version]/pygtk-VERSION.win32-pyVER.msi
-
-   Make sure that the Python version matches the one you're using, and
-   that you don't download a pygtk library with a version newer than
-   the bundle from the previous step.
-
-5. Jpeg for Windows
+3. Install PyGTK All-in-One from
+
+   http://ftp.gnome.org/pub/GNOME/binaries/win32/pygtk/2.24/pygtk-all-in-one-2.24.2.win32-py2.7.msi
+
+   Be sure to include "PyGTKSourceView" when you run the installer.
+
+4. Jpeg for Windows
 
    http://gnuwin32.sourceforge.net/packages/jpeg.htm
 

=== modified file 'windows/build_win32.py'
--- windows/build_win32.py	2014-10-10 19:28:06 +0000
+++ windows/build_win32.py	2015-07-06 06:07:34 +0000
@@ -32,8 +32,16 @@
 
 # Find GTK 'runtime' folder
 for libdir in os.environ["PATH"].split(path.pathsep):
+	# Look for GTK bin folder in a $PATH element
 	if path.exists(path.join(libdir, "libgtk-win32-2.0-0.dll")):
 		GTK_ROOT = path.dirname(libdir)
+		break
+	# Look for GTK under Python's site-packages folder
+	if path.exists(path.join(libdir, r"Lib\site-packages\gtk-2.0\runtime\bin", "libgtk-win32-2.0-0.dll")):
+		GTK_ROOT = path.join(libdir, r"Lib\site-packages\gtk-2.0\runtime")
+		break
+if not GTK_ROOT:
+	raise RuntimeError("Can't find GTK")
 
 # Parse '__version__' out of zim package since simply importing __version__ from zim fails as of 0.61
 f = open("zim/__init__.py", "r")

=== modified file 'windows/create-zim-setup.nsi'
--- windows/create-zim-setup.nsi	2012-01-16 06:17:13 +0000
+++ windows/create-zim-setup.nsi	2015-07-06 06:07:34 +0000
@@ -13,6 +13,7 @@
 InstallDir "$PROGRAMFILES\Zim Desktop Wiki"
 InstallDirRegKey HKLM "Software\${APPNAME}" ""
 OutFile "..\dist\Zim-setup-${VER}_${BUILDDATE}.exe"
+SetCompressor /SOLID lzma
 
 ; Modern interface settings
 !include "MUI.nsh"