Changeset 3025

Timestamp:

Aug 24, 2017 2:50:24 PM (6 years ago)

Author:

toby

Message:

work on installation issues

Files:

• install/bootstrap.py (modified) (3 diffs)
• trunk/GSASIIpath.py (modified) (1 diff)

install/bootstrap.py

@@ -225 +225 @@
         print(err)
         print(res)
-        
+# patch: switch GSAS-II location if switched to 2frame version (removed August 2017)
+if '2frame' in res:
+    print('Switching previous 2frame install to trunk\n\thttps://subversion.xray.aps.anl.gov/pyGSAS')
+    cmd = [svn, 'switch',g2home + '/trunk',gsaspath,
+           '--non-interactive','--trust-server-cert',
+           '--accept','theirs-conflict','--force','--ignore-ancestry']
+    if proxycmds: cmd += proxycmds
+    p = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+    res,err = p.communicate()
+    if err:
+        print('Please report this error to toby@anl.gov:')
+        print(err)
+        print(res)
+
 cmd = [svn, 'co', g2home+ 'trunk/', gsaspath, '--non-interactive', '--trust-server-cert']
 if proxycmds: cmd += proxycmds
@@ -300 +313 @@
 if '==OK==' not in res or p.returncode != 0:
     print('\n'+75*'=')
-    print('Failed when testing the GSAS-II compiled files. GSAS-II will not run without')
-    print('correcting this.')
+    print('Failed when testing the GSAS-II compiled files. GSAS-II will not run')
+    print('without correcting this.')
     #print(res)
     #print(err)
+    #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')
+    #import webbrowser
+    #webbrowser.open_new('https://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII')
+    print(75*'=')
     if '86' in platform.machine() and (sys.platform.startswith('linux')
                                         or sys.platform == "darwin"
@@ -310 +328 @@
     else:
         print('Platform '+sys.platform+' with processor type '+platform.machine()+' not is supported')
-    print('\nAttempting to open a web page on compiling GSAS-II...')
-    print('(https://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII)')
-    import webbrowser
-    webbrowser.open_new('https://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII')
-    print(75*'=')
     sys.exit()
 else:

trunk/GSASIIpath.py

@@ -474 +474 @@
         return ''
     # get binaries matching the required type -- other than for the numpy version
-    cmd = [svn, 'list', g2home + '/Binaries/']
+    cmd = [svn, 'list', g2home + '/Binaries/','--non-interactive', '--trust-server-cert']
     if proxycmds: cmd += proxycmds
+    if verbose:
+        print('Running svn command')
+        for item in cmd: print item,
+        print ""
     p = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
     res,err = p.communicate()