Commits

Ronald Oussoren  committed c9233a3 Merge

Merge 0.7 branch. Amongst others fixes #97

  • Participants
  • Parent commits 5bf1630, 882705a

Comments (0)

Files changed (3)

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

File py2app/recipes/sip.py

                     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)
 

File py2app_tests/app_with_sharedlib/setup.py

     ),
     ext_modules=[
         Extension("double", [ "mod.c" ],
-            extra_compile_args=["-Isrc", '-DNAME=double', '-DFUNC_NAME=doubled', ('-DINITFUNC=initdouble' if sys.maxsize == 2 else '-DINITFUNC=PyInit_double')],
+            extra_compile_args=["-Isrc", '-DNAME=double', '-DFUNC_NAME=doubled', ('-DINITFUNC=initdouble' if sys.version_info[0] == 2 else '-DINITFUNC=PyInit_double')],
             extra_link_args=["-Llib", "-lshared"]),
         Extension("square", [ "mod.c" ],
-            extra_compile_args=["-Isrc", '-DNAME=square', '-DFUNC_NAME=squared', ('-DINITFUNC=initsquare' if sys.maxsize == 2 else '-DINITFUNC=PyInit_square')],
+            extra_compile_args=["-Isrc", '-DNAME=square', '-DFUNC_NAME=squared', ('-DINITFUNC=initsquare' if sys.version_info[0] == 2 else '-DINITFUNC=PyInit_square')],
             extra_link_args=["-Llib", "-lshared.1"]),
         Extension("half", [ "mod.c" ],
-            extra_compile_args=["-Isrc", '-DNAME=half', '-DFUNC_NAME=half', ('-DINITFUNC=inithalf' if sys.maxsize == 2 else '-DINITFUNC=PyInit_half')],
+            extra_compile_args=["-Isrc", '-DNAME=half', '-DFUNC_NAME=half', ('-DINITFUNC=inithalf' if sys.version_info[0] == 2 else '-DINITFUNC=PyInit_half')],
             extra_link_args=["-Llib", "-lhalf"]),
     ],
     options=dict(