Skip to content

meson: Error if fail to extract version number from zstd.h #1602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
terrelln merged 2 commits into from
Apr 30, 2019
Merged

meson: Error if fail to extract version number from zstd.h #1602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4107b73
meson: Update default project version
tesuji Apr 26, 2019
5d900ff
meson: Error out if fail to extracted version number
tesuji Apr 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,19 +184,19 @@ 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
&& 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:
Expand Down
11 changes: 4 additions & 7 deletions build/meson/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ project('zstd',
'cpp_std=c++11',
'buildtype=release'
],
version: '1.3.8',
version: 'DUMMY',
meson_version: '>=0.47.0')

cc = meson.get_compiler('c')
Expand All @@ -43,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
Expand Down