Changes in / [91fa88d:24c207f]


Ignore:
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • README.md

    r91fa88d r24c207f  
    11aubio library
    22=============
     3[![Travis build status](https://travis-ci.org/aubio/aubio.svg?branch=master)](https://travis-ci.org/aubio/aubio "Travis build status")
     4[![Appveyor build status](https://ci.appveyor.com/api/projects/status/f3lhy3a57rkgn5yi?svg=true)](https://ci.appveyor.com/project/aubio/aubio/branch/master "Appveyor build status")
     5[![Landscape code health](https://landscape.io/github/aubio/aubio/master/landscape.svg?style=flat)](https://landscape.io/github/aubio/aubio/master "Landscape code health")
     6[![Documentation Status](https://readthedocs.org/projects/aubio/badge/?version=latest)](http://aubio.readthedocs.io/en/latest/?badge=latest "Documentation status")
     7[![Commits since last release](https://img.shields.io/github/commits-since/aubio/aubio/0.4.4.svg?maxAge=2592000)](https://github.com/aubio/aubio "Commits since last release")
    38
    49aubio is a library to label music and sounds. It listens to audio signals and
  • python/lib/moresetuptools.py

    r91fa88d r24c207f  
    55from .gen_external import generate_external, header, output_path
    66
    7 def get_aubio_version():
    8     # read from VERSION
    9     this_file_dir = os.path.dirname(os.path.abspath(__file__))
    10     version_file = os.path.join(this_file_dir, '..', '..', 'VERSION')
    11 
    12     if not os.path.isfile(version_file):
    13         raise SystemError("VERSION file not found.")
    14 
    15     for l in open(version_file).readlines():
    16         #exec (l.strip())
    17         if l.startswith('AUBIO_MAJOR_VERSION'):
    18             AUBIO_MAJOR_VERSION = int(l.split('=')[1])
    19         if l.startswith('AUBIO_MINOR_VERSION'):
    20             AUBIO_MINOR_VERSION = int(l.split('=')[1])
    21         if l.startswith('AUBIO_PATCH_VERSION'):
    22             AUBIO_PATCH_VERSION = int(l.split('=')[1])
    23         if l.startswith('AUBIO_VERSION_STATUS'):
    24             AUBIO_VERSION_STATUS = l.split('=')[1].strip()[1:-1]
    25 
    26     if AUBIO_MAJOR_VERSION is None or AUBIO_MINOR_VERSION is None \
    27             or AUBIO_PATCH_VERSION is None:
    28         raise SystemError("Failed parsing VERSION file.")
    29 
    30     verstr = '.'.join(map(str, [AUBIO_MAJOR_VERSION,
    31                                      AUBIO_MINOR_VERSION,
    32                                      AUBIO_PATCH_VERSION]))
    33 
    34     if AUBIO_VERSION_STATUS is not None:
    35         verstr += AUBIO_VERSION_STATUS
    36     return verstr
    37 
    38 def get_aubio_pyversion():
    39     # convert to version for python according to pep 440
    40     # see https://www.python.org/dev/peps/pep-0440/
    41     verstr = get_aubio_version()
    42     if '~alpha' in verstr:
    43         verstr = verstr.split('~')[0] + 'a1'
    44     # TODO: add rc, .dev, and .post suffixes, add numbering
    45     return verstr
     7from this_version import get_aubio_version
    468
    479# inspired from https://gist.github.com/abergmeier/9488990
  • setup.py

    r91fa88d r24c207f  
    66# function to generate gen/*.{c,h}
    77from python.lib.gen_external import generate_external, header, output_path
     8from this_version import get_aubio_version, get_aubio_pyversion
    89
    9 __version__ = get_aubio_pyversion()
     10__version__ = get_aubio_version()
     11__pip_version__ = get_aubio_pyversion()
    1012
    1113include_dirs = []
     
    5557
    5658distrib = setup(name='aubio',
    57     version = __version__,
     59    version = __pip_version__,
    5860    packages = ['aubio'],
    5961    package_dir = {'aubio':'python/lib/aubio'},
  • src/wscript_build

    r91fa88d r24c207f  
    4848# install headers, except _priv.h ones
    4949ctx.install_files('${INCLUDEDIR}/aubio/',
    50         ctx.path.ant_glob('**/*.h', excl = ['**_priv.h', 'config.h']),
     50        ctx.path.ant_glob('**/*.h', excl = ['**_priv.h']),
    5151        relative_trick=True)
  • wscript

    r91fa88d r24c207f  
    1515APPNAME = 'aubio'
    1616
    17 # source VERSION
    18 for l in open('VERSION').readlines(): exec (l.strip())
    19 
    20 VERSION = '.'.join ([str(x) for x in [
    21     AUBIO_MAJOR_VERSION,
    22     AUBIO_MINOR_VERSION,
    23     AUBIO_PATCH_VERSION
    24     ]]) + AUBIO_VERSION_STATUS
    25 
    26 LIB_VERSION = '.'.join ([str(x) for x in [
    27     LIBAUBIO_LT_CUR,
    28     LIBAUBIO_LT_REV,
    29     LIBAUBIO_LT_AGE]])
     17from this_version import *
     18
     19VERSION = get_aubio_version()
     20LIB_VERSION = get_libaubio_version()
    3021
    3122top = '.'
     
    132123    ctx.env['DEST_OS'] = target_platform
    133124
     125    version_dict = get_version_info();
     126    ctx.define('AUBIO_VERSION',VERSION)
     127    ctx.define('AUBIO_MAJOR_VERSION', version_dict['AUBIO_MAJOR_VERSION'])
     128    ctx.define('AUBIO_MINOR_VERSION', version_dict['AUBIO_MINOR_VERSION'])
     129    ctx.define('AUBIO_PATCH_VERSION', version_dict['AUBIO_PATCH_VERSION'])
     130    ctx.define('AUBIO_VERSION_STATUS', version_dict['AUBIO_VERSION_STATUS'])
     131   
    134132    if ctx.options.build_type == "debug":
    135133        ctx.define('DEBUG', 1)
     
    428426        if 'MANDIR' not in bld.env:
    429427            bld.env['MANDIR'] = bld.env['DATAROOTDIR'] + '/man'
    430         bld.env.VERSION = VERSION
     428        bld.env.VERSION = str(VERSION)
    431429        rule_str = '${TXT2MAN} -t `basename ${TGT} | cut -f 1 -d . | tr a-z A-Z`'
    432430        rule_str += ' -r ${PACKAGE}\\ ${VERSION} -P ${PACKAGE}'
     
    459457    # note: build in ../doc/_build/html, otherwise waf wont install unsigned files
    460458    if bld.env['SPHINX']:
    461         bld.env.VERSION = VERSION
     459        bld.env.VERSION = str(VERSION)
    462460        bld( name = 'sphinx',
    463461                rule = '${SPHINX} -b html -D release=${VERSION} -D version=${VERSION} -a -q `dirname ${SRC}` `dirname ${TGT}`',
Note: See TracChangeset for help on using the changeset viewer.