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: 299
Proposed branch: lp:~bkidwell/zim/pyzim-win-installer
Merge into: lp:~jaap.karssenberg/zim/pyzim
Diff against target: 25 lines (+8/-0)
1 file modified
windows/build_win32.py (+8/-0)
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+31503@code.launchpad.net

Commit message

* partial fix for lp:569091 -- now including all .exe files form GTK's bin folder in Zim package
* full fix for lp:612393

Description of the change

* partial fix for lp:569091 -- now including all .exe files form GTK's bin folder in Zim package
* full fix for lp:612393

To post a comment you must log in.
lp:~bkidwell/zim/pyzim-win-installer updated
296. By Jaap Karssenberg

* Improved behavior of 'Edit Source'
* Added special case for handling outlook:// urls
* Fixed bug in 'Save Version'

Revision history for this message
Jaap Karssenberg (jaap.karssenberg) :
review: Approve
lp:~bkidwell/zim/pyzim-win-installer updated
297. By Jaap Karssenberg

* Added option to set custom applications
* Added encoding=url option for quicknote plugin commandline options

298. By Jaap Karssenberg <jaap@no-spoon>

Added new plugin for inline evaluation of expressions

299. By Jaap Karssenberg <jaap@no-spoon>

Merged windows installer branch

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-06-06 21:56:27 +0000
3+++ windows/build_win32.py 2010-08-02 02:01:39 +0000
4@@ -1,6 +1,7 @@
5 import os
6 import sys
7 import shutil
8+import glob
9 import datetime
10 import subprocess
11 import distutils.dir_util
12@@ -28,6 +29,13 @@
13 distutils.dir_util.copy_tree("c:/Program Files/Common Files/GTK/2.0/etc", "windows/build/etc", update=1)
14 distutils.dir_util.copy_tree("c:/Program Files/Common Files/GTK/2.0/lib", "windows/build/lib", update=1)
15 distutils.dir_util.copy_tree("c:/Program Files/Common Files/GTK/2.0/share", "windows/build/share", update=1)
16+files = glob.iglob(os.path.join("c:/Program Files/Common Files/GTK/2.0/bin", "*.exe"))
17+for file in files:
18+ if os.path.isfile(file):
19+ shutil.copy2(file, "windows/build")
20+
21+# Copy icon files
22+distutils.dir_util.copy_tree("icons", "windows/build/icons", update=1)
23
24 # Copy translation files
25 distutils.dir_util.copy_tree("locale", "windows/build/share/locale", update=1)