diff options
| author | Robin Dunn <rdunn@enthought.com> | 2013-04-29 15:06:19 -0700 |
|---|---|---|
| committer | Robin Dunn <rdunn@enthought.com> | 2013-04-29 15:06:19 -0700 |
| commit | 93253fa987cb6395aba8b45fde3849f89944af6b (patch) | |
| tree | 7e79f6a864f01c1c4625ef10da441aac9c8298be | |
| parent | 8a1db87a2319c626601904c9d10d65e470beb1fb (diff) | |
Fix some setup_dir --> dist_dir that were missed in the rebase.
| -rw-r--r-- | setup.py | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -721,7 +721,7 @@ class pyside_build(_build): if self.debug or self.build_type == 'RelWithDebInfo': copyfile( "{build_dir}/shiboken/shibokenmodule/shiboken{dbgPostfix}.pdb", - "{setup_dir}/PySide/shiboken{dbgPostfix}.pdb", + "{dist_dir}/PySide/shiboken{dbgPostfix}.pdb", logger=log, vars=vars) # <install>/lib/site-packages/pysideuic/* -> <setup>/pysideuic copydir( @@ -789,25 +789,25 @@ class pyside_build(_build): if self.debug or self.build_type == 'RelWithDebInfo': # <qt>/lib/*.pdb -> <setup>/PySide - copydir("{qt_lib_dir}", "{setup_dir}/PySide", + copydir("{qt_lib_dir}", "{dist_dir}/PySide", filter=["*.pdb"], recursive=False, logger=log, vars=vars) # I think these are the qt-mobility DLLs, at least some are, # so let's copy them too # <qt>/lib/*.dll -> <setup>/PySide - copydir("{qt_lib_dir}", "{setup_dir}/PySide", + copydir("{qt_lib_dir}", "{dist_dir}/PySide", filter=["*.dll"], ignore=["*d?.dll"], recursive=False, logger=log, vars=vars) if self.debug: # <qt>/lib/*d4.dll -> <setup>/PySide - copydir("{qt_lib_dir}", "{setup_dir}/PySide", + copydir("{qt_lib_dir}", "{dist_dir}/PySide", filter=["*d?.dll"], recursive=False, logger=log, vars=vars) if self.debug or self.build_type == 'RelWithDebInfo': # <qt>/lib/*pdb -> <setup>/PySide - copydir("{qt_lib_dir}", "{setup_dir}/PySide", + copydir("{qt_lib_dir}", "{dist_dir}/PySide", filter=pdbs, recursive=False, logger=log, vars=vars) |