Changeset 904702d for waf


Ignore:
Timestamp:
Mar 14, 2015, 6:06:10 PM (10 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+
Children:
6d7acc8
Parents:
5525507
Message:

waf, waflib: update to 1.8.7

File:
1 edited

Legend:

Unmodified
Added
Removed

  • waf

    r5525507 r904702d  
    11#!/usr/bin/env python
    22# encoding: ISO8859-1
    3 # Thomas Nagy, 2005-2012
     3# Thomas Nagy, 2005-2015
    44
    55"""
    … …  
    3131"""
    3232
    33 import os, sys
     33import os, sys, inspect
    3434
    35 VERSION="1.7.15"
    36 REVISION="de1cb53b86321cda764be4b3c38c3d20"
     35VERSION="1.8.7"
     36REVISION="073060339ba56c09e143ed641610cbec"
     37GIT="x"
    3738INSTALL=''
    38 C1='#+'
    39 C2='#&'
     39C1='#/'
     40C2='#-'
     41C3='#+'
    4042cwd = os.getcwd()
    4143join = os.path.join
    … …  
    5456        sys.exit(1)
    5557
    56 def unpack_wafdir(dir):
    57         f = open(sys.argv[0],'rb')
     58def unpack_wafdir(dir, src):
     59        f = open(src,'rb')
    5860        c = 'corrupt archive (%d)'
    5961        while 1:
    … …  
    6668                        break
    6769        if not txt: err(c % 3)
    68         txt = txt[1:-1].replace(b(C1), b('\n')).replace(b(C2), b('\r'))
     70        txt = txt[1:-1].replace(b(C1), b('\n')).replace(b(C2), b('\r')).replace(b(C3), b('\x00'))
    6971
    7072        import shutil, tarfile
    … …  
    7274        except OSError: pass
    7375        try:
    74                 for x in ['Tools', 'extras']:
     76                for x in ('Tools', 'extras'):
    7577                        os.makedirs(join(dir, 'waflib', x))
    7678        except OSError:
    … …  
    101103                t.close()
    102104
    103         for x in ['Tools', 'extras']:
     105        for x in ('Tools', 'extras'):
    104106                os.chmod(join('waflib',x), 493)
    105107
    … …  
    128130
    129131def find_lib():
    130         name = sys.argv[0]
    131         base = os.path.dirname(os.path.abspath(name))
     132        src = os.path.abspath(inspect.getfile(inspect.getmodule(err)))
     133        base, name = os.path.split(src)
    132134
    133135        #devs use $WAFDIR
    … …  
    142144
    143145        dirname = '%s-%s-%s' % (WAF, VERSION, REVISION)
    144         for i in [INSTALL,'/usr','/usr/local','/opt']:
     146        for i in (INSTALL,'/usr','/usr/local','/opt'):
    145147                w = test(i + '/lib/' + dirname)
    146148                if w: return w
    … …  
    152154
    153155        #unpack
    154         unpack_wafdir(dir)
     156        unpack_wafdir(dir, src)
    155157        return dir
    156158
Note: See TracChangeset for help on using the changeset viewer.