With PyQt 4.7.5's new from_imports option, sys.path hackage is not required anymore.

This commit is contained in:
Virgil Dupras 2010-08-20 09:48:16 +02:00
parent ac4881f231
commit 5733c0143b
5 changed files with 2 additions and 15 deletions

7
README
View File

@ -45,7 +45,7 @@ Windows prerequisites
---
- Visual Studio 2008 (Express is enough) is needed to build C extensions. (http://www.microsoft.com/Express/)
- PyQt 4.7 (http://www.riverbankcomputing.co.uk/news)
- PyQt 4.7.5 (http://www.riverbankcomputing.co.uk/news)
- cx_Freeze, if you want to build a exe. You don't need it if you just want to run dupeGuru. (http://cx-freeze.sourceforge.net/)
- Advanced Installer, if you want to build the installer file. (http://www.advancedinstaller.com/)
@ -66,8 +66,3 @@ Then, just build the thing and then run it with:
If you want to create ready-to-upload package, run:
python package.py
64-bit on OS X
---
The "release" configuration of dupeGuru's XCode project build with archs "i386 x86_64 ppc". However there are currently problems with py2app and 64 bit. If you want to correctly build 64-bit apps, refer to http://www.hardcoded.net/articles/building-64-bit-pyobjc-applications-with-py2app.htm .

View File

@ -34,7 +34,6 @@ def package_windows(edition, dev):
return
add_to_pythonpath('.')
add_to_pythonpath('qt')
add_to_pythonpath(op.join('qt', 'base'))
add_to_pythonpath(op.join('qt', edition))
os.chdir(op.join('qt', edition))
from app import DupeGuru
@ -74,7 +73,6 @@ def package_windows(edition, dev):
def package_debian(edition):
add_to_pythonpath('qt')
add_to_pythonpath(op.join('qt', 'base'))
add_to_pythonpath(op.join('qt', edition))
from app import DupeGuru

View File

@ -463,7 +463,7 @@
<customwidget>
<class>ResultsView</class>
<extends>QTreeView</extends>
<header>results_model</header>
<header>.results_model</header>
</customwidget>
</customwidgets>
<resources>

View File

@ -15,11 +15,6 @@ from PyQt4.QtGui import QApplication, QIcon, QPixmap
import base.dg_rc
if sys.platform == 'linux2':
# Under Python3, we have to add 'base' to pythonpath because UI files don't use
# relative imports.
sys.path.append(os.path.dirname(base.dg_rc.__file__))
from app import DupeGuru
if sys.platform == 'win32':

1
run.py
View File

@ -32,7 +32,6 @@ def main():
elif ui == 'qt':
add_to_pythonpath('.')
add_to_pythonpath('qt')
add_to_pythonpath(op.join('qt', 'base'))
os.chdir(op.join('qt', edition))
os.system('{0} start.py'.format(sys.executable))
os.chdir('..')