shlr/meson.build: use master branch for capstone on meson build too (#10832)

This commit is contained in:
Riccardo Schirone 2018-07-30 08:51:47 +02:00 committed by GitHub
parent c9969157e7
commit d98c5b9080
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions

View File

@ -24,8 +24,8 @@ else
CS_TAR=
CS_URL=$(GIT_PREFIX)github.com/aquynh/capstone.git
CS_UPD=20180723
# NOTE: when you update CS_TIP or CS_BRA, also update them in shlr/meson.build
CS_BRA=master
# NOTE: when you update CS_TIP, also update it in shlr/meson.build
CS_TIP=782ea67e17a391ca0d3faafdc365b335a1a8930a
# REVERT THIS COMMIT BECAUSE ITS WRONG
CS_REV=

View File

@ -10,11 +10,14 @@ if not capstone_dep.found() or not get_option('use_sys_capstone')
error('Cannot load capstone library. Either provide capstone in ./shlr/capstone or install git, so it can be downloaded')
endif
# NOTE: when you update CS_TIP, also update it in shlr/Makefile
# NOTE: when you update CS_TIP or CS_BRA, also update them in shlr/Makefile
CS_TIP = '782ea67e17a391ca0d3faafdc365b335a1a8930a'
CS_BRA = 'master'
message('Cloning capstone next branch, commit ' + CS_TIP + ', into ' + capstone_path)
git_cmd = 'clone -b next https://github.com/aquynh/capstone.git @0@'.format(capstone_path)
capstone_git_user = 'aquynh'
message('Cloning capstone ' + CS_BRA + ' branch, commit ' + CS_TIP + ', into ' + capstone_path)
git_cmd = 'clone -b @0@ https://github.com/@1@/capstone.git @2@'.format(CS_BRA, capstone_git_user, capstone_path)
clone_cmd = run_command(git_exe, git_cmd.split())
if clone_cmd.returncode() != 0
error('Cannot execute git clone command')