509 else: |
509 else: |
510 marker = "" |
510 marker = "" |
511 for name in ["/usr/share/applications/eric6" + marker + ".desktop", |
511 for name in ["/usr/share/applications/eric6" + marker + ".desktop", |
512 "/usr/share/appdata/eric6" + marker + ".appdata.xml", |
512 "/usr/share/appdata/eric6" + marker + ".appdata.xml", |
513 "/usr/share/applications/eric6_webbrowser" + marker + |
513 "/usr/share/applications/eric6_webbrowser" + marker + |
514 ".desktop"]: |
514 ".desktop", |
|
515 "/usr/share/applications/eric6_browser" + marker + |
|
516 ".desktop", |
|
517 ]: |
515 if os.path.exists(name): |
518 if os.path.exists(name): |
516 os.remove(name) |
519 os.remove(name) |
517 |
520 |
518 # Remove the wrapper scripts |
521 # Remove the wrapper scripts |
519 rem_wnames = [ |
522 rem_wnames = [ |
525 "eric6_unittest", "eric6", |
528 "eric6_unittest", "eric6", |
526 "eric6_tray", "eric6_editor", |
529 "eric6_tray", "eric6_editor", |
527 "eric6_plugininstall", "eric6_pluginuninstall", |
530 "eric6_plugininstall", "eric6_pluginuninstall", |
528 "eric6_pluginrepository", "eric6_sqlbrowser", |
531 "eric6_pluginrepository", "eric6_sqlbrowser", |
529 "eric6_webbrowser", "eric6_iconeditor", |
532 "eric6_webbrowser", "eric6_iconeditor", |
530 "eric6_snap", "eric6_hexeditor", |
533 "eric6_snap", "eric6_hexeditor", "eric6_browser", |
531 ] |
534 ] |
532 if includePythonVariant: |
535 if includePythonVariant: |
533 marker = PythonMarkers[sys.version_info.major] |
536 marker = PythonMarkers[sys.version_info.major] |
534 rem_wnames = [n + marker for n in rem_wnames] |
537 rem_wnames = [n + marker for n in rem_wnames] |
535 |
538 |
635 "eric6_plugininstall", "eric6_pluginrepository", |
638 "eric6_plugininstall", "eric6_pluginrepository", |
636 "eric6_pluginuninstall", "eric6_qregexp", |
639 "eric6_pluginuninstall", "eric6_qregexp", |
637 "eric6_qregularexpression", "eric6_re", "eric6_snap", |
640 "eric6_qregularexpression", "eric6_re", "eric6_snap", |
638 "eric6_sqlbrowser", "eric6_tray", "eric6_trpreviewer", |
641 "eric6_sqlbrowser", "eric6_tray", "eric6_trpreviewer", |
639 "eric6_uipreviewer", "eric6_unittest", "eric6_webbrowser", |
642 "eric6_uipreviewer", "eric6_unittest", "eric6_webbrowser", |
640 "eric6"]: |
643 "eric6_browser", "eric6"]: |
641 wnames.append(createPyWrapper(cfg['ericDir'], name)) |
644 wnames.append(createPyWrapper(cfg['ericDir'], name)) |
642 |
645 |
643 # set install prefix, if not None |
646 # set install prefix, if not None |
644 if distDir: |
647 if distDir: |
645 for key in list(cfg.keys()): |
648 for key in list(cfg.keys()): |
812 marker) |
815 marker) |
813 copyDesktopFile( |
816 copyDesktopFile( |
814 os.path.join(sourceDir, "eric6_webbrowser.desktop"), |
817 os.path.join(sourceDir, "eric6_webbrowser.desktop"), |
815 os.path.join(dst, "eric6_webbrowser" + marker + ".desktop"), |
818 os.path.join(dst, "eric6_webbrowser" + marker + ".desktop"), |
816 marker) |
819 marker) |
|
820 copyDesktopFile( |
|
821 os.path.join(sourceDir, "eric6_browser.desktop"), |
|
822 os.path.join(dst, "eric6_browser" + marker + ".desktop"), |
|
823 marker) |
817 dst = os.path.normpath( |
824 dst = os.path.normpath( |
818 os.path.join(distDir, "usr/share/appdata")) |
825 os.path.join(distDir, "usr/share/appdata")) |
819 if not os.path.exists(dst): |
826 if not os.path.exists(dst): |
820 os.makedirs(dst) |
827 os.makedirs(dst) |
821 copyDesktopFile( |
828 copyDesktopFile( |
839 sourceDir, "icons", "default", "ericWeb48.png"), |
846 sourceDir, "icons", "default", "ericWeb48.png"), |
840 "/usr/share/pixmaps/ericWeb" + marker + ".png") |
847 "/usr/share/pixmaps/ericWeb" + marker + ".png") |
841 copyDesktopFile( |
848 copyDesktopFile( |
842 os.path.join(sourceDir, "eric6_webbrowser.desktop"), |
849 os.path.join(sourceDir, "eric6_webbrowser.desktop"), |
843 "/usr/share/applications/eric6_webbrowser" + marker + |
850 "/usr/share/applications/eric6_webbrowser" + marker + |
|
851 ".desktop", |
|
852 marker) |
|
853 copyDesktopFile( |
|
854 os.path.join(sourceDir, "eric6_browser.desktop"), |
|
855 "/usr/share/applications/eric6_browser" + marker + |
844 ".desktop", |
856 ".desktop", |
845 marker) |
857 marker) |
846 |
858 |
847 # Create a Mac application bundle |
859 # Create a Mac application bundle |
848 if sys.platform == "darwin": |
860 if sys.platform == "darwin": |