diff --git a/.github/workflows/CITest.yml b/.github/workflows/CITest.yml index c872985ae2..0bbfc98176 100644 --- a/.github/workflows/CITest.yml +++ b/.github/workflows/CITest.yml @@ -93,7 +93,6 @@ jobs: run: | ./make.sh; make check; - mkdir build && mv libcapstone.* build/ && cd build; # sudo make install - name: cmake @@ -103,14 +102,15 @@ jobs: mkdir build && cd build; cmake -DCAPSTONE_INSTALL=1 -DBUILD_SHARED_LIBS=1 ..; cmake --build . --config Release; + cp libcapstone.* ../; # sudo make install; - name: build python binding shell: 'script -q -e -c "bash {0}"' run: | pwd && ls; - mkdir -p ../bindings/python/capstone/lib && cp libcapstone.so.5.* ../bindings/python/capstone/lib/libcapstone.so; - cd ../bindings/python; + mkdir -p bindings/python/capstone/lib && cp libcapstone.so.5.* bindings/python/capstone/lib/libcapstone.so; + cd bindings/python; make && make check ; cd ../..; diff --git a/Makefile b/Makefile index d050c27d2b..aa70b7a166 100644 --- a/Makefile +++ b/Makefile @@ -324,7 +324,6 @@ endif endif API_MAJOR=$(shell echo `grep -e CS_API_MAJOR include/capstone/capstone.h | grep -v = | awk '{print $$3}'` | awk '{print $$1}') -API_MINOR=$(shell echo `grep -e CS_API_MINOR include/capstone/capstone.h | grep -v = | awk '{print $$3}'` | awk '{print $$1}') VERSION_EXT = IS_APPLE := $(shell $(CC) -dM -E - < /dev/null 2> /dev/null | grep __apple_build_version__ | wc -l | tr -d " ") @@ -375,7 +374,7 @@ CFLAGS := $(CFLAGS:-fPIC=) else # Linux, *BSD EXT = so -VERSION_EXT = $(EXT).$(API_MAJOR).$(API_MINOR) +VERSION_EXT = $(EXT).$(API_MAJOR) AR_EXT = a $(LIBNAME)_LDFLAGS += -Wl,-soname,lib$(LIBNAME).$(VERSION_EXT) endif