498 elif sys.platform.startswith(("win", "cygwin")): |
498 elif sys.platform.startswith(("win", "cygwin")): |
499 cleanUpWindowsLinks() |
499 cleanUpWindowsLinks() |
500 |
500 |
501 # Remove the wrapper scripts |
501 # Remove the wrapper scripts |
502 rem_wnames = [ |
502 rem_wnames = [ |
503 "eric7_api", "eric7_compare", |
503 "eric7_api", "eric7_browser", "eric7_compare", "eric7_configure", |
504 "eric7_configure", "eric7_diff", |
504 "eric7_diff", "eric7_doc", "eric7_editor", "eric7_hexeditor", |
505 "eric7_doc", "eric7_qregularexpression", |
505 "eric7_iconeditor", "eric7_plugininstall", "eric7_pluginrepository", |
506 "eric7_qregexp", "eric7_re", |
506 "eric7_pluginuninstall", "eric7_qregularexpression", "eric7_re", |
507 "eric7_trpreviewer", "eric7_uipreviewer", |
507 "eric7_shell", "eric7_snap", "eric7_sqlbrowser", "eric7_tray", |
508 "eric7_unittest", "eric7", |
508 "eric7_trpreviewer", "eric7_uipreviewer", "eric7_unittest", "eric7" |
509 "eric7_tray", "eric7_editor", |
|
510 "eric7_plugininstall", "eric7_pluginuninstall", |
|
511 "eric7_pluginrepository", "eric7_sqlbrowser", |
|
512 "eric7_iconeditor", "eric7_snap", "eric7_hexeditor", |
|
513 "eric7_browser", "eric7_shell", |
|
514 ] |
509 ] |
515 |
510 |
516 try: |
511 try: |
517 dirs = [platBinDir, getConfig('bindir')] |
512 dirs = [platBinDir, getConfig('bindir')] |
518 if platBinDirOld: |
513 if platBinDirOld: |
701 if not os.path.isdir(scriptsDir): |
696 if not os.path.isdir(scriptsDir): |
702 os.mkdir(scriptsDir) |
697 os.mkdir(scriptsDir) |
703 wnames = [] |
698 wnames = [] |
704 for name in ["eric7_api", "eric7_doc"]: |
699 for name in ["eric7_api", "eric7_doc"]: |
705 wnames.append(createPyWrapper(cfg['ericDir'], name, scriptsDir, False)) |
700 wnames.append(createPyWrapper(cfg['ericDir'], name, scriptsDir, False)) |
706 # TODO: add "eric7_browser" once PyQt 6.2.0/Qt 6.2.0 is released |
701 for name in ["eric7_browser", "eric7_compare", "eric7_configure", |
707 for name in ["eric7_compare", "eric7_configure", "eric7_diff", |
702 "eric7_diff", "eric7_editor", "eric7_hexeditor", |
708 "eric7_editor", "eric7_hexeditor", "eric7_iconeditor", |
703 "eric7_iconeditor", "eric7_plugininstall", |
709 "eric7_plugininstall", "eric7_pluginrepository", |
704 "eric7_pluginrepository", "eric7_pluginuninstall", |
710 "eric7_pluginuninstall", "eric7_qregularexpression", |
705 "eric7_qregularexpression", "eric7_re", "eric7_snap", |
711 "eric7_re", "eric7_snap", "eric7_sqlbrowser", "eric7_tray", |
706 "eric7_sqlbrowser", "eric7_tray", "eric7_trpreviewer", |
712 "eric7_trpreviewer", "eric7_uipreviewer", "eric7_unittest", |
707 "eric7_uipreviewer", "eric7_unittest", "eric7_shell", |
713 "eric7_shell", "eric7"]: |
708 "eric7"]: |
714 wnames.append(createPyWrapper(cfg['ericDir'], name, scriptsDir)) |
709 wnames.append(createPyWrapper(cfg['ericDir'], name, scriptsDir)) |
715 |
710 |
716 # set install prefix, if not None |
711 # set install prefix, if not None |
717 if distDir: |
712 if distDir: |
718 for key in list(cfg.keys()): |
713 for key in list(cfg.keys()): |
791 ['*.xpm']) |
786 ['*.xpm']) |
792 copyTree( |
787 copyTree( |
793 os.path.join(eric7SourceDir, "UI", "data"), |
788 os.path.join(eric7SourceDir, "UI", "data"), |
794 os.path.join(cfg['ericDir'], "UI", "data"), |
789 os.path.join(cfg['ericDir'], "UI", "data"), |
795 ['*.css']) |
790 ['*.css']) |
796 # TODO: enable this once PyQt 6.2.0/Qt 6.2.0 is released |
791 copyTree( |
797 if False: |
792 os.path.join(eric7SourceDir, "WebBrowser"), |
798 copyTree( |
793 os.path.join(cfg['ericDir'], "WebBrowser"), |
799 os.path.join(eric7SourceDir, "WebBrowser"), |
794 ['*.xbel', '*.xml', '*.html', '*.png', '*.gif', '*.js']) |
800 os.path.join(cfg['ericDir'], "WebBrowser"), |
|
801 ['*.xbel', '*.xml', '*.html', '*.png', '*.gif', '*.js']) |
|
802 |
795 |
803 # copy the wrappers |
796 # copy the wrappers |
804 for wname in wnames: |
797 for wname in wnames: |
805 shutilCopy(wname, cfg['bindir'], perm=0o755) |
798 shutilCopy(wname, cfg['bindir'], perm=0o755) |
806 os.remove(wname) |
799 os.remove(wname) |
1498 print("Sorry, {0} is not installed.".format(pyuic)) |
1491 print("Sorry, {0} is not installed.".format(pyuic)) |
1499 print('Error: {0}'.format(msg)) |
1492 print('Error: {0}'.format(msg)) |
1500 exit(1) |
1493 exit(1) |
1501 print("Found {0}".format(pyuic)) |
1494 print("Found {0}".format(pyuic)) |
1502 |
1495 |
1503 # TODO: enable this once PyQt 6.2.0/Qt 6.2.0 is released |
1496 try: |
1504 if False: |
1497 from PyQt6 import QtWebEngineWidgets # __IGNORE_WARNING__ |
1505 try: |
1498 except ImportError as msg: |
1506 from PyQt6 import QtWebEngineWidgets # __IGNORE_WARNING__ |
1499 # TODO: enable this once PyQt 6.2.0/Qt 6.2.0 is released |
1507 except ImportError as msg: |
1500 if False: |
1508 if isSudo: |
1501 if isSudo: |
1509 print("Optional 'PyQt6-WebEngine' could not be detected.") |
1502 print("Optional 'PyQt6-WebEngine' could not be detected.") |
1510 else: |
1503 else: |
1511 pipInstall( |
1504 pipInstall( |
1512 "PyQt6-WebEngine>={0}".format( |
1505 "PyQt6-WebEngine>={0}".format( |