Changeset 780:1687ac1948d0 in hatta-dev for setup.py

Timestamp:

07/16/10 20:18:33 (22 months ago)

Author:

Cezary Krzyżanowski <cezary.krzyzanowski@…>

Branch:

default

Message:

Moved ui and png to resources. Get the png packed. Make dialog find it's icon while debugging and when frozen.

File:

• setup.py (modified) (8 diffs)

setup.py

@@ -34 +34 @@
         ('share/locale/sv/LC_MESSAGES', ['locale/sv/LC_MESSAGES/hatta.mo']),
         ('share/icons/hicolor/scalable', ['resources/hatta.svg']),
-        ('share/icons/hicolor/64x64', ['resources/hatta.png']),
+        ('share/icons/hicolor/64x64', ['resources/hatta.png',
+            'resources/error.png']),
         ('share/applications', ['resources/hatta.desktop']),
         ('share/doc/hatta/examples', [
@@ -45 +46 @@
     requires=['werkzeug (>=0.3)', 'mercurial (>=1.0)',
              'pybonjour (>=1.1.1)'],
-    setup_requires = ['pybonjour'],
+    setup_requires=['pybonjour'],
     classifiers=[
         'License :: OSI Approved :: GNU General Public License (GPL)',
@@ -58 +59 @@
         'Environment :: Web Environment',
     ],
-    options = {
+    options={
         'py2exe': {
-                        'includes': ['sip'],
+                        'includes': ['sip'],
             'packages': ['werkzeug', 'dbhash', 'encodings',
                          'Image', 'pygments'],
-            'excludes': ['_ssl', 'tcl', 'tkinter', 'Tkconstants' 
-                         ,'Tkinter'],
+            'excludes': ['_ssl', 'tcl', 'tkinter', 'Tkconstants',
+                         'Tkinter'],
             'dll_excludes': ['tcl84.dll', 'tk84.dll'],
             "compressed": 1,
             "optimize": 2,
-                        "bundle_files": 1,
+                    "bundle_files": 1,
         },
         'py2app': {
@@ -121 +122 @@
                     if 'debug' in file:
                         print 'removing', file
-                        os.remove(os.path.join(root,file))
+                        os.remove(os.path.join(root, file))
 
             # And run macdeployqt to copy plugins and build a dmg
@@ -136 +137 @@
 elif sys.platform == 'win32':
     ### Windows installer ###
-        # Hack to make py2exe import win32com
-        # http://www.py2exe.org/index.cgi/WinShell
+        # Hack to make py2exe import win32com
+        # http://www.py2exe.org/index.cgi/WinShell
     # ModuleFinder can't handle runtime changes to __path__, but win32com uses them
     import time
@@ -238 +239 @@
                 from datetime import datetime
                 version = version[:-3] + '.' + datetime.now().strftime('%Y%m%d%H%M')
-                
+
             # create the Installer, using the files py2exe has created.
             script = InnoScript("hatta", lib_dir, dist_dir,
@@ -251 +252 @@
             # Output subdirectory.
     # class BuildInstaller
-    
-        config['zipfile'] = None
+
+        config['zipfile'] = None
     config['cmdclass'] = {"py2exe": BuildInstaller}
     config['windows'] = [{
-                'script': 'hatta_qticon.py',
+            'script': 'hatta_qticon.py',
         'icon_resources': [(1, "resources/hatta.ico")],
     }]
-    
+
     # Adding MS runtime C libraries
     if sys.version.startswith('2.6'):
@@ -287 +288 @@
                 return 0
             return origIsSystemDLL(pathname)
-        py2exe.build_exe.isSystemDLL = isSystemDLL    
+        py2exe.build_exe.isSystemDLL = isSystemDLL
 
 else: # Other UNIX-like
     config['scripts'] = ['hatta_qticon.py', 'hatta_gtkicon.py']
 
-if __name__=='__main__':
+if __name__ == '__main__':
     setup(**config)
     try: