Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-31 18:43:28 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Unpin AppVeyor's Meson ##build (#16925)

Browse Source 
* Unpin AppVeyor's Meson
* Don't use absolute path from meson.current_source_dir() with static_library()
This commit is contained in:
Khairul Azhar Kasmiran 2020-05-20 11:55:15 +08:00 committed by GitHub
parent b49609af7f
commit a103293ec4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -69,7 +69,7 @@ install:
- ps: $env:DIST_FOLDER = "radare2-$env:builder-$env:R2_VERSION"
- ps: $env:ARTIFACT_ZIP = "$env:DIST_FOLDER.zip"
# Download required packages
- cmd: if defined BUILD_DIR ( %PYTHON%\python.exe -m pip install meson==0.54.0 )
- cmd: if defined BUILD_DIR ( %PYTHON%\python.exe -m pip install meson )
- cmd: if defined NINJA_URL ( powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; wget %NINJA_URL% -OutFile ninja.zip" && unzip ninja.zip )
# Build scripts

8
shlr/meson.build
View File

@ -6,7 +6,7 @@ if not capstone_dep.found() or not get_option('use_sys_capstone')
if get_option('capstone_in_builddir')
capstone_path = join_paths(meson.current_build_dir(), 'capstone')
else
capstone_path = join_paths(meson.current_source_dir(), 'capstone')
capstone_path = 'capstone'
endif
res = run_command(py3_exe, '-c', '__import__("sys").exit(__import__("os").path.exists("@0@"))'.format(capstone_path))
@ -236,8 +236,8 @@ sdb_gen_cmd = [
tree_sitter_dep = dependency('tree-sitter', required: false)
if not tree_sitter_dep.found() or not get_option('use_sys_tree_sitter')
message('Use bundled tree-sitter')
tree_sitter_path = join_paths(meson.current_source_dir(), 'tree-sitter')
tree_sitter_vc_path = join_paths(meson.current_source_dir(), 'tree-sitter.vc')
tree_sitter_path = 'tree-sitter'
tree_sitter_vc_path = 'tree-sitter.vc'
if get_option('tree-sitter-sync')
if not git_exe.found()
error('Cannot sync tree-sitter library. Either provide tree-sitter in ./shlr/tree-sitter or install git, so it can be downloaded')
@ -292,7 +292,7 @@ endif
# new radare2 shell parser
shell_parser_path = join_paths(meson.current_source_dir(), 'radare2-shell-parser')
shell_parser_path = 'radare2-shell-parser'
shell_parser_files = [
join_paths(shell_parser_path, 'src/parser.c'),
join_paths(shell_parser_path, 'src/scanner.c'),