Changeset 5b194f0
- Timestamp:
- Oct 1, 2017, 3:27:07 AM (7 years ago)
- Branches:
- feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master
- Children:
- 16c12a1, 2a4ce6d
- Parents:
- 2f02d51 (diff), 873646d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
.appveyor.yml
r2f02d51 r5b194f0 8 8 # pre-installed python version, see: 9 9 # http://www.appveyor.com/docs/installed-software#python 10 - PYTHON : "C:\\Python27"10 - PYTHONDIR: "C:\\Python27" 11 11 PYTHON_VERSION: "2.7.x" 12 12 PYTHON_ARCH: "32" 13 13 14 - PYTHON : "C:\\Python27-x64"14 - PYTHONDIR: "C:\\Python27-x64" 15 15 PYTHON_VERSION: "2.7.x" 16 16 PYTHON_ARCH: "64" 17 17 18 - PYTHON : "C:\\Python34"18 - PYTHONDIR: "C:\\Python34" 19 19 PYTHON_VERSION: "3.4.x" 20 20 PYTHON_ARCH: "32" 21 21 22 - PYTHON : "C:\\Python34-x64"22 - PYTHONDIR: "C:\\Python34-x64" 23 23 PYTHON_VERSION: "3.4.x" 24 24 PYTHON_ARCH: "64" 25 25 26 - PYTHON : "C:\\Python35"26 - PYTHONDIR: "C:\\Python35" 27 27 PYTHON_VERSION: "3.5.x" 28 28 PYTHON_ARCH: "32" 29 29 30 - PYTHON : "C:\\Python35-x64"30 - PYTHONDIR: "C:\\Python35-x64" 31 31 PYTHON_VERSION: "3.5.x" 32 32 PYTHON_ARCH: "64" … … 40 40 41 41 # Check that we have the expected version and architecture for Python 42 - "%PYTHON %\\python.exe --version"43 - "%PYTHON %\\python.exe -c \"import struct; print(struct.calcsize('P') * 8)\""42 - "%PYTHONDIR%\\python.exe --version" 43 - "%PYTHONDIR%\\python.exe -c \"import struct; print(struct.calcsize('P') * 8)\"" 44 44 45 45 # We need wheel installed to build wheels 46 - "%PYTHON %\\python.exe -m pip install wheel"46 - "%PYTHONDIR%\\python.exe -m pip install wheel" 47 47 48 - "SET PATH=%PATH_EXTRAS%;%PYTHON %;%PYTHON%\\Scripts;%PATH%"48 - "SET PATH=%PATH_EXTRAS%;%PYTHONDIR%;%PYTHONDIR%\\Scripts;%PATH%" 49 49 50 50 - "pip install --disable-pip-version-check --user --upgrade pip" … … 52 52 53 53 before_build: 54 - curl -fsS -o waf https://waf.io/waf-1.8.22 55 - curl -fsS -o waf.bat https://raw.githubusercontent.com/waf-project/waf/master/utils/waf.bat 54 - "bash scripts/get_waf.sh" 56 55 57 56 build_script: … … 63 62 - "nose2 --verbose" 64 63 # clean up 65 - waf distclean64 - "python waf distclean" 66 65 # build libaubio 67 - waf configure build --verbose66 - python waf configure build --verbose --msvc_version="msvc 14.0" 68 67 # build python module using libaubio dll 69 68 - "python setup.py build" -
scripts/build_emscripten
r2f02d51 r5b194f0 1 #! /bin/ sh1 #! /bin/bash 2 2 3 3 function checkprog() { … … 10 10 11 11 # clean 12 emmake./waf distclean12 ./waf distclean 13 13 14 14 # configure 15 emconfigure ./waf configure -- prefix=$EMSCRIPTEN/system/local/ --with-target-platform emscripten15 emconfigure ./waf configure --with-target-platform emscripten $* 16 16 17 17 # build 18 emmake ./waf --testcmd="node %s" 19 20 # intall 21 #emmake ./waf install 18 emmake ./waf build -
scripts/get_waf.sh
r2f02d51 r5b194f0 1 #! /bin/ sh1 #! /bin/bash 2 2 3 3 set -e 4 4 set -x 5 5 6 WAFURL=https://waf.io/waf-2.0.1 6 WAFVERSION=2.0.1 7 WAFTARBALL=waf-$WAFVERSION.tar.bz2 8 WAFURL=https://waf.io/$WAFTARBALL 7 9 8 ( which wget > /dev/null && wget -qO waf $WAFURL ) || ( which curl > /dev/null && curl $WAFURL > waf ) 10 WAFBUILDDIR=`mktemp -d` 9 11 10 chmod +x waf 12 function cleanup () { 13 rm -rf $WAFBUILDDIR 14 } 15 16 trap cleanup SIGINT SIGTERM 17 18 function buildwaf () { 19 pushd $WAFBUILDDIR 20 21 ( which wget > /dev/null && wget -qO $WAFTARBALL $WAFURL ) || ( which curl > /dev/null && curl $WAFURL > $WAFTARBALL ) 22 23 tar xf $WAFTARBALL 24 pushd waf-$WAFVERSION 25 NOCLIMB=1 python waf-light --tools=c_emscripten,syms $* 26 27 popd 28 popd 29 30 cp -prv $WAFBUILDDIR/waf-$WAFVERSION/waf $PWD 31 32 chmod +x waf 33 } 34 35 buildwaf 36 37 cleanup -
wscript
r2f02d51 r5b194f0 103 103 104 104 def configure(ctx): 105 from waflib import Options106 ctx.load('compiler_c')107 ctx.load('waf_unit_test')108 ctx.load('gnu_dirs')109 110 105 target_platform = sys.platform 111 106 if ctx.options.target_platform: 112 107 target_platform = ctx.options.target_platform 113 108 109 from waflib import Options 114 110 115 111 if target_platform=='emscripten': 116 # need to force spaces between flag -o and path 117 # inspired from : 118 # https://github.com/waf-project/waf/blob/master/waflib/extras/c_emscripten.py (#1885) 119 # (OSX /emscripten 1.37.9) 120 ctx.env.CC_TGT_F = ['-c', '-o', ''] 121 ctx.env.CCLNK_TGT_F = ['-o', ''] 112 ctx.load('c_emscripten') 113 else: 114 ctx.load('compiler_c') 115 116 ctx.load('waf_unit_test') 117 ctx.load('gnu_dirs') 118 122 119 # check for common headers 123 120 ctx.check(header_name='stdlib.h') … … 152 149 else: 153 150 # enable debug symbols 154 ctx.env.CFLAGS += ['/Z7', '/FS'] 151 ctx.env.CFLAGS += ['/Z7'] 152 # /FS flag available in msvc >= 12 (2013) 153 if 'MSVC_VERSION' in ctx.env and ctx.env.MSVC_VERSION >= 12: 154 ctx.env.CFLAGS += ['/FS'] 155 155 ctx.env.LINKFLAGS += ['/DEBUG', '/INCREMENTAL:NO'] 156 156 # configure warnings … … 227 227 228 228 if target_platform == 'emscripten': 229 import os.path230 ctx.env.CFLAGS += [ '-I' + os.path.join(os.environ['EMSCRIPTEN'], 'system', 'include') ]231 232 229 if ctx.options.build_type == "debug": 233 230 ctx.env.cshlib_PATTERN = '%s.js' … … 250 247 from python.lib.gen_external import get_c_declarations, get_cpp_objects_from_c_declarations, get_all_func_names_from_lib, generate_lib_from_c_declarations 251 248 c_decls = get_c_declarations(usedouble=False) # emscripten can't use double 252 objects = get_cpp_objects_from_c_declarations(c_decls)249 objects = list(get_cpp_objects_from_c_declarations(c_decls)) 253 250 # ensure that aubio structs are exported 254 251 objects += ['fvec_t', 'cvec_t', 'fmat_t'] … … 447 444 # add sub directories 448 445 if bld.env['DEST_OS'] not in ['ios', 'iosimulator', 'android']: 446 if bld.env['DEST_OS']=='emscripten' and not bld.options.testcmd: 447 bld.options.testcmd = 'node %s' 449 448 bld.recurse('examples') 450 449 bld.recurse('tests')
Note: See TracChangeset
for help on using the changeset viewer.