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
Approved by: Jaap Karssenberg
Approved revision: no longer in the source branch.
Merged at revision: 283
Proposed branch: lp:~bkidwell/zim/pyzim-win-installer
Merge into: lp:~jaap.karssenberg/zim/pyzim
Diff against target: 34 lines (+9/-7)
1 file modified
windows/build_win32.py (+9/-7)
To merge this branch: bzr merge lp:~bkidwell/zim/pyzim-win-installer
Reviewer Review Type Date Requested Status
Jaap Karssenberg Approve
Review via email: mp+30225@code.launchpad.net

Description of the change

Fixes lp bug 590531, for sure.

To post a comment you must log in.
Revision history for this message
Jaap Karssenberg (jaap.karssenberg) :
review: Approve
lp:~bkidwell/zim/pyzim-win-installer updated
282. By Jaap Karssenberg

Various fixes for small issues found while testing on win32

283. By Jaap Karssenberg

Merged windows installer work

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'windows/build_win32.py'
2--- windows/build_win32.py 2010-05-30 18:52:55 +0000
3+++ windows/build_win32.py 2010-07-18 21:58:38 +0000
4@@ -21,21 +21,23 @@
5 # update "data" folder
6 shutil.copytree("data", "windows/build/data")
7
8+# Use function from distutils because shutil.copytree
9+# fails when destination folder exists
10+
11 # If you installed GTK to a different folder, change these lines:
12-shutil.copytree("c:/Program Files/Common Files/GTK/2.0/etc", "windows/build/etc")
13-shutil.copytree("c:/Program Files/Common Files/GTK/2.0/lib", "windows/build/lib")
14-shutil.copytree("c:/Program Files/Common Files/GTK/2.0/share", "windows/build/share")
15+distutils.dir_util.copy_tree("c:/Program Files/Common Files/GTK/2.0/etc", "windows/build/etc", update=1)
16+distutils.dir_util.copy_tree("c:/Program Files/Common Files/GTK/2.0/lib", "windows/build/lib", update=1)
17+distutils.dir_util.copy_tree("c:/Program Files/Common Files/GTK/2.0/share", "windows/build/share", update=1)
18
19 # Copy translation files
20-# Use function from distutils because shutil.copytree
21-# fails when destination folder exists
22 distutils.dir_util.copy_tree("locale", "windows/build/share/locale", update=1)
23
24 # Copy plugins folder so Preferences dialog can iterate through them
25-shutil.copytree("zim/plugins", "windows/build/zim/plugins")
26+distutils.dir_util.copy_tree("zim/plugins", "windows/build/zim/plugins", update=1)
27
28 # Copy the hicolor icon theme from windows folder because it's missing from Gtk/win32 distro
29-os.makedirs("windows/build/share/icons/hicolor")
30+if not os.path.exists("windows/build/share/icons/hicolor"):
31+ os.makedirs("windows/build/share/icons/hicolor")
32 shutil.copyfile(
33 "windows/hicolor-icon-theme__index.theme",
34 "windows/build/share/icons/hicolor/index.theme"