diff -r e2b36c2167b7 -r 5371a22cf2aa scripts/install.py --- a/scripts/install.py Sat Sep 05 11:26:33 2020 +0200 +++ b/scripts/install.py Sat Oct 03 11:13:46 2020 +0200 @@ -791,6 +791,24 @@ cfg['ericCodeTemplatesDir'], ['*.tmpl']) + # copy some data files needed at various places + copyTree( + os.path.join(eric6SourceDir, "E5Network", "data"), + os.path.join(cfg['ericDir'], "E5Network", "data"), + ['*.dat', '*.txt']) + copyTree( + os.path.join(eric6SourceDir, "IconEditor", "cursors"), + os.path.join(cfg['ericDir'], "IconEditor", "cursors"), + ['*.xpm']) + copyTree( + os.path.join(eric6SourceDir, "UI", "data"), + os.path.join(cfg['ericDir'], "UI", "data"), + ['*.css']) + copyTree( + os.path.join(eric6SourceDir, "WebBrowser"), + os.path.join(cfg['ericDir'], "WebBrowser"), + ['*.xbel', '*.xml', '*.html', '*.png', '*.gif', '*.js']) + # copy the wrappers for wname in wnames: shutilCopy(wname, cfg['bindir'], perm=0o755) @@ -1383,7 +1401,7 @@ except ImportError as msg: installed = pipInstall( "PyQt5", - "PyQt5 could not be detected.\nError: {0}".format(msg) + "'PyQt5' could not be detected.\nError: {0}".format(msg) ) if installed: # try to import it again @@ -1416,7 +1434,7 @@ # PyQt 5.12 separated QtWebEngine into a separate wheel installed = pipInstall( "PyQtWebEngine", - "PyQtWebEngine could not be detected.\nError: {0}" + "Optional 'PyQtWebEngine' could not be detected.\nError: {0}" .format(msg) ) @@ -1425,7 +1443,7 @@ except ImportError as msg: installed = pipInstall( "PyQtChart", - "PyQtChart could not be detected.\nError: {0}" + "Optional 'PyQtChart' could not be detected.\nError: {0}" .format(msg) ) @@ -1434,7 +1452,7 @@ except ImportError as msg: installed = pipInstall( "QScintilla", - "QScintilla could not be detected.\nError: {0}".format(msg) + "'QScintilla' could not be detected.\nError: {0}".format(msg) ) if installed: # try to import it again