Zim

Merge lp:~bkidwell/zim/pyzim-win-installer into lp:~jaap.karssenberg/zim/pyzim

  1. pyzim-win-installer
  2. Merge into pyzim
Proposed by Brendan Kidwell
Status: Merged
Merged at revision: 535
Proposed branch: lp:~bkidwell/zim/pyzim-win-installer
Merge into: lp:~jaap.karssenberg/zim/pyzim
Diff against target: 47 lines (+15/-3)
3 files modified
windows/README-BUILD-win32.txt (+12/-0)
windows/build_win32.py (+3/-0)
windows/src/AppInfo/appinfo.ini (+0/-3)
To merge this branch: bzr merge lp:~bkidwell/zim/pyzim-win-installer
Reviewer Review Type Date Requested Status
Jaap Karssenberg Pending
Review via email: mp+100713@code.launchpad.net

Description of the change

Fix for lp:923679 "Zim 0.54 doesn't work on Windows XP"

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'windows/README-BUILD-win32.txt'
2--- windows/README-BUILD-win32.txt 2012-01-16 04:39:28 +0000
3+++ windows/README-BUILD-win32.txt 2012-04-04 00:18:21 +0000
4@@ -78,6 +78,18 @@
5 These tools default to installing in ~/Desktop, but I personally
6 put them in ~/Apps. Be sure to put them all in the same folder.
7
8+9. See http://www.py2exe.org/index.cgi/Tutorial#Step5 . You need to
9+ create the following files under ./windows/src/ :
10+ Microsoft.VC90.CRT/
11+ +-- Microsoft.VC90.CRT.manifest
12+ +-- msvcm90.dll
13+ +-- msvcp90.dll
14+ +-- msvcr90.dll -- must be exactly version 9.0.21022.8 for Python 2.7
15+ You can get these files here:
16+ http://www.glump.net/content/zim/Microsoft.VC90.CRT.zip
17+ (Not included in Zim source because the license for redistribution is
18+ confusing.)
19+
20
21 Building the application icon
22 -----------------------------
23
24=== modified file 'windows/build_win32.py'
25--- windows/build_win32.py 2012-01-16 05:53:13 +0000
26+++ windows/build_win32.py 2012-04-04 00:18:21 +0000
27@@ -88,6 +88,9 @@
28 # Copy jpeg62.dll
29 shutil.copy(r"windows\jpeg62.dll", EXE_ROOT)
30
31+# Copy msvcr90.dll
32+distutils.dir_util.copy_tree(r"windows\src\Microsoft.VC90.CRT", path.join(EXE_ROOT, "Microsoft.VC90.CRT"), update=1)
33+
34 # Set theme to MS-Windows
35 f = open(os.path.join(EXE_ROOT, r"etc\gtk-2.0\gtkrc"), "w")
36 print >>f, 'gtk-theme-name = "MS-Windows"'
37
38=== modified file 'windows/src/AppInfo/appinfo.ini'
39--- windows/src/AppInfo/appinfo.ini 2012-01-16 06:05:03 +0000
40+++ windows/src/AppInfo/appinfo.ini 2012-04-04 00:18:21 +0000
41@@ -27,7 +27,4 @@
42 ;[Version]
43 ;PackageVersion=0.0.0.0
44 ;DisplayVersion=0.0
45-[Version]
46-PackageVersion=0.54.0.0
47-DisplayVersion=0.54 Development Test 1
48