From 4107b734bd32788b003da6f6b1fcab05f6a6af5b Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Sat, 27 Apr 2019 01:42:22 +0700 Subject: [PATCH 1/2] meson: Update default project version * Update to use ninja v1.9.0 on CI --- .travis.yml | 2 +- build/meson/meson.build | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ad2b4292..1cb9851e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -184,7 +184,7 @@ matrix: compiler: clang install: - sudo apt-get install -qq liblz4-dev valgrind tree - - travis_retry curl -o ~/ninja.zip -L 'https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip' + - travis_retry curl -o ~/ninja.zip -L 'https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip' && unzip ~/ninja.zip -d ~/.local/bin - travis_retry curl -o ~/get-pip.py -L 'https://bootstrap.pypa.io/get-pip.py' && python3 ~/get-pip.py --user diff --git a/build/meson/meson.build b/build/meson/meson.build index 6543158e..59815f03 100644 --- a/build/meson/meson.build +++ b/build/meson/meson.build @@ -16,7 +16,9 @@ project('zstd', 'cpp_std=c++11', 'buildtype=release' ], - version: '1.3.8', + # Fall-back version in case of extracting version number from + # `zstd.h` failed. + version: '1.4.0', meson_version: '>=0.47.0') cc = meson.get_compiler('c') From 5d900ff747118d524734bfefc661be7198c97b3b Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Tue, 30 Apr 2019 13:12:00 +0700 Subject: [PATCH 2/2] meson: Error out if fail to extracted version number --- .travis.yml | 4 ++-- build/meson/meson.build | 13 ++++--------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1cb9851e..d4450ce5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -190,13 +190,13 @@ matrix: && python3 ~/get-pip.py --user && pip3 install --user meson script: - - meson --buildtype=debug + - meson setup --buildtype=debug -Db_lundef=false -Dauto_features=enabled -Dbuild_{programs,tests,contrib}=true -Ddefault_library=both build/meson builddir - - cd builddir + - pushd builddir - DESTDIR=./staging ninja install - tree ./staging allow_failures: diff --git a/build/meson/meson.build b/build/meson/meson.build index 59815f03..190514f5 100644 --- a/build/meson/meson.build +++ b/build/meson/meson.build @@ -16,9 +16,7 @@ project('zstd', 'cpp_std=c++11', 'buildtype=release' ], - # Fall-back version in case of extracting version number from - # `zstd.h` failed. - version: '1.4.0', + version: 'DUMMY', meson_version: '>=0.47.0') cc = meson.get_compiler('c') @@ -45,13 +43,10 @@ zstd_h_file = join_paths(meson.current_source_dir(), '../../lib/zstd.h') GetZstdLibraryVersion_py = files('GetZstdLibraryVersion.py') r = run_command(python3, GetZstdLibraryVersion_py, zstd_h_file) if r.returncode() == 0 - output = r.stdout().strip() - if output.version_compare('>@0@'.format(zstd_version)) - zstd_version = output - message('Project version is now: @0@'.format(zstd_version)) - endif + zstd_version = r.stdout().strip() + message('Project version is now: @0@'.format(zstd_version)) else - message('Cannot find project version in @0@'.format(zstd_h_file)) + error('Cannot find project version in @0@'.format(zstd_h_file)) endif zstd_libversion = zstd_version