Changeset a60f790

Timestamp:

Oct 3, 2017, 4:18:49 PM (7 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

Children:

9dcc6e5

Parents:

dfe058a0 (diff), a500a392 (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.

Message:

Merge branch 'winsymdef' (closes #126, closes waf-project/waf#2053)

Files:

• .appveyor.yml (modified) (1 diff)
• scripts/build_mingw (modified) (1 diff)
• scripts/get_waf.sh (modified) (1 diff)
• src/wscript_build (modified) (3 diffs)
• waf_gensyms.py (added)
• wscript (modified) (2 diffs)

.appveyor.yml

@@ -65 +65 @@
   # build libaubio
   - python waf configure build --verbose --msvc_version="msvc 14.0"
-  # build python module using libaubio dll
-  - "python setup.py build"

scripts/build_mingw

@@ -81 +81 @@
   # fix dll location (see https://github.com/waf-project/waf/issues/1860)
   mv $DESTDIR/lib/libaubio-5.dll $DESTDIR/bin
-  # generate def file (see https://github.com/aubio/aubio/issues/97)
-  ( echo -e "EXPORTS"; $NM $DESTDIR/bin/libaubio-5.dll | grep T\  | \
-    egrep "(aubio|fvec|cvec|lvec|fmat)" | sed 's/^.* T _\?//' ) \
-    > $DESTDIR/bin/libaubio-5.def
+  mv $DESTDIR/lib/libaubio-5.def $DESTDIR/bin
   zip -r $DESTDIR.zip `basename $DESTDIR`
   rm -rf $DESTDIR

scripts/get_waf.sh

@@ -23 +23 @@
   tar xf $WAFTARBALL
   pushd waf-$WAFVERSION
-  NOCLIMB=1 python waf-light --tools=c_emscripten,syms $*
+  NOCLIMB=1 python waf-light --tools=c_emscripten $*
 
   popd

src/wscript_build

@@ -26 +26 @@
     build_features = ['cstlib', 'cshlib']
 elif ctx.env['DEST_OS'] in ['win32', 'win64']:
-    build_features = ['cstlib', 'cshlib']
+    build_features = ['cstlib', 'cshlib gensyms']
 elif ctx.env['DEST_OS'] in ['emscripten']:
     build_features = ['cstlib','cshlib']
@@ -38 +38 @@
 # also install static lib
 from waflib.Tools.c import cstlib
-from waflib.Tools.fc import fcstlib
-fcstlib.inst_to = cstlib.inst_to = '${LIBDIR}'
+cstlib.inst_to = '${LIBDIR}'
 
 for target in build_features:
@@ -45 +44 @@
             use = uselib + ['lib_objects'],
             target = 'aubio',
+            export_symbols_regex=r'(?:.*aubio|fvec|lvec|cvec|fmat|new|del)_.*',
             vnum = ctx.env['LIB_VERSION'])
 

wscript

@@ -104 +104 @@
     ctx.load('waf_unit_test')
     ctx.load('gnu_dirs')
+    ctx.load('waf_gensyms', tooldir='.')
 
 def configure(ctx):
@@ -119 +120 @@
     ctx.load('waf_unit_test')
     ctx.load('gnu_dirs')
+    ctx.load('waf_gensyms', tooldir='.')
 
     # check for common headers