diff options
39 files changed, 190 insertions, 25 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77b3b19..22edb06 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,8 +12,12 @@ autotools-build: script: - ./autogen.sh --prefix=/usr - make + - make dist except: - tags + artifacts: + paths: + - gtk-doc-*.tar.* autotools-test: stage: test @@ -33,11 +37,35 @@ autotools-test: meson-build: stage: build script: + - find . -name .git -prune -o -print | LC_ALL=C sort -u > git-filelist.txt - meson --prefix /usr _build . - ninja -C _build - - meson test -C _build || true + - meson test -C _build except: - tags + artifacts: + when: always + paths: + - _build/meson-logs/* + - git-filelist.txt + +meson-from-tarball: + stage: test + dependencies: + - autotools-build + variables: + GIT_STRATEGY: none + script: + - tar -xvf gtk-doc-*.tar.* + - ( cd gtk-doc-*/; find . -name .git -prune -o -print ) | LC_ALL=C sort -u > tar-filelist.txt + - ( cd gtk-doc-*/; meson --prefix /usr ../_build . ) + - ninja -C _build + - meson test -C _build + artifacts: + when: on_failure + paths: + - _build/meson-logs/*.log + - tar-filelist.txt # common diff --git a/Makefile.am b/Makefile.am index d7c7dbb..c383e85 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,9 +57,13 @@ EXTRA_DIST = \ MAINTAINERS \ $(gtkdocdata_DATA) \ $(pylibdata_DATA) \ + autogen.sh \ gtk-doc.pc.in \ gtk-doc.doap \ gtk-doc-fo.xsl \ + meson.build \ + meson_options.txt \ + requirements.txt \ doc/README \ doc/authors.txt \ doc/gnome.txt \ @@ -68,6 +72,12 @@ EXTRA_DIST = \ doc/style-guide.txt \ examples/README \ examples/Makefile.am \ + gtkdoc/meson.build \ + gtkdoc_uninstalled.py.in \ + style/COPYING \ + style/meson.build \ + tools/c10e-html.py \ + tools/db2md.py \ tools/docpercentages.pl \ tools/gtk-doc.el \ COPYING-DOCS diff --git a/buildsystems/autotools/Makefile.am b/buildsystems/autotools/Makefile.am index dde0d11..705451e 100644 --- a/buildsystems/autotools/Makefile.am +++ b/buildsystems/autotools/Makefile.am @@ -1,6 +1,7 @@ EXTRA_DIST = \ $(autotoolsdata_DATA) \ - gtk-doc.m4 + gtk-doc.m4 \ + meson.build CLEANFILES = gtk-doc.flat.make gtk-doc.no-xslt-flat.make diff --git a/buildsystems/autotools/meson.build b/buildsystems/autotools/meson.build index c39d3fb..17bbcbd 100644 --- a/buildsystems/autotools/meson.build +++ b/buildsystems/autotools/meson.build @@ -6,20 +6,35 @@ configure_file( install_dir: bindir, ) -custom_target( - 'gtk-doc.flat.make', - input: 'gtk-doc.make', - output: 'gtk-doc.flat.make', - install: true, - install_dir: pkgdatadir, - capture: true, - command: [ - 'sed', - '-e', - 's/EXTRA_DIST =/EXTRA_DIST +=/', - '@INPUT@', - ] -) +foreach mode : ['', 'no-xslt'] + if mode == '' + nested = '' + flat = '.flat' + else + nested = '.' + mode + flat = nested + '-flat' + endif + + custom_target( + 'gtk-doc' + flat + '.make', + input: 'gtk-doc' + nested + '.make', + output: 'gtk-doc' + flat + '.make', + install: true, + install_dir: pkgdatadir, + capture: true, + command: [ + 'sed', + '-e', + 's/EXTRA_DIST =/EXTRA_DIST +=/', + '@INPUT@', + ] + ) + + install_data( + ['gtk-doc' + nested + '.make'], + install_dir: pkgdatadir, + ) +endforeach custom_target( 'gtk-doc.m4', @@ -34,8 +49,3 @@ custom_target( '@OUTPUT@', ], ) - -install_data( - ['gtk-doc.make'], - install_dir: pkgdatadir, -) diff --git a/buildsystems/cmake/Makefile.am b/buildsystems/cmake/Makefile.am index a11e89b..5d5b7cb 100644 --- a/buildsystems/cmake/Makefile.am +++ b/buildsystems/cmake/Makefile.am @@ -1,7 +1,8 @@ EXTRA_DIST = \ GtkDocConfig.cmake \ GtkDocConfigVersion.cmake.in \ - GtkDocScanGObjWrapper.cmake + GtkDocScanGObjWrapper.cmake \ + meson.build CLEANFILES = \ GtkDocConfigVersion.cmake diff --git a/help/Makefile.am b/help/Makefile.am index 6690244..54a15bd 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -4,4 +4,6 @@ if HAVE_YELP_TOOLS SUBDIRS = manual endif +EXTRA_DIST = meson.build + -include $(top_srcdir)/git.mk diff --git a/help/manual/Makefile.am b/help/manual/Makefile.am index b56fa4d..4da1c37 100644 --- a/help/manual/Makefile.am +++ b/help/manual/Makefile.am @@ -14,4 +14,6 @@ CLEANFILES = $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES) GITIGNOREFILES = ??_??/$(HELP_ID).xml ??/$(HELP_ID).xml +EXTRA_DIST = meson.build + -include $(top_srcdir)/git.mk diff --git a/help/manual/meson.build b/help/manual/meson.build index 6f8ec2c..7e59ab0 100644 --- a/help/manual/meson.build +++ b/help/manual/meson.build @@ -4,6 +4,6 @@ gtkdoc_help_sources = [ ] gnome.yelp( - package_name, + package_name + '-manual', sources: gtkdoc_help_sources, ) diff --git a/meson.build b/meson.build index e821e35..0345989 100644 --- a/meson.build +++ b/meson.build @@ -99,7 +99,12 @@ binary_in.set('datarootdir', join_paths('${prefix}', get_option('datadir'))) binary_in.set('datadir', '${datarootdir}') binary_in.set('PACKAGE', package_name) - +binary_in.set('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/gtk-doc/issues') +binary_in.set('PACKAGE_NAME', package_name) +binary_in.set('PACKAGE_STRING', package_name) +binary_in.set('PACKAGE_TARNAME', package_name) +binary_in.set('PACKAGE_URL', 'https://gitlab.gnome.org/GNOME/gtk-doc') +binary_in.set('PACKAGE_VERSION', version) binary_in.set('VERSION', version) foreach binary: gtkdoc_binaires diff --git a/tests/Makefile.am b/tests/Makefile.am index d2d0b86..c266ce9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -51,6 +51,16 @@ coverage: python3-coverage html --include="*/gtkdoc/*.py"; \ python3-coverage report --include="*/gtkdoc/*.py" +EXTRA_DIST += \ + gtkdocentities.ent.in \ + helpers/gtkdoc_check_runner.py \ + helpers/gtkdoc_fixxref_runner.py \ + helpers/gtkdoc_mkdb_runner.py \ + helpers/gtkdoc_mkhtml_runner.py \ + helpers/gtkdoc_scan_runner.py \ + helpers/gtkdoc_scangobj_runner.py \ + helpers/meson.build \ + meson.build .PHONY: snapshot diff --git a/tests/annotations/Makefile.am b/tests/annotations/Makefile.am index 1653011..1bd72fd 100644 --- a/tests/annotations/Makefile.am +++ b/tests/annotations/Makefile.am @@ -8,4 +8,6 @@ check-local: clean endif +EXTRA_DIST = meson.build + -include $(top_srcdir)/git.mk diff --git a/tests/annotations/docs/Makefile.am b/tests/annotations/docs/Makefile.am index 8cf5c7b..262ba91 100644 --- a/tests/annotations/docs/Makefile.am +++ b/tests/annotations/docs/Makefile.am @@ -72,4 +72,7 @@ TESTS_ENVIRONMENT = \ PATH=$(abs_top_builddir):$(srcdir):$(PATH) endif +EXTRA_DIST += meson.build +EXTRA_DIST += xml/meson.build + -include $(top_srcdir)/git.mk diff --git a/tests/annotations/docs/meson.build b/tests/annotations/docs/meson.build index 2ec4b8f..bc27cf8 100644 --- a/tests/annotations/docs/meson.build +++ b/tests/annotations/docs/meson.build @@ -21,6 +21,8 @@ annotations_test_output_dir = join_paths( annotations_test_html_data = [] +subdir('xml') + test( 'test-annotations-scan', python_prg, diff --git a/tests/annotations/docs/xml/meson.build b/tests/annotations/docs/xml/meson.build new file mode 100644 index 0000000..94eca1a --- /dev/null +++ b/tests/annotations/docs/xml/meson.build @@ -0,0 +1,5 @@ +configure_file( + input: join_paths(srcdir, 'tests', 'gtkdocentities.ent.in'), + output: 'gtkdocentities.ent', + configuration: binary_in, +) diff --git a/tests/bugs/Makefile.am b/tests/bugs/Makefile.am index ad34ec6..1bd72fd 100644 --- a/tests/bugs/Makefile.am +++ b/tests/bugs/Makefile.am @@ -8,5 +8,6 @@ check-local: clean endif +EXTRA_DIST = meson.build -include $(top_srcdir)/git.mk diff --git a/tests/bugs/docs/Makefile.am b/tests/bugs/docs/Makefile.am index 2f33b00..4b0dd4e 100644 --- a/tests/bugs/docs/Makefile.am +++ b/tests/bugs/docs/Makefile.am @@ -74,4 +74,7 @@ TESTS_ENVIRONMENT = \ PATH=$(abs_top_builddir):$(srcdir):$(PATH) endif +EXTRA_DIST += meson.build +EXTRA_DIST += xml/meson.build + -include $(top_srcdir)/git.mk diff --git a/tests/bugs/docs/meson.build b/tests/bugs/docs/meson.build index e70f1c1..dc2e50b 100644 --- a/tests/bugs/docs/meson.build +++ b/tests/bugs/docs/meson.build @@ -21,6 +21,14 @@ bugs_test_output_dir = join_paths( bugs_test_html_data = [] +subdir('xml') + +configure_file( + input: join_paths(bugs_test_docs_dir, 'tester-sections.txt'), + output: 'tester-sections.txt', + copy: true, +) + test( 'test-bugs-scan', python_prg, diff --git a/tests/bugs/docs/xml/meson.build b/tests/bugs/docs/xml/meson.build new file mode 100644 index 0000000..94eca1a --- /dev/null +++ b/tests/bugs/docs/xml/meson.build @@ -0,0 +1,5 @@ +configure_file( + input: join_paths(srcdir, 'tests', 'gtkdocentities.ent.in'), + output: 'gtkdocentities.ent', + configuration: binary_in, +) diff --git a/tests/empty/Makefile.am b/tests/empty/Makefile.am index c854e6a..6695f6c 100644 --- a/tests/empty/Makefile.am +++ b/tests/empty/Makefile.am @@ -9,5 +9,6 @@ check-local: clean endif +EXTRA_DIST = meson.build -include $(top_srcdir)/git.mk diff --git a/tests/empty/docs/Makefile.am b/tests/empty/docs/Makefile.am index 3fb5d69..f126d44 100644 --- a/tests/empty/docs/Makefile.am +++ b/tests/empty/docs/Makefile.am @@ -83,4 +83,7 @@ CLEANFILES += \ tester-docs.xml \ tester-sections.txt +EXTRA_DIST += meson.build +EXTRA_DIST += xml/meson.build + -include $(top_srcdir)/git.mk diff --git a/tests/empty/docs/meson.build b/tests/empty/docs/meson.build index f05939c..d002f43 100644 --- a/tests/empty/docs/meson.build +++ b/tests/empty/docs/meson.build @@ -21,6 +21,8 @@ empty_test_output_dir = join_paths( empty_test_html_data = [] +subdir('xml') + test( 'test-empty-scan', python_prg, diff --git a/tests/empty/docs/xml/meson.build b/tests/empty/docs/xml/meson.build new file mode 100644 index 0000000..94eca1a --- /dev/null +++ b/tests/empty/docs/xml/meson.build @@ -0,0 +1,5 @@ +configure_file( + input: join_paths(srcdir, 'tests', 'gtkdocentities.ent.in'), + output: 'gtkdocentities.ent', + configuration: binary_in, +) diff --git a/tests/fail/Makefile.am b/tests/fail/Makefile.am index ad34ec6..1bd72fd 100644 --- a/tests/fail/Makefile.am +++ b/tests/fail/Makefile.am @@ -8,5 +8,6 @@ check-local: clean endif +EXTRA_DIST = meson.build -include $(top_srcdir)/git.mk diff --git a/tests/fail/docs/Makefile.am b/tests/fail/docs/Makefile.am index c715afd..1588ec4 100644 --- a/tests/fail/docs/Makefile.am +++ b/tests/fail/docs/Makefile.am @@ -72,4 +72,7 @@ TESTS_ENVIRONMENT = \ PATH=$(abs_top_builddir):$(srcdir):$(PATH) endif +EXTRA_DIST += meson.build +EXTRA_DIST += xml/meson.build + -include $(top_srcdir)/git.mk diff --git a/tests/fail/docs/meson.build b/tests/fail/docs/meson.build index 8a5b9c2..f578b9b 100644 --- a/tests/fail/docs/meson.build +++ b/tests/fail/docs/meson.build @@ -21,6 +21,8 @@ fail_test_output_dir = join_paths( fail_test_html_data = [] +subdir('xml') + test( 'test-fail-scan', python_prg, diff --git a/tests/fail/docs/xml/meson.build b/tests/fail/docs/xml/meson.build new file mode 100644 index 0000000..94eca1a --- /dev/null +++ b/tests/fail/docs/xml/meson.build @@ -0,0 +1,5 @@ +configure_file( + input: join_paths(srcdir, 'tests', 'gtkdocentities.ent.in'), + output: 'gtkdocentities.ent', + configuration: binary_in, +) diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am index 7eecd38..d12bf66 100644 --- a/tests/gobject/Makefile.am +++ b/tests/gobject/Makefile.am @@ -8,6 +8,8 @@ check-local: clean endif -EXTRA_DIST = examples/gobject.c +EXTRA_DIST = \ + examples/gobject.c \ + meson.build -include $(top_srcdir)/git.mk diff --git a/tests/gobject/docs/Makefile.am b/tests/gobject/docs/Makefile.am index bae229d..3c2eb7a 100644 --- a/tests/gobject/docs/Makefile.am +++ b/tests/gobject/docs/Makefile.am @@ -77,4 +77,8 @@ TESTS_ENVIRONMENT = \ PATH=$(abs_top_builddir):$(srcdir):$(PATH) endif +EXTRA_DIST += meson.build +EXTRA_DIST += images/meson.build +EXTRA_DIST += xml/meson.build + -include $(top_srcdir)/git.mk diff --git a/tests/gobject/docs/meson.build b/tests/gobject/docs/meson.build index e1e6acc..be8c01c 100644 --- a/tests/gobject/docs/meson.build +++ b/tests/gobject/docs/meson.build @@ -21,6 +21,14 @@ gobject_test_output_dir = join_paths( gobject_test_html_data = [] +subdir('xml') + +configure_file( + input: join_paths(gobject_test_docs_dir, 'tester-sections.txt'), + output: 'tester-sections.txt', + copy: true, +) + test( 'test-gobject-scan', python_prg, diff --git a/tests/gobject/docs/xml/meson.build b/tests/gobject/docs/xml/meson.build new file mode 100644 index 0000000..94eca1a --- /dev/null +++ b/tests/gobject/docs/xml/meson.build @@ -0,0 +1,5 @@ +configure_file( + input: join_paths(srcdir, 'tests', 'gtkdocentities.ent.in'), + output: 'gtkdocentities.ent', + configuration: binary_in, +) diff --git a/tests/gobject/src/Makefile.am b/tests/gobject/src/Makefile.am index a65fe01..2c13a0d 100644 --- a/tests/gobject/src/Makefile.am +++ b/tests/gobject/src/Makefile.am @@ -14,4 +14,6 @@ AM_CPPFLAGS = $(TEST_DEPS_CFLAGS) endif +EXTRA_DIST = meson.build + -include $(top_srcdir)/git.mk diff --git a/tests/gtkdocentities.ent.in b/tests/gtkdocentities.ent.in new file mode 100644 index 0000000..c4ba2bf --- /dev/null +++ b/tests/gtkdocentities.ent.in @@ -0,0 +1,7 @@ +<!ENTITY package "${PACKAGE}"> +<!ENTITY package_bugreport "${PACKAGE_BUGREPORT}"> +<!ENTITY package_name "${PACKAGE_NAME}"> +<!ENTITY package_string "${PACKAGE_STRING}"> +<!ENTITY package_tarname "${PACKAGE_TARNAME}"> +<!ENTITY package_url "${PACKAGE_URL}"> +<!ENTITY package_version "${PACKAGE_VERSION}"> diff --git a/tests/program/Makefile.am b/tests/program/Makefile.am index 1653011..1bd72fd 100644 --- a/tests/program/Makefile.am +++ b/tests/program/Makefile.am @@ -8,4 +8,6 @@ check-local: clean endif +EXTRA_DIST = meson.build + -include $(top_srcdir)/git.mk diff --git a/tests/program/docs/Makefile.am b/tests/program/docs/Makefile.am index 468c01c..e031c01 100644 --- a/tests/program/docs/Makefile.am +++ b/tests/program/docs/Makefile.am @@ -73,4 +73,7 @@ TESTS_ENVIRONMENT = \ PATH=$(abs_top_builddir):$(srcdir):$(PATH) endif +EXTRA_DIST += meson.build +EXTRA_DIST += xml/meson.build + -include $(top_srcdir)/git.mk diff --git a/tests/program/docs/meson.build b/tests/program/docs/meson.build index 1520e7e..5806fc2 100644 --- a/tests/program/docs/meson.build +++ b/tests/program/docs/meson.build @@ -21,6 +21,8 @@ program_test_output_dir = join_paths( program_test_html_data = [] +subdir('xml') + test( 'test-program-scan', python_prg, diff --git a/tests/program/docs/xml/meson.build b/tests/program/docs/xml/meson.build new file mode 100644 index 0000000..94eca1a --- /dev/null +++ b/tests/program/docs/xml/meson.build @@ -0,0 +1,5 @@ +configure_file( + input: join_paths(srcdir, 'tests', 'gtkdocentities.ent.in'), + output: 'gtkdocentities.ent', + configuration: binary_in, +) diff --git a/tests/repro/Makefile.am b/tests/repro/Makefile.am index ad34ec6..1bd72fd 100644 --- a/tests/repro/Makefile.am +++ b/tests/repro/Makefile.am @@ -8,5 +8,6 @@ check-local: clean endif +EXTRA_DIST = meson.build -include $(top_srcdir)/git.mk diff --git a/tests/repro/docs/Makefile.am b/tests/repro/docs/Makefile.am index ed9bf2a..211332c 100644 --- a/tests/repro/docs/Makefile.am +++ b/tests/repro/docs/Makefile.am @@ -75,4 +75,6 @@ endif CLEANFILES += \ tester-sections.txt +EXTRA_DIST += meson.build + -include $(top_srcdir)/git.mk diff --git a/tests/repro/docs/meson.build b/tests/repro/docs/meson.build index 08a0f08..09554f9 100644 --- a/tests/repro/docs/meson.build +++ b/tests/repro/docs/meson.build @@ -21,6 +21,8 @@ repro_test_output_dir = join_paths( repro_test_html_data = [] +subdir('xml') + test( 'test-repro-scan', python_prg, |