Merge branch 'wip/smcv/dist-meson-build' into 'master'

build: Distribute more files from git in official release tarballs

Closes #109

See merge request GNOME/gtk-doc!55

22 files changed, 90 insertions, 3 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f84030..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
   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/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/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/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/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/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/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/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/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/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