Mercurial Repositories > eric / file diff

--- a/install.py	Sat Dec 01 11:45:24 2018 +0100
+++ b/install.py	Thu Jan 10 14:22:59 2019 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2002 - 2018 Detlev Offenbach <detlev@die-offenbachs.de>
+# Copyright (c) 2002 - 2019 Detlev Offenbach <detlev@die-offenbachs.de>
 #
 # This is the install script for eric6.
 
@@ -548,7 +548,12 @@
                  if fnmatch.fnmatch(f, "*.pyc")]:
         os.remove(os.path.join(dirName, name))
     
-    # step 3: descent into subdirectories and delete them if empty
+    # step 3: delete *.orig files
+    for name in [f for f in os.listdir(dirName)
+                 if fnmatch.fnmatch(f, "*.orig")]:
+        os.remove(os.path.join(dirName, name))
+    
+    # step 4: descent into subdirectories and delete them if empty
     for name in os.listdir(dirName):
         name = os.path.join(dirName, name)
         if os.path.isdir(name):
@@ -1463,6 +1468,15 @@
         exit(1)
     print("Found {0}".format(pyuic))
     
+    if pyqtVariant != "PyQt4":
+        try:
+            from PyQt5 import QtWebEngineWidgets    # __IGNORE_WARNING__
+        except ImportError as msg:
+            installed = pipInstall(
+                "PyQtWebEngine",
+                "PyQtWebEngine could not be detected.\nError: {0}".format(msg)
+            )
+    
     try:
         if pyqtVariant == "PyQt4":
             from PyQt4 import Qsci      # __IGNORE_WARNING__
@@ -1924,6 +1938,18 @@
     
     infoName = ""
     installFromSource = not os.path.isdir(sourceDir)
+    
+    # check dependencies
+    if depChecks:
+        doDependancyChecks()
+    
+    # cleanup source if installing from source
+    if installFromSource:
+        print("Cleaning up source ...")
+        sourceDir = os.path.dirname(__file__) or "."
+        cleanupSource(sourceDir)
+        print()
+    
     if installFromSource:
         sourceDir = os.path.dirname(__file__) or "."
         configName = os.path.join(sourceDir, "eric6config.py")
@@ -1935,9 +1961,6 @@
     if len(cfg) == 0:
         createInstallConfig()
     
-    if depChecks:
-        doDependancyChecks()
-    
     # get rid of development config file, if it exists
     try:
         if installFromSource:
@@ -1949,12 +1972,6 @@
     except EnvironmentError:
         pass
     
-    # cleanup source if installing from source
-    if installFromSource:
-        print("Cleaning up source ...")
-        cleanupSource(sourceDir)
-        print()
-    
     # cleanup old installation
     print("Cleaning up old installation ...")
     try: