Changeset 2952 for install

Timestamp:

Jul 30, 2017 7:37:08 PM (6 years ago)

Author:

toby

Message:

GSASII installation: support downloading of all binaries

Location:

install

Files:

• bootstrap.bat (deleted)
• bootstrap.py (modified) (4 diffs)

install/bootstrap.py

@@ -231 +231 @@
 print('\n'+75*'*')
 print(msg + u' from ' + cmd[2])
-print('  *** If GSAS-II fails to be installed, you likely have 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')
 print 'svn load command:'
 for item in cmd: print item,
 print ""
-p = subprocess.call(cmd)
-if p:
-    print 'subversion returned an error; Retrying with command for older version...'
+s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
+print('\nsubversion output:')
+out,err = s.communicate()
+if err:
+    print('subversion returned an error:')
+    print(err)
+    print('Retrying with command for older svn version...')
     cmd = [svn, 'co', g2home+ 'trunk/', gsaspath]
     if proxycmds: cmd += proxycmds
     for item in cmd: print item,
     print ""
-    p = subprocess.call(cmd)
+    s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
+    out,err = s.communicate()
+    if err:
+        print('subversion returned an error:')
+        print(err)
+        print('  *** GSAS-II failed to be installed: you likely have 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()
 print('\n'+75*'*')
 
-#===========================================================================
-# test if the compiled files load correctly
-#===========================================================================
 try:
     import GSASIIpath
@@ -261 +267 @@
     sys.exit()
 
+for a in sys.argv[1:]:
+    if 'allbin' in a.lower() or 'server' in a.lower():
+        print('Loading all binaries with command...')
+        if not GSASIIpath.svnSwitchDir('AllBinaries','',g2home+ 'Binaries/',None,True):
+            print('Binary load failed')
+            sys.exit()
+        break
+else:
+    GSASIIpath.DownloadG2Binaries(g2home)
+        
+#===========================================================================
+# test if the compiled files load correctly
+#===========================================================================
+
 script = """  # commands that test each module can at least be loaded & run something in pyspg
 try:
     import GSASIIpath
+    GSASIIpath.SetBinaryPath()
     import pyspg
     import histogram2d
@@ -274 +295 @@
     pass
 """
-p = subprocess.Popen([sys.executable,'-c',script],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+p = subprocess.Popen([sys.executable,'-c',script],stdout=subprocess.PIPE,stderr=subprocess.PIPE,
+                     cwd=gsaspath)
 res,err = p.communicate()
 if '==OK==' not in res or p.returncode != 0:
@@ -313 +335 @@
 elif sys.platform.startswith('darwin') and os.path.exists(
     os.path.join(gsaspath,"makeMacApp.py")):
-    print('running '+os.path.join(gsaspath,"makeMacApp.py"))
-    execfile(os.path.join(gsaspath,"makeMacApp.py"))
+    sys.argv = [os.path.join(gsaspath,"makeMacApp.py")]
+    print(u'running '+sys.argv[0])
+    execfile(sys.argv[0])
 #===========================================================================
 # On linux, make desktop icon