mirror of
				https://github.com/arsenetar/dupeguru.git
				synced 2025-09-11 17:58:17 +00:00 
			
		
		
		
	With PyQt 4.7.5's new from_imports option, sys.path hackage is not required anymore.
This commit is contained in:
		
							parent
							
								
									ac4881f231
								
							
						
					
					
						commit
						5733c0143b
					
				
							
								
								
									
										7
									
								
								README
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								README
									
									
									
									
									
								
							| @ -45,7 +45,7 @@ Windows prerequisites | |||||||
| --- | --- | ||||||
| 
 | 
 | ||||||
| - Visual Studio 2008 (Express is enough) is needed to build C extensions. (http://www.microsoft.com/Express/) | - 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/) | - 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/) | - 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: | If you want to create ready-to-upload package, run: | ||||||
| 
 | 
 | ||||||
| 	python package.py | 	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 . |  | ||||||
| @ -34,7 +34,6 @@ def package_windows(edition, dev): | |||||||
|         return |         return | ||||||
|     add_to_pythonpath('.') |     add_to_pythonpath('.') | ||||||
|     add_to_pythonpath('qt') |     add_to_pythonpath('qt') | ||||||
|     add_to_pythonpath(op.join('qt', 'base')) |  | ||||||
|     add_to_pythonpath(op.join('qt', edition)) |     add_to_pythonpath(op.join('qt', edition)) | ||||||
|     os.chdir(op.join('qt', edition)) |     os.chdir(op.join('qt', edition)) | ||||||
|     from app import DupeGuru |     from app import DupeGuru | ||||||
| @ -74,7 +73,6 @@ def package_windows(edition, dev): | |||||||
| 
 | 
 | ||||||
| def package_debian(edition): | def package_debian(edition): | ||||||
|     add_to_pythonpath('qt') |     add_to_pythonpath('qt') | ||||||
|     add_to_pythonpath(op.join('qt', 'base')) |  | ||||||
|     add_to_pythonpath(op.join('qt', edition)) |     add_to_pythonpath(op.join('qt', edition)) | ||||||
|     from app import DupeGuru |     from app import DupeGuru | ||||||
|      |      | ||||||
|  | |||||||
| @ -463,7 +463,7 @@ | |||||||
|   <customwidget> |   <customwidget> | ||||||
|    <class>ResultsView</class> |    <class>ResultsView</class> | ||||||
|    <extends>QTreeView</extends> |    <extends>QTreeView</extends> | ||||||
|    <header>results_model</header> |    <header>.results_model</header> | ||||||
|   </customwidget> |   </customwidget> | ||||||
|  </customwidgets> |  </customwidgets> | ||||||
|  <resources> |  <resources> | ||||||
|  | |||||||
| @ -15,11 +15,6 @@ from PyQt4.QtGui import QApplication, QIcon, QPixmap | |||||||
| 
 | 
 | ||||||
| import base.dg_rc | 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 | from app import DupeGuru | ||||||
| 
 | 
 | ||||||
| if sys.platform == 'win32': | if sys.platform == 'win32': | ||||||
|  | |||||||
							
								
								
									
										1
									
								
								run.py
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								run.py
									
									
									
									
									
								
							| @ -32,7 +32,6 @@ def main(): | |||||||
|     elif ui == 'qt': |     elif ui == 'qt': | ||||||
|         add_to_pythonpath('.') |         add_to_pythonpath('.') | ||||||
|         add_to_pythonpath('qt') |         add_to_pythonpath('qt') | ||||||
|         add_to_pythonpath(op.join('qt', 'base')) |  | ||||||
|         os.chdir(op.join('qt', edition)) |         os.chdir(op.join('qt', edition)) | ||||||
|         os.system('{0} start.py'.format(sys.executable)) |         os.system('{0} start.py'.format(sys.executable)) | ||||||
|         os.chdir('..') |         os.chdir('..') | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user