Changeset d0f19a7 for wscript


Ignore:
Timestamp:
Dec 19, 2018, 7:31:27 PM (5 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/cnn, feature/crepe, feature/pitchshift, feature/timestretch, fix/ffmpeg5, master
Children:
0770148, cb0d7d0
Parents:
34d4232 (diff), 0045668 (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 'master' into feature/pitchshift

File:
1 edited

Legend:

Unmodified
Added
Removed
  • wscript

    r34d4232 rd0f19a7  
    556556    if bld.env['DOXYGEN']:
    557557        bld.env.VERSION = VERSION
    558         rule = '( cat ${SRC} && echo PROJECT_NUMBER=${VERSION}; )'
     558        rule = '( cat ${SRC[0]} && echo PROJECT_NUMBER=${VERSION}'
     559        rule += ' && echo OUTPUT_DIRECTORY=%s && echo HTML_OUTPUT=%s )'
    559560        rule += ' | doxygen - > /dev/null'
     561        rule %= (os.path.abspath(out), 'api')
    560562        bld( name = 'doxygen', rule = rule,
    561                 source = 'doc/web.cfg',
    562                 target = '../doc/web/html/index.html',
    563                 cwd = 'doc')
    564         bld.install_files( '${DATAROOTDIR}' + '/doc/libaubio-doc',
    565                 bld.path.ant_glob('doc/web/html/**'),
    566                 cwd = bld.path.find_dir ('doc/web'),
    567                 relative_trick = True)
     563                source = ['doc/web.cfg']
     564                    + bld.path.find_dir('src').ant_glob('**/*.h'),
     565                target = bld.path.find_or_declare('api/index.html'),
     566                cwd = bld.path.find_dir('doc'))
     567        # evaluate nodes lazily to prevent build directory traversal warnings
     568        bld.install_files('${DATAROOTDIR}/doc/libaubio-doc/api',
     569                bld.path.find_or_declare('api').ant_glob('**/*',
     570                    generator=True), cwd=bld.path.find_or_declare('api'),
     571                relative_trick=True)
    568572
    569573def sphinx(bld):
    570     # build documentation from source files using sphinx-build note: build in
    571     # ../doc/_build/html, otherwise waf wont install unsigned files
    572     if bld.env['SPHINX']:
     574    # build documentation from source files using sphinx-build
     575    try:
     576        import aubio
     577        has_aubio = True
     578    except ImportError:
     579        from waflib import Logs
     580        Logs.pprint('YELLOW', "Sphinx manual: install aubio first")
     581        has_aubio = False
     582    if bld.env['SPHINX'] and has_aubio:
    573583        bld.env.VERSION = VERSION
    574         bld( name = 'sphinx',
    575                 rule = '${SPHINX} -b html -D release=${VERSION}' \
    576                         ' -D version=${VERSION} -a -q' \
    577                         ' `dirname ${SRC}` `dirname ${TGT}`',
    578                 source = 'doc/conf.py',
    579                 target = '../doc/_build/html/index.html')
    580         bld.install_files( '${DATAROOTDIR}' + '/doc/libaubio-doc/sphinx',
    581                 bld.path.ant_glob('doc/_build/html/**'),
    582                 cwd = bld.path.find_dir('doc/_build/html'),
    583                 relative_trick = True)
     584        rule = '${SPHINX} -b html -D release=${VERSION}' \
     585                ' -D version=${VERSION} -W -a -q' \
     586                ' -d %s ' % os.path.join(os.path.abspath(out), 'doctrees')
     587        rule += ' . %s' % os.path.join(os.path.abspath(out), 'manual')
     588        bld( name = 'sphinx', rule = rule,
     589                cwd = bld.path.find_dir('doc'),
     590                source = bld.path.find_dir('doc').ant_glob('*.rst'),
     591                target = bld.path.find_or_declare('manual/index.html'))
     592        # evaluate nodes lazily to prevent build directory traversal warnings
     593        bld.install_files('${DATAROOTDIR}/doc/libaubio-doc/manual',
     594                bld.path.find_or_declare('manual').ant_glob('**/*',
     595                    generator=True), cwd=bld.path.find_or_declare('manual'),
     596                relative_trick=True)
    584597
    585598# register the previous rules as build rules
Note: See TracChangeset for help on using the changeset viewer.