Changeset 3025 for install/bootstrap.py


Ignore:
Timestamp:
Aug 24, 2017 2:50:24 PM (4 years ago)
Author:
toby
Message:

work on installation issues

File:
1 edited

Legend:

Unmodified
Added
Removed
  • install/bootstrap.py

    r2952 r3025  
    225225        print(err)
    226226        print(res)
    227        
     227# patch: switch GSAS-II location if switched to 2frame version (removed August 2017)
     228if '2frame' in res:
     229    print('Switching previous 2frame install to trunk\n\thttps://subversion.xray.aps.anl.gov/pyGSAS')
     230    cmd = [svn, 'switch',g2home + '/trunk',gsaspath,
     231           '--non-interactive','--trust-server-cert',
     232           '--accept','theirs-conflict','--force','--ignore-ancestry']
     233    if proxycmds: cmd += proxycmds
     234    p = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
     235    res,err = p.communicate()
     236    if err:
     237        print('Please report this error to toby@anl.gov:')
     238        print(err)
     239        print(res)
     240
    228241cmd = [svn, 'co', g2home+ 'trunk/', gsaspath, '--non-interactive', '--trust-server-cert']
    229242if proxycmds: cmd += proxycmds
     
    300313if '==OK==' not in res or p.returncode != 0:
    301314    print('\n'+75*'=')
    302     print('Failed when testing the GSAS-II compiled files. GSAS-II will not run without')
    303     print('correcting this.')
     315    print('Failed when testing the GSAS-II compiled files. GSAS-II will not run')
     316    print('without correcting this.')
    304317    #print(res)
    305318    #print(err)
     319    #print('\nAttempting to open a web page on compiling GSAS-II...')
     320    print('Please see web page\nhttps://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII')
     321    #import webbrowser
     322    #webbrowser.open_new('https://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII')
     323    print(75*'=')
    306324    if '86' in platform.machine() and (sys.platform.startswith('linux')
    307325                                        or sys.platform == "darwin"
     
    310328    else:
    311329        print('Platform '+sys.platform+' with processor type '+platform.machine()+' not is supported')
    312     print('\nAttempting to open a web page on compiling GSAS-II...')
    313     print('(https://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII)')
    314     import webbrowser
    315     webbrowser.open_new('https://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII')
    316     print(75*'=')
    317330    sys.exit()
    318331else:
Note: See TracChangeset for help on using the changeset viewer.