walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[meson] Remove amalgam build option 

Fixes #2444
This commit is contained in:
Ebrahim Byagowi 2020-06-04 03:19:53 +04:30
parent 5293fdba23
commit 870304df76
3 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/config.yml
View File

@ -41,7 +41,7 @@ jobs:
- run: export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig" && ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-coretext --with-graphite2 - run: export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig" && ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-coretext --with-graphite2
- run: make -j4 - run: make -j4
- run: make check || .ci/fail.sh - run: make check || .ci/fail.sh
- run: make clean && meson build -Dcoretext=enabled -Damalgam=true && ninja -Cbuild test - run: make clean && meson build -Dcoretext=enabled && ninja -Cbuild test
distcheck: distcheck:
docker: docker:
@ -222,9 +222,7 @@ jobs:
- run: pip3 install fonttools --upgrade - run: pip3 install fonttools --upgrade
- run: pip3 install git+https://github.com/mesonbuild/meson # use C linker, remove when meson 0.55 is released - run: pip3 install git+https://github.com/mesonbuild/meson # use C linker, remove when meson 0.55 is released
- run: meson build && ninja -Cbuild test && rm -rf build - run: meson build && ninja -Cbuild test && rm -rf build
# test amalgam build # test meson unity builds
- run: meson build -Damalgam=true && ninja -Cbuild && rm -rf build
# test meson's own unity feature also
- run: meson build --unity on && ninja -Cbuild && rm -rf build - run: meson build --unity on && ninja -Cbuild && rm -rf build
# test experimental APIs # test experimental APIs
- run: meson build -Dexperimental_api=true && ninja -Cbuild test && rm -rf build - run: meson build -Dexperimental_api=true && ninja -Cbuild test && rm -rf build

2
meson_options.txt
View File

@ -34,5 +34,3 @@ option('with_libstdcxx', type: 'boolean', value: false,
description: 'Allow linking with libstdc++') description: 'Allow linking with libstdc++')
option('experimental_api', type: 'boolean', value: false, option('experimental_api', type: 'boolean', value: false,
description: 'Enable experimental APIs') description: 'Enable experimental APIs')
option('amalgam', type: 'boolean', value: false,
description : 'Enable amalgam builds')

7
src/meson.build
View File

@ -346,11 +346,6 @@ if conf.get('HAVE_CORETEXT', 0) == 1
hb_headers += hb_coretext_headers hb_headers += hb_coretext_headers
endif endif
if get_option('amalgam')
# replace the array if is amalgam build
hb_sources = ['harfbuzz.cc']
endif
have_icu = conf.get('HAVE_ICU', 0) == 1 have_icu = conf.get('HAVE_ICU', 0) == 1
have_icu_builtin = conf.get('HAVE_ICU_BUILTIN', 0) == 1 have_icu_builtin = conf.get('HAVE_ICU_BUILTIN', 0) == 1
@ -671,9 +666,7 @@ if get_option('tests').enabled()
env.set('srcdir', meson.current_source_dir()) env.set('srcdir', meson.current_source_dir())
env.set('builddir', meson.current_build_dir()) env.set('builddir', meson.current_build_dir())
env.set('libs', meson.current_build_dir()) # TODO: Merge this with builddir after autotools removal env.set('libs', meson.current_build_dir()) # TODO: Merge this with builddir after autotools removal
if not get_option('amalgam')
env.set('HBSOURCES', ' '.join(hb_sources)) env.set('HBSOURCES', ' '.join(hb_sources))
endif
env.set('HBHEADERS', ' '.join(hb_headers)) env.set('HBHEADERS', ' '.join(hb_headers))
if cpp.get_id() != 'msvc' and not meson.is_cross_build() # ensure the local tools are usable if cpp.get_id() != 'msvc' and not meson.is_cross_build() # ensure the local tools are usable