Changeset 4238 for install/g2complete/src/bootstrap.py

Timestamp:

Jan 8, 2020 7:30:23 PM (3 years ago)

Author:

toby

Message:

more install fixes: add error message

File:

• install/g2complete/src/bootstrap.py (modified) (11 diffs)

install/g2complete/src/bootstrap.py

@@ -12 +12 @@
 skipDownloadSteps = False
 skipProxy = False
+showWXerror = False
 help = False
 allBinaries = False
@@ -17 +18 @@
     if 'noinstall' in a.lower():
         skipInstallSteps = True
+        showWXerror = True
     elif 'nonet' in a.lower():
         skipDownloadSteps = True
@@ -51 +53 @@
 ################################################################################
 ################################################################################
+def BailOut(msg):
+    '''Exit with an error message. Use a GUI to show the error when
+    showWXerror == True (when --noinstall is specified)
+    '''
+    print(msg)
+    if showWXerror:
+        import wx
+        app = wx.App()
+        app.MainLoop()
+        dlg = wx.MessageDialog(None,msg,'GSAS-II installation error', 
+                wx.OK | wx.ICON_ERROR | wx.STAY_ON_TOP)
+        dlg.Raise()
+        dlg.ShowModal()
+        dlg.Destroy()
+    sys.exit()
+        
 def GetConfigValue(*args): return True
 # routines copied from GSASIIpath.py
@@ -218 +236 @@
 \t"""
     for pkg in missing: msg += " "+pkg
-    print(msg)
-    print("\nPlease install these package(s) and try running this again.")
-    print("Showing first error: ")
-    for pkg in ['numpy','scipy','matplotlib','wx','OpenGL',]:
-        exec('import '+pkg)
-    sys.exit()
+    msg += "\nPlease install these package(s) and try running bootstrap.py again."
+    #print("Showing first error: ")
+    #for pkg in ['numpy','scipy','matplotlib','wx','OpenGL',]:
+    #    exec('import '+pkg)
+    BailOut(msg)
 
 if not skipDownloadSteps:
@@ -231 +248 @@
     svn = whichsvn() # resets host & port if proxyinfo.txt is found
     if not svn:
-        print("Sorry, subversion (svn) could not be found on your system.")
-        print("Please install this or place in path and rerun this.")
-        #raise Exception('Subversion (svn) not found')
-        sys.exit()
-    print(' found svn image: '+svn)
+        msg ="Sorry, subversion (svn) could not be found on your system."
+        msg += "\nPlease install this or place in path and rerun this."
+        BailOut(msg)
+    else:
+        print(' found svn image: '+svn)
 
 #if install_with_easyinstall:            
@@ -354 +371 @@
             cmd = [svn, 'cleanup', path2GSAS2]
             s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
-            out,err = s.communicate()    
+            out,err = MakeByte2str(s.communicate())
             if err:
                 print('subversion returned an error:')
@@ -366 +383 @@
         s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
         print('\nsubversion output:')
-        out,err = s.communicate()
+        out,err = MakeByte2str(s.communicate())
         if err:
             print('subversion returned an error:')
@@ -381 +398 @@
         print(msg)
         s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
-        out,err = s.communicate()
+        out,err = MakeByte2str(s.communicate())
         if err:
-            print('subversion returned an error:')
-            print(err)
-            print('  *** GSAS-II failed to be installed. A likely reason is a network access')
-            print('  *** problem, most commonly because you need to use a network proxy. Please')
-            print('  *** check with a network administrator or use http://www.whatismyproxy.com/\n')
-            sys.exit()
+            msg = 'subversion returned an error:\n'
+            msg += err
+            if os.path.exists(os.path.join(path2GSAS2,"makeBat.py")):
+                msg += '\n\nGSAS-II failed to be updated. A likely reason is a network access'
+                msg += '\nproblem. If your web browser works, but the update did not'
+                msg += '\nthe most common reason is you need to use a network proxy. Please'
+                msg += '\ncheck with a network administrator or use http://www.whatismyproxy.com/'
+            else:                
+                msg += '\n\n  *** GSAS-II failed to be installed. A likely reason is a network access'
+                msg += '\n  *** problem, most commonly because you need to use a network proxy. Please'
+                msg += '  *** check with a network administrator or use http://www.whatismyproxy.com/\n'
+            BailOut(msg)
     print('\n'+75*'*')
 
@@ -395 +418 @@
     print('import of GSASIIpath completed')
 except Exception as err:
-    print('\n'+75*'=')
-    print('Failed with import of GSASIIpath. This is unexpected.')
-    print('GSAS-II will not run without correcting this. Contact toby@anl.gov')
-    print(err)
-    print(75*'=')
-    sys.exit()
+    msg = 'Failed with import of GSASIIpath. This is unexpected.'
+    msg += '\nGSAS-II will not run without correcting this. Contact toby@anl.gov'
+    BailOut(msg)
 
 if allBinaries and not skipDownloadSteps:
     print('Loading all binaries with command...')
     if not GSASIIpath.svnSwitchDir('AllBinaries','',g2home+ 'Binaries/',None,True):
-        print('Binary load failed')
-        sys.exit()
+        msg = 'Binary load failed'
+        BailOut(msg)
 else:
     GSASIIpath.DownloadG2Binaries(g2home)
@@ -430 +450 @@
 p = subprocess.Popen([sys.executable,'-c',script],stdout=subprocess.PIPE,stderr=subprocess.PIPE,
                      cwd=path2GSAS2)
-res,err = p.communicate()
+res,err = MakeByte2str(p.communicate())
 if '==OK==' not in str(res) or p.returncode != 0:
-    print('\n'+75*'=')
-    print('Failed when testing the GSAS-II compiled files. GSAS-II will not run')
-    print('without correcting this.\n\nError message:')
+    #print('\n'+75*'=')
+    msg = 'Failed when testing the GSAS-II compiled files. GSAS-II will not run'
+    msg += ' without correcting this.\n\nError message:\n'
     if res: 
-        print(res.decode())
+        msg += res.decode()
+        msg += '\n'
     if err:
-        print(err.decode())
+        msg += err.decode()
     #print('\nAttempting to open a web page on compiling GSAS-II...')
-    print('Please see web page\nhttps://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII')
+    msg += '\n\nPlease see web page\nhttps://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII'
+    BailOut(msg)
     #import webbrowser
     #webbrowser.open_new('https://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII')
-    print(75*'=')
+    #print(75*'=')
 #    if '86' in platform.machine() and (sys.platform.startswith('linux')
 #                                        or sys.platform == "darwin"
@@ -450 +472 @@
 #    else:
 #        print('Platform '+sys.platform+' with processor type '+platform.machine()+' not is supported')
-    sys.exit()
 else:
     print('Successfully tested compiled routines')