Changeset 5413


Ignore:
Timestamp:
Nov 27, 2022 10:43:12 PM (2 months ago)
Author:
toby
Message:

svn fixes for new windows pkging

Location:
install
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • install/bootstrap.py

    r4775 r5413  
    299299    print('\nAttempting patch for svn Checksum mismatch error\n')
    300300    svncleanup(fpath)
    301     cmd = ['svn','update','--set-depth','empty',
     301    cmd = [svn,'update','--set-depth','empty',
    302302               os.path.join(fpath,'bindist')]
    303303    showsvncmd(cmd)       
     
    314314        print(err)
    315315        BailOut(msg)
    316     cmd = ['svn','switch',g2home+'/trunk/bindist',
     316    cmd = [svn,'switch',g2home+'/trunk/bindist',
    317317               os.path.join(fpath,'bindist'),
    318318               '--non-interactive', '--trust-server-cert', '--accept',
    319319               'theirs-conflict', '--force', '-rHEAD', '--ignore-ancestry']
    320     showsvncmd(cmd)       
     320    showsvncmd(cmd)
    321321    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
    322322    out,err = MakeByte2str(s.communicate())
    323323    GSASIIpath.DownloadG2Binaries(g2home,verbose=True)
    324     cmd = ['svn','update','--set-depth','infinity',
     324    cmd = [svn,'update','--set-depth','infinity',
    325325               os.path.join(fpath,'bindist')]
    326326    showsvncmd(cmd)       
  • install/g2complete/src/bootstrap.py

    r4775 r5413  
    299299    print('\nAttempting patch for svn Checksum mismatch error\n')
    300300    svncleanup(fpath)
    301     cmd = ['svn','update','--set-depth','empty',
     301    cmd = [svn,'update','--set-depth','empty',
    302302               os.path.join(fpath,'bindist')]
    303303    showsvncmd(cmd)       
     
    314314        print(err)
    315315        BailOut(msg)
    316     cmd = ['svn','switch',g2home+'/trunk/bindist',
     316    cmd = [svn,'switch',g2home+'/trunk/bindist',
    317317               os.path.join(fpath,'bindist'),
    318318               '--non-interactive', '--trust-server-cert', '--accept',
    319319               'theirs-conflict', '--force', '-rHEAD', '--ignore-ancestry']
    320     showsvncmd(cmd)       
     320    showsvncmd(cmd)
    321321    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
    322322    out,err = MakeByte2str(s.communicate())
    323323    GSASIIpath.DownloadG2Binaries(g2home,verbose=True)
    324     cmd = ['svn','update','--set-depth','infinity',
     324    cmd = [svn,'update','--set-depth','infinity',
    325325               os.path.join(fpath,'bindist')]
    326326    showsvncmd(cmd)       
  • install/g2full/construct.yaml.template

    r5412 r5413  
    1515    - scipy
    1616    - conda
    17     - svn
     17    - svn                              [not win]
    1818    - hdf5
    1919    - h5py
  • install/g2pkg/src/bootstrap.py

    r4775 r5413  
    299299    print('\nAttempting patch for svn Checksum mismatch error\n')
    300300    svncleanup(fpath)
    301     cmd = ['svn','update','--set-depth','empty',
     301    cmd = [svn,'update','--set-depth','empty',
    302302               os.path.join(fpath,'bindist')]
    303303    showsvncmd(cmd)       
     
    314314        print(err)
    315315        BailOut(msg)
    316     cmd = ['svn','switch',g2home+'/trunk/bindist',
     316    cmd = [svn,'switch',g2home+'/trunk/bindist',
    317317               os.path.join(fpath,'bindist'),
    318318               '--non-interactive', '--trust-server-cert', '--accept',
    319319               'theirs-conflict', '--force', '-rHEAD', '--ignore-ancestry']
    320     showsvncmd(cmd)       
     320    showsvncmd(cmd)
    321321    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
    322322    out,err = MakeByte2str(s.communicate())
    323323    GSASIIpath.DownloadG2Binaries(g2home,verbose=True)
    324     cmd = ['svn','update','--set-depth','infinity',
     324    cmd = [svn,'update','--set-depth','infinity',
    325325               os.path.join(fpath,'bindist')]
    326326    showsvncmd(cmd)       
Note: See TracChangeset for help on using the changeset viewer.