diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-05-09 23:11:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-09 23:11:57 +0200 |
| commit | 05e4298dc5f20ddc4bf8702c1fbedb21986c2a4c (patch) | |
| tree | ff3477c59509d81564a4310ddcd49b27439ac801 /mesonbuild/scripts/gtkdochelper.py | |
| parent | ed701b5cb0b628c632a916defcbdda312cb00197 (diff) | |
| parent | 86cc4f27072bede2a6f7ed2879b2786529e3204f (diff) | |
| download | meson-05e4298dc5f20ddc4bf8702c1fbedb21986c2a4c.zip meson-05e4298dc5f20ddc4bf8702c1fbedb21986c2a4c.tar.gz meson-05e4298dc5f20ddc4bf8702c1fbedb21986c2a4c.tar.bz2 | |
Merge pull request #3539 from mesonbuild/nirbheek/fix-gtkdoc-content-files-File
gnome: some gtk-doc and gdbus-codegen issues
Diffstat (limited to 'mesonbuild/scripts/gtkdochelper.py')
| -rw-r--r-- | mesonbuild/scripts/gtkdochelper.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py index 3fe7fb7..2895991 100644 --- a/mesonbuild/scripts/gtkdochelper.py +++ b/mesonbuild/scripts/gtkdochelper.py @@ -93,9 +93,12 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs, # Copy files to build directory for f in content_files: - f_abs = os.path.join(doc_src, f) - shutil.copyfile(f_abs, os.path.join( - abs_out, os.path.basename(f_abs))) + # FIXME: Use mesonlib.File objects so we don't need to do this + if not os.path.isabs(f): + f = os.path.join(doc_src, f) + elif os.path.commonpath([f, build_root]) == build_root: + continue + shutil.copyfile(f, os.path.join(abs_out, os.path.basename(f))) shutil.rmtree(htmldir, ignore_errors=True) try: |