meson: Error out if fail to extracted version number
This commit is contained in:
+2
-2
@@ -190,13 +190,13 @@ matrix:
|
|||||||
&& python3 ~/get-pip.py --user
|
&& python3 ~/get-pip.py --user
|
||||||
&& pip3 install --user meson
|
&& pip3 install --user meson
|
||||||
script:
|
script:
|
||||||
- meson --buildtype=debug
|
- meson setup --buildtype=debug
|
||||||
-Db_lundef=false
|
-Db_lundef=false
|
||||||
-Dauto_features=enabled
|
-Dauto_features=enabled
|
||||||
-Dbuild_{programs,tests,contrib}=true
|
-Dbuild_{programs,tests,contrib}=true
|
||||||
-Ddefault_library=both
|
-Ddefault_library=both
|
||||||
build/meson builddir
|
build/meson builddir
|
||||||
- cd builddir
|
- pushd builddir
|
||||||
- DESTDIR=./staging ninja install
|
- DESTDIR=./staging ninja install
|
||||||
- tree ./staging
|
- tree ./staging
|
||||||
allow_failures:
|
allow_failures:
|
||||||
|
|||||||
@@ -16,9 +16,7 @@ project('zstd',
|
|||||||
'cpp_std=c++11',
|
'cpp_std=c++11',
|
||||||
'buildtype=release'
|
'buildtype=release'
|
||||||
],
|
],
|
||||||
# Fall-back version in case of extracting version number from
|
version: 'DUMMY',
|
||||||
# `zstd.h` failed.
|
|
||||||
version: '1.4.0',
|
|
||||||
meson_version: '>=0.47.0')
|
meson_version: '>=0.47.0')
|
||||||
|
|
||||||
cc = meson.get_compiler('c')
|
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')
|
GetZstdLibraryVersion_py = files('GetZstdLibraryVersion.py')
|
||||||
r = run_command(python3, GetZstdLibraryVersion_py, zstd_h_file)
|
r = run_command(python3, GetZstdLibraryVersion_py, zstd_h_file)
|
||||||
if r.returncode() == 0
|
if r.returncode() == 0
|
||||||
output = r.stdout().strip()
|
zstd_version = r.stdout().strip()
|
||||||
if output.version_compare('>@0@'.format(zstd_version))
|
message('Project version is now: @0@'.format(zstd_version))
|
||||||
zstd_version = output
|
|
||||||
message('Project version is now: @0@'.format(zstd_version))
|
|
||||||
endif
|
|
||||||
else
|
else
|
||||||
message('Cannot find project version in @0@'.format(zstd_h_file))
|
error('Cannot find project version in @0@'.format(zstd_h_file))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
zstd_libversion = zstd_version
|
zstd_libversion = zstd_version
|
||||||
|
|||||||
Reference in New Issue
Block a user