Changeset 1867

Timestamp:

May 26, 2015 5:24:40 PM (7 years ago)

Author:

toby

Message:

new universal installer based on bootstrap.py

Location:

install

Files:

• GSASIIproxy.zip (added)
• bootstrap.bat (added)
• bootstrap.py (modified) (6 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. 
 import os, stat, sys, platform, subprocess
 home = 'https://subversion.xray.aps.anl.gov/pyGSAS/'
@@ -10 +13 @@
     except:
         missing.append(pkg)
+# handle pyopenGl differently, because that we can install later
+try:
+    import OpenGL as ogl
+    install_with_easyinstall = None
+except ImportError:
+    print '\nPyOpenGL not present. ',
+    try:
+        from setuptools.command import easy_install
+    except ImportError:
+        missing.append('setuptools')
+    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. Please report this information:"
+            import traceback
+            print traceback.format_exc()
+            sys.exit()
 
 if missing:
@@ -17 +46 @@
     for pkg in missing: print " ",pkg,
     print 
-    if sys.platform.startswith('darwin'):
-        print "We suggest installing the EPD Free Python package (epd_free-7.3-2-macosx-i386.dmg)\nat https://www.enthought.com/repo/free/\nor the 64-bit Canopy Express package at http://www.enthought.com/downloads"
-    else:
-        print "We suggest installing the Canopy Express package at http://www.enthought.com/downloads"
+    print "We suggest installing the free Canopy Express package at http://www.enthought.com/downloads"
+    print "or the free Anaconda python package at https://store.continuum.io/cshop/anaconda/"
     sys.exit()
 
+# path to where this script is located
 gsaspath = os.path.split(sys.argv[0])[0]
+if not gsaspath: gsaspath = os.path.curdir
 gsaspath = os.path.abspath(os.path.expanduser(gsaspath))
 
-print 'Checking for subversion...',
-# add the standard location for wandisco svn to the path
-for path in os.environ['PATH'].split(':')+['/opt/subversion/bin',]:
+print '\nChecking for subversion...',
+if sys.platform.startswith('win'):
+    pathlist = os.environ['PATH'].split(';')
+    if os.path.exists(os.path.join(gsaspath,'svn')):
+        pathlist.append(os.path.join(gsaspath,'svn','bin'))
+else:
+    pathlist = os.environ['PATH'].split(':')
+    # add the standard location for wandisco svn to the path
+    pathlist.append('/opt/subversion/bin')
+for path in pathlist:
     svn = os.path.join(path,'svn')
     try:
@@ -40 +76 @@
     raise Exception('Subversion (svn) not found')
 print ' found svn in',svn
-print 'OK'
 
-print 'GSAS-II is being bootstrapped from repository\n\t',home,'\nto '+gsaspath
+print 'Ready to bootstrap GSAS-II from repository\n\t',home,'\nto '+gsaspath
+proxycmds = []
+if os.path.exists("proxyinfo.txt"):
+    fp = open("proxyinfo.txt",'r')
+    os.remove("proxyinfo.txt")
+print(70*"=")
+ans = raw_input("Enter the proxy address [none needed]: ")
+if ans.strip() != "":
+    proxycmds.append('--config-option')
+    proxycmds.append('servers:global:http-proxy-host='+ans.strip())
+    fp = open("proxyinfo.txt",'w')
+    fp.write(ans.strip()+'\n')
+    ans = raw_input("Enter the proxy port [8080]: ")
+    if ans.strip() == "": ans="8080"
+    proxycmds.append('--config-option')
+    proxycmds.append('servers:global:http-proxy-port='+ans.strip())
+    fp.write(ans.strip()+'\n')
+    fp.close()
 
 print 'Determining system type...',
@@ -58 +110 @@
     repos = 'osxppc'
     print 'Mac OS X, PowerPC -- you will need to run scons on fsource files'
+elif sys.platform.startswith('win'):
+    repos = 'win'
+    print 'Windows'
 else:
-    print 'Unidentifed platform -- you may need to run scons on fsource files'
+    print 'Unidentifed platform -- you probably will need to run scons to compile the fsource files'
 
 cmd = [svn, 'co', home+ 'trunk/', gsaspath, '--non-interactive', '--trust-server-cert']
+if proxycmds: cmd += proxycmds
 msg = 'loading GSAS-II'
     
 print 70*'*'
 print msg + ' from ' + cmd[2]
+print 'svn load command:'
 for item in cmd: print item,
 print ""
 p = subprocess.call(cmd)
 if p:
-    print 'subversion returned an error; Retrying...'
+    print 'subversion returned an error; Retrying with command for older version...'
     cmd = [svn, 'co', home+ 'trunk/', gsaspath]
+    if proxycmds: cmd += proxycmds
+    for item in cmd: print item,
+    print ""
     p = subprocess.call(cmd)
 
 #===========================================================================
-# could try to load .so files here and run scons if needed.
-
+# install OpenGL, if needed.
+if install_with_easyinstall:
+    print '\nInstalling PyOpenGL. Lots of warnings will follow... ',
+    install_with_easyinstall('PyOpenGl')
+    print 'done.'
+#===========================================================================
+# import all .py files so that .pyc files get created
+print 'Byte-compiling all .py files...',
+import compileall
+compileall.compile_dir(gsaspath,quiet=True)
+print 'done'
+#===========================================================================
+# platform-dependent stuff
+#===========================================================================
+# on Windows, 
+if sys.platform.startswith('win') and os.path.exists(
+    os.path.join(gsaspath,"makeBat.py")):
+    execfile(os.path.join(gsaspath,"makeBat.py"))
 #===========================================================================
 # on a Mac, make an applescript 
-if sys.platform.startswith('darwin') and os.path.exists(
+elif sys.platform.startswith('darwin') and os.path.exists(
     os.path.join(gsaspath,"makeMacApp.py")):
     execfile(os.path.join(gsaspath,"makeMacApp.py"))
 #===========================================================================
 # On linux, make desktop icon
-if sys.platform.startswith('linux'):
+elif sys.platform.startswith('linux'):
     desktop_template = """
 [Desktop Entry]
@@ -108 +184 @@
             stat.S_IWUSR | stat.S_IXUSR | stat.S_IRUSR | stat.S_IRGRP | stat.S_IXGRP | stat.S_IXOTH)
         print("created GNOME desktop shortcut "+dfile) 
+