[meson] Make it work on autotools dist

This commit is contained in:
Ebrahim Byagowi 2020-03-12 13:41:10 +03:30
parent 47a047bd16
commit 1dd3896688
4 changed files with 8 additions and 1 deletions

View File

@ -48,11 +48,12 @@ jobs:
- image: ubuntu:19.10 - image: ubuntu:19.10
steps: steps:
- checkout - checkout
- run: apt update && apt install -y git ninja-build binutils libtool autoconf automake make gcc g++ pkg-config ragel gtk-doc-tools libfontconfig1-dev libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip - run: apt update && apt install -y git ninja-build binutils libtool autoconf automake make gcc g++ pkg-config ragel gtk-doc-tools libfontconfig1-dev libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip meson
- run: pip install fonttools - run: pip install fonttools
- run: ./autogen.sh - run: ./autogen.sh
- run: make -j32 - run: make -j32
- run: make distcheck || .ci/fail.sh - run: make distcheck || .ci/fail.sh
- run: rm harfbuzz-* && make distdir && cd harfbuzz-* && meson build && ninja -Cbuild test
alpine-O3-Os-NOMMAP: alpine-O3-Os-NOMMAP:
docker: docker:

View File

@ -17,6 +17,9 @@ EXTRA_DIST = \
RELEASING.md \ RELEASING.md \
TESTING.md \ TESTING.md \
meson.build \ meson.build \
meson_options.txt \
meson-cc-tests/intel-atomic-primitives-test.c \
meson-cc-tests/solaris-atomic-operations.c \
replace-enum-strings.cmake \ replace-enum-strings.cmake \
mingw-configure.sh \ mingw-configure.sh \
mingw-ldd.py \ mingw-ldd.py \

View File

@ -13,6 +13,7 @@ TESTS =
check_PROGRAMS = check_PROGRAMS =
EXTRA_DIST += harfbuzz.cc EXTRA_DIST += harfbuzz.cc
EXTRA_DIST += meson.build
# Convenience targets: # Convenience targets:
lib: $(BUILT_SOURCES) libharfbuzz.la lib: $(BUILT_SOURCES) libharfbuzz.la

View File

@ -6,6 +6,8 @@ CLEANFILES =
DISTCLEANFILES = DISTCLEANFILES =
MAINTAINERCLEANFILES = MAINTAINERCLEANFILES =
EXTRA_DIST += meson.build
include Makefile.sources include Makefile.sources
# Convenience targets: # Convenience targets: