Skip to content

igvm_c: fix macOS compatibility for Makefile and post_process.sh #123

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

Open
luigix25 wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −8
Open

igvm_c: fix macOS compatibility for Makefile and post_process.sh #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion igvm_c/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ IGVM_LIBS = $(shell pkg-config --libs --static $(UNINSTALLED_PC))
IGVM_LIBS_STATIC = $(subst $(IGVM_LIBS), -ligvm, $(LIBIGVM))

# Determine igvm crate version from Cargo.toml
VERSION = $(shell grep -oP "(?<=version = \").+(?=\")" $(IGVM_DIR)/igvm/Cargo.toml)
VERSION = $(shell sed -n 's/^version = "\(.*\)"/\1/p' $(IGVM_DIR)/igvm/Cargo.toml)

.PHONY: all build test clean install

Expand Down
16 changes: 9 additions & 7 deletions igvm_c/scripts/post_process.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
# cbindgen configuration files and annotations.
set -e

sed -i -e 's/INVALID = 0/IGVM_INVALID = 0/g' \
-e 's/RESERVED_DO_NOT_USE = /IGVM_RESERVED_DO_NOT_USE = /g' \
-e 's/RequiredMemoryFlags/IgvmRequiredMemoryFlags/g' \
-e 's/MemoryMapEntryFlags/IgvmMemoryMapEntryFlags/g' \
$1/igvm_defs.h
sed -i.bak -e 's/INVALID = 0/IGVM_INVALID = 0/g' \
-e 's/RESERVED_DO_NOT_USE = /IGVM_RESERVED_DO_NOT_USE = /g' \
-e 's/RequiredMemoryFlags/IgvmRequiredMemoryFlags/g' \
-e 's/MemoryMapEntryFlags/IgvmMemoryMapEntryFlags/g' \
"$1/igvm_defs.h"
rm -f "$1/igvm_defs.h.bak"

sed -i -e 's/ HEADER_SECTION_/ IGVM_HEADER_SECTION_/g' \
$1/igvm.h
sed -i.bak -e 's/ HEADER_SECTION_/ IGVM_HEADER_SECTION_/g' \
"$1/igvm.h"
rm -f "$1/igvm.h.bak"