facebook/zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1602 from lzutao/meson

Browse Source 
meson: Update default project version
This commit is contained in:
Nick Terrell 2019-04-30 08:45:00 -07:00 committed by GitHub
commit f8178ec74e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -184,19 +184,19 @@ matrix:
compiler: clang compiler: clang
install: install:
- sudo apt-get install -qq liblz4-dev valgrind tree - 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 && unzip ~/ninja.zip -d ~/.local/bin
- travis_retry curl -o ~/get-pip.py -L 'https://bootstrap.pypa.io/get-pip.py' - travis_retry curl -o ~/get-pip.py -L 'https://bootstrap.pypa.io/get-pip.py'
&& 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:

11
build/meson/meson.build
View File

@ -16,7 +16,7 @@ project('zstd',
'cpp_std=c++11', 'cpp_std=c++11',
'buildtype=release' 'buildtype=release'
], ],
version: '1.3.8', version: 'DUMMY',
meson_version: '>=0.47.0') meson_version: '>=0.47.0')
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
@ -43,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