Changeset 40bdc14 for wscript

Timestamp:

Dec 17, 2018, 2:34:15 AM (5 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/crepe, fix/ffmpeg5, master

Children:

4c37e87

Parents:

0850e54 (diff), 0512fca (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/sink_vorbis

File:

• wscript (modified) (2 diffs)

wscript

@@ -566 +566 @@
                 target = bld.path.find_or_declare('api/index.html'),
                 cwd = bld.path.find_dir('doc'))
+        # evaluate nodes lazily to prevent build directory traversal warnings
         bld.install_files('${DATAROOTDIR}/doc/libaubio-doc/api',
-                bld.path.find_or_declare('api').ant_glob('**/*'),
-                cwd=bld.path.find_or_declare('api'),
+                bld.path.find_or_declare('api').ant_glob('**/*',
+                    generator=True), cwd=bld.path.find_or_declare('api'),
                 relative_trick=True)
 
@@ -590 +591 @@
                 source = bld.path.find_dir('doc').ant_glob('*.rst'),
                 target = bld.path.find_or_declare('manual/index.html'))
+        # evaluate nodes lazily to prevent build directory traversal warnings
         bld.install_files('${DATAROOTDIR}/doc/libaubio-doc/manual',
-                bld.path.find_or_declare('manual').ant_glob('**/*'),
-                cwd=bld.path.find_or_declare('manual'),
+                bld.path.find_or_declare('manual').ant_glob('**/*',
+                    generator=True), cwd=bld.path.find_or_declare('manual'),
                 relative_trick=True)