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

[Brendan Kidwell]

Jaap, I had to fix a couple of things in build_win32.py to get the build process to work right in Windows 7 with the Zim 0.61 release:

* Don't import __version__ from 'zim' package anymore; it gets all breaky trying to initialize the configuration data. Hackishly parse out this value by running a regex on zim/__init__.py .

* Use cmd.exe instead of shutil to clear windows/buid folder at the start of the build process; shutil was failing to delete the Microsoft.VC90.CRT subfolder.

=== modified file 'windows/build_win32.py'
--- windows/build_win32.py	2012-04-04 00:03:31 +0000
+++ windows/build_win32.py	2014-08-05 21:36:55 +0000
@@ -13,14 +13,11 @@
 import shutil
 import glob
 import datetime
+import re
 import subprocess
 import distutils.dir_util
 from distutils.sysconfig import get_python_lib
 
-# load version number constant from zim package
-sys.path.append(".")
-from zim import __version__
-
 # contants for this script
 #
 # windows
@@ -33,17 +30,30 @@
 APP_ROOT = path.join(BUILD_ROOT, "ZimDesktopWikiPortable")
 EXE_ROOT = path.join(APP_ROOT, r"App\ZimDesktopWiki")
 
-#GTK_ROOT = path.join(get_python_lib(), r"gtk-2.0\runtime")
+# Find GTK 'runtime' folder
 for libdir in os.environ["PATH"].split(path.pathsep):
 	if path.exists(path.join(libdir, "libgtk-win32-2.0-0.dll")):
 		GTK_ROOT = path.dirname(libdir)
 
+# Parse '__version__' out of zim package since simply importing __version__ from zim fails as of 0.61
+f = open("zim/__init__.py", "r")
+text = f.read()
+f.close()
+match = re.search(r"^\s*__version__\s*=\s*'([\d\.]+)'\s*$", text, re.MULTILINE)
+__version__ = match.group(1)
+
 # --------------------------------------
 # BUILD
 # --------------------------------------
 
 # Clean up and initialize the build directory
-shutil.rmtree(BUILD_ROOT, True)
+# (Use cmd.exe because shutil.rmtree seems to fail to delete "Microsoft.VC90.CRT" folder.)
+if path.exists(BUILD_ROOT):
+        subprocess.check_call([
+                'cmd.exe', '/c',
+                'cd', '/d', os.getcwd(), '&&',
+                'rmdir' , '/s', '/q', BUILD_ROOT
+        ])
 os.makedirs(EXE_ROOT)
 
 # Create main zim.exe and any files generated by setup.py