wscript: check for 64bit using sys.maxsize (closes #3)

[vamp-aubio-plugins.git] / wscript

diff --git a/wscript b/wscript
index 3e99992..3ce0a7c 100644 (file)
--- a/wscript
+++ b/wscript
@@ -4,8 +4,18 @@
 
 import sys, os, platform
 
+APPNAME = 'vamp-aubio-plugins'
+
+for l in open('VERSION').readlines(): exec (l.strip())
+
+VERSION = '.'.join ([str(x) for x in [
+    VAMP_AUBIO_MAJOR_VERSION,
+    VAMP_AUBIO_MINOR_VERSION,
+    VAMP_AUBIO_PATCH_VERSION
+    ]]) + VAMP_AUBIO_VERSION_STATUS
+
 local_aubio_include  = 'contrib/aubio-dist/include'
-local_aubio_lib      = 'contrib/aubio/build/src'
+local_aubio_lib      = 'contrib/aubio-dist/lib'
 local_vamp_include   = 'contrib/vamp-plugin-sdk-2.6'
 local_vamp_lib_i686  = 'contrib/vamp-plugin-sdk-2.6-binaries-i686-linux'
 local_vamp_lib_amd64 = 'contrib/vamp-plugin-sdk-2.6-binaries-amd64-linux'
@@ -33,11 +43,10 @@ def configure(conf):
     if sys.platform.startswith('linux'):
         if 'mingw' in conf.env.CXX[0]:
             local_vamp_lib = local_vamp_lib_mingw
-        elif platform.machine() == 'x86_64':
+        elif sys.maxsize > 2**32:
             local_vamp_lib = local_vamp_lib_amd64
-        elif platform.machine() == 'x86_64':
+        else:
             local_vamp_lib = local_vamp_lib_i686
-        conf.check(lib='cblas', uselib_store='CBLAS', mandatory=False)
     elif sys.platform == 'darwin':
         local_vamp_lib = local_vamp_lib_osx
     elif sys.platform == 'win32':
@@ -129,7 +138,10 @@ def build(bld):
 def dist(ctx):
     ctx.excl  =  '**/.waf-1* **/*~ **/*.pyc **/*.swp **/.lock-w* **/.git*'
     ctx.excl += ' **/**.tar.bz2'
+    ctx.excl += ' **/**.zip'
+    ctx.excl += ' **/**.o **/**.so'
     ctx.excl += ' contrib/**'
     ctx.excl += ' build/**'
+    ctx.excl += ' dist/**'
     ctx.excl += ' **/.travis.yml'
     ctx.excl += ' **/.appveyor.yml'