Changeset 2535 for install

Timestamp:

Nov 18, 2016 4:54:14 PM (7 years ago)

Author:

toby

Message:

remove g2conda-specific stuff from stand-alone bootstrap

File:

• install/bootstrap.py (modified) (4 diffs)

install/bootstrap.py

@@ -1 +1 @@
 #!/usr/bin/env python
-# Installs GSAS-II from network using subversion and creates platform-specific
-# shortcuts.
-# works for Mac & Linux; Windows being tested. 
+# Installs GSAS-II from network using subversion and creates platform-specific shortcuts.
+# works for Mac & Linux & Windows
 import os, stat, sys, platform, subprocess
 home = 'https://subversion.xray.aps.anl.gov/pyGSAS/'
@@ -34 +33 @@
 \t""",
     for pkg in missing: print " ",pkg,
-    print 
-    print "This should not happen as this script should be called with a "
-    print "specially configured version of the free Anaconda python package."
-    print "Please contact Brian Toby (toby@anl.gov)"
+    print "\nPlease install these package(s) and try running this again."
+    print "Showing first error: "
     for pkg in ['numpy','scipy','matplotlib','wx',]:
         exec('import '+pkg)
@@ -43 +40 @@
 try:
     import OpenGL
+    install_with_easyinstall = None 
 except:
-    print "Missing the OpenGL Python package." 
-    print "This should not happen as this script should be called with a "
-    print "specially configured version of the free Anaconda python package,"
-    print "but GSAS-II can install this package anyway." 
-    print "Please contact Brian Toby (toby@anl.gov) to report this problem."
-
+    try:                 
+            from setuptools.command import easy_install                  
+    except ImportError:
+        print 'You are missing the OpenGL Python package. This can be '
+        print 'installed by this script if the setuptools package is installed'
+        print 'Please install either OpenGL (pyopengl) or setuptools'
+        print "package and try running this again."
+        sys.exit()
+    print "Missing the OpenGL Python package. Will attempt to install this later."
+    def install_with_easyinstall(package):               
+        try:             
+            print "trying system-wide ",                 
+            easy_install.main(['-f',os.path.split(__file__)[0],package])                 
+            return               
+        except:                  
+            pass                 
+        try:             
+            print "trying user level ",                  
+            easy_install.main(['-f',os.path.split(__file__)[0],'--user',package])                
+            return               
+        except:                  
+            print "\nInstall of "+package+" failed. Error traceback follows:"            
+            import traceback             
+            print traceback.format_exc()                 
+            sys.exit() 
 # path to where this script is located
 gsaspath = os.path.split(sys.argv[0])[0]
@@ -85 +102 @@
         pass
 else:
-    raise Exception('Subversion (svn) not found')
+    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
 
+if install_with_easyinstall:             
+    print '\nInstalling PyOpenGL. Lots of warnings will follow... ',             
+    install_with_easyinstall('PyOpenGl')                 
+    print 'done.'
+    
 print 'Ready to bootstrap GSAS-II from repository\n\t',home,'\nto '+gsaspath
 proxycmds = []