Mercurial Repositories > eric / file comparison
comparison: Project/ProjectResourcesBrowser.py
Project/ProjectResourcesBrowser.py
- changeset 788
- 5b1b59777460
- parent 564
- b3d966393ba9
- child 791
- 9ec2ac20e54e
equal
deleted
inserted
replaced
| 786:06290d4db8ab | 788:5b1b59777460 |
|---|---|
| 547 """ | 547 """ |
| 548 self.compileProc = QProcess() | 548 self.compileProc = QProcess() |
| 549 args = [] | 549 args = [] |
| 550 self.buf = "" | 550 self.buf = "" |
| 551 | 551 |
| 552 if self.project.pdata["PROGLANGUAGE"][0] in ["Python", "Python3"]: | 552 if self.project.pdata["PROGLANGUAGE"][0] in ["Python", "Python2", "Python3"]: |
| 553 if self.project.getProjectType() in ["Qt4", "E4Plugin"]: | 553 if self.project.getProjectType() in ["Qt4", "E4Plugin"]: |
| 554 self.rccCompiler = 'pyrcc4' | 554 self.rccCompiler = 'pyrcc4' |
| 555 if PYQT_VERSION >= 0x040500: | 555 if PYQT_VERSION >= 0x040500: |
| 556 if self.project.pdata["PROGLANGUAGE"][0] == "Python": | 556 if self.project.pdata["PROGLANGUAGE"][0] in ["Python", "Python2"]: |
| 557 args.append("-py2") | 557 args.append("-py2") |
| 558 else: | 558 else: |
| 559 args.append("-py3") | 559 args.append("-py3") |
| 560 elif self.project.getProjectType() == "PySide": | 560 elif self.project.getProjectType() == "PySide": |
| 561 self.rccCompiler = 'pyside-rcc4' | 561 self.rccCompiler = 'pyside-rcc4' |
| 562 if self.project.pdata["PROGLANGUAGE"][0] == "Python": | 562 if self.project.pdata["PROGLANGUAGE"][0] in ["Python", "Python2"]: |
| 563 args.append("-py2") | 563 args.append("-py2") |
| 564 else: | 564 else: |
| 565 args.append("-py3") | 565 args.append("-py3") |
| 566 else: | 566 else: |
| 567 return None | 567 return None |
| 579 | 579 |
| 580 ofn, ext = os.path.splitext(fn) | 580 ofn, ext = os.path.splitext(fn) |
| 581 fn = os.path.join(self.project.ppath, fn) | 581 fn = os.path.join(self.project.ppath, fn) |
| 582 | 582 |
| 583 dirname, filename = os.path.split(ofn) | 583 dirname, filename = os.path.split(ofn) |
| 584 if self.project.pdata["PROGLANGUAGE"][0] in ["Python", "Python3"]: | 584 if self.project.pdata["PROGLANGUAGE"][0] in ["Python", "Python2", "Python3"]: |
| 585 self.compiledFile = os.path.join(dirname, | 585 self.compiledFile = os.path.join(dirname, |
| 586 self.RCFilenameFormatPython.format(filename)) | 586 self.RCFilenameFormatPython.format(filename)) |
| 587 elif self.project.pdata["PROGLANGUAGE"][0] == "Ruby": | 587 elif self.project.pdata["PROGLANGUAGE"][0] == "Ruby": |
| 588 self.compiledFile = os.path.join( | 588 self.compiledFile = os.path.join( |
| 589 dirname, self.RCFilenameFormatRuby.format(filename)) | 589 dirname, self.RCFilenameFormatRuby.format(filename)) |
| 741 progress.setMaximum(len(self.project.pdata["RESOURCES"])) | 741 progress.setMaximum(len(self.project.pdata["RESOURCES"])) |
| 742 for fn in self.project.pdata["RESOURCES"]: | 742 for fn in self.project.pdata["RESOURCES"]: |
| 743 progress.setValue(i) | 743 progress.setValue(i) |
| 744 QApplication.processEvents() | 744 QApplication.processEvents() |
| 745 ifn = os.path.join(self.project.ppath, fn) | 745 ifn = os.path.join(self.project.ppath, fn) |
| 746 if self.project.pdata["PROGLANGUAGE"][0] in ["Python", "Python3"]: | 746 if self.project.pdata["PROGLANGUAGE"][0] in \ |
| 747 ["Python", "Python2", "Python3"]: | |
| 747 dirname, filename = os.path.split(os.path.splitext(ifn)[0]) | 748 dirname, filename = os.path.split(os.path.splitext(ifn)[0]) |
| 748 ofn = os.path.join(dirname, | 749 ofn = os.path.join(dirname, |
| 749 self.RCFilenameFormatPython.format(filename)) | 750 self.RCFilenameFormatPython.format(filename)) |
| 750 elif self.project.pdata["PROGLANGUAGE"][0] == "Ruby": | 751 elif self.project.pdata["PROGLANGUAGE"][0] == "Ruby": |
| 751 dirname, filename = os.path.split(os.path.splitext(ifn)[0]) | 752 dirname, filename = os.path.split(os.path.splitext(ifn)[0]) |
