Commits

Ronald Oussoren  committed d91ac93

Fix wrong resource calculation in the sip and pyside recipes

Fixes #97

  • Participants
  • Parent commits 277ab0e
  • Branches branch-0.7

Comments (0)

Files changed (2)

File py2app/recipes/pyside.py

             for path in glob.glob(os.path.join(plugin_dir, item)):
                 resources.append((os.path.dirname('qt_plugins' + path[len(plugin_dir):]), [path]))
             else:
-                resources.append((os.path.dirname(os.path.join('qt_plugins', item)), os.path.join(plugin_dir, item)))
+                resources.append((os.path.dirname(os.path.join('qt_plugins', item)), [os.path.join(plugin_dir, item)]))
 
     # PySide dumps some of its shared files
     # into /usr/lib, which is a system location
         elif fn.startswith('libshiboken-python'):
             add=True
         if add:
-            NOT_SYSTEM_FILES.append(os.path.join('/usr/lib', fn)) 
+            NOT_SYSTEM_FILES.append(os.path.join('/usr/lib', fn))
 
     return dict(resources=resources)

File py2app/recipes/sip.py

 using sip because we have no way to fine-tune this.
 
 The problem with SIP is that all inter-module depedencies (for example from
-PyQt4.Qt to PyQt4.QtCore) are handled in C code and therefore cannot be 
+PyQt4.Qt to PyQt4.QtCore) are handled in C code and therefore cannot be
 detected by the python code in py2app).
 """
 
                     # subpackage to ensure everything get seen.
                     for sub in os.listdir(fullpath):
                         if ".py" not in sub:
-                            self.packages.add('%s.%s'%(fn, sub.replace(".so","")))                            
+                            self.packages.add('%s.%s'%(fn, sub.replace(".so","")))
 
         # Causes a python3-related syntax error (metaclass keyword),
         # and you probably don't need it:
                     for path in glob.glob(os.path.join(self.plugin_dir, item)):
                         resources.append((os.path.dirname('qt_plugins' + path[len(self.plugin_dir):]), [path]))
                 else:
-                    resources.append((os.path.dirname(os.path.join('qt_plugins', item)), os.path.join(self.plugin_dir, item)))
+                    resources.append((os.path.dirname(os.path.join('qt_plugins', item)), [os.path.join(self.plugin_dir, item)]))
 
             return dict(resources=resources)