Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

setup: begin work on a PyQt installer

With these changes, you can copy contrib\win32\setup.cfg to your
repo root, then run: python setup.py py2exe -b2

This creates a dist/ folder that is almost functional; the workbench
crashes before opening but 'thg ci', 'thg grep', and 'thg annotate' work.

There seems to be issues loading svg icons, etc.

The workbench outputs these messages before crashing:

QWidget: Must construct a QApplication before a QPaintDevice

This application has requested the Runtime to terminate it in an unusual way.
Please contact the application's support team for more information.

Changeset a9316316aedd…

Parent b5444073d35d…

by Steve Borho

Changes to 3 files · Browse files at a9316316aedd Showing diff from parent b5444073d35d Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​win32/​setup.cfg Stacked
 
1
2
3
4
5
6
 
 
 
 
 
1
 
 
 
 
 
2
3
4
5
@@ -1,6 +1,5 @@
 [py2exe] -excludes=pywin, pywin.dialogs, pywin.dialogs.list -includes=cairo, pango, pangocairo, atk, gobject, dbhash, gtk.keysyms, gio, sip -packages=ctypes, email, hgext, hgext.convert, encodings, tortoisehg.hgtk, tortoisehg.hgtk.logview, tortoisehg.util, iniparse, pygments, dulwich, nntplib - -dll_excludes=iconv.dll, intl.dll, libatk-1.0-0.dll, libgdk_pixbuf-2.0-0.dll, libgdk-win32-2.0-0.dll, libglib-2.0-0.dll, libgmodule-2.0-0.dll, libgobject-2.0-0.dll, libgthread-2.0-0.dll, libgtk-win32-2.0-0.dll, libpango-1.0-0.dll, libpangowin32-1.0-0.dll, libcairo-2.dll, libglade-2.0-0.dll, libpangocairo-1.0-0.dll, libpangoft2-1.0-0.dll, libgio-2.0-0.dll, mswsock.dll, powrprof.dll, shfolder.dll, credui.dll, msvcp60.dll, secur32.dll +excludes=pywin, pywin.dialogs, pywin.dialogs.list, PyQt4.uic.port_v3 +includes=sip +packages=ctypes, email, hgext, hgext.convert, encodings, tortoisehg.util, tortoisehg.hgqt, iniparse, pygments, nntplib +dll_excludes=mswsock.dll, powrprof.dll, shfolder.dll, credui.dll, msvcp60.dll, secur32.dll
Change 1 of 3 Show Entire File setup.py Stacked
 
91
92
93
94
95
96
 
97
98
99
 
153
154
155
156
157
158
159
160
161
162
163
 
182
183
184
185
186
187
188
 
 
189
190
191
 
91
92
93
 
 
 
94
95
96
97
 
151
152
153
 
 
 
 
 
154
155
156
 
175
176
177
 
 
 
 
178
179
180
181
182
@@ -91,9 +91,7 @@
  # Specific definitios for Windows NT-alike installations   _scripts = []   _data_files = [] - _packages = ['tortoisehg.hgtk', 'tortoisehg.hgtk.logview', - 'tortoisehg.hgqt', - 'tortoisehg.util', 'tortoisehg'] + _packages = ['tortoisehg.hgqt', 'tortoisehg.util', 'tortoisehg']   extra = {}   hgextmods = []   @@ -153,11 +151,6 @@
  'description':'Mercurial Distributed SCM',   'copyright':hgcopyright,   'product_version':version}, - {'script':'hgtk', - 'icon_resources':[(0,'icons/thg_logo.ico')], - 'description':'TortoiseHg GUI tools for Mercurial SCM', - 'copyright':thgcopyright, - 'product_version':version},   {'script':'thg',   'icon_resources':[(0,'icons/thg_logo.ico')],   'description':'TortoiseHg GUI tools for Mercurial SCM', @@ -182,10 +175,8 @@
 def setup_posix():   # Specific definitios for Posix installations   _extra = {} - _scripts = ['thg', 'hgtk'] - _packages = ['tortoisehg', 'tortoisehg.hgtk', - 'tortoisehg.hgqt', - 'tortoisehg.hgtk.logview', 'tortoisehg.util'] + _scripts = ['thg'] + _packages = ['tortoisehg', 'tortoisehg.hgqt', 'tortoisehg.util']   _data_files = [(os.path.join('share/pixmaps/tortoisehg', root),   [os.path.join(root, file_) for file_ in files])   for root, dirs, files in os.walk('icons')]
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​__init__.py Stacked
 
31
32
33
34
 
35
36
37
 
31
32
33
 
34
35
36
37
@@ -31,7 +31,7 @@
 curdir = osp.dirname(__file__)  pyfile = osp.join(curdir, "workbench_rc.py")  rcfile = osp.join(curdir, "workbench.qrc") -if should_rebuild(rcfile, pyfile): +if not hasattr(sys, "frozen") and should_rebuild(rcfile, pyfile):   if os.system('pyrcc4 %s -o %s' % (rcfile, pyfile)):   print "ERROR: Cannot convert the resource file '%s' into a python module."   print "Please check the PyQt 'pyrcc4' tool is installed, or do it by hand running:"