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