mirrors/awslabs_aws-crt-php
1
0
Fork 0
mirror of https://github.com/awslabs/aws-crt-php.git synced 2026-08-19 02:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Passing the src and build directories from Make to CMake

Browse Source
This commit is contained in:
Damian Vicino
2022-02-14 16:23:40 -05:00
parent 3942776a8c
commit e498329a53
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.frag
+22 -15
View File
@@ -1,5 +1,5 @@
INT_DIR=build/install INT_DIR=$(builddir)/install
GENERATE_STUBS=$(shell expr `php --version | head -1 | cut -f 2 -d' '` \>= 7.1) GENERATE_STUBS=$(shell expr `php --version | head -1 | cut -f 2 -d' '` \>= 7.1)
CMAKE = cmake3 CMAKE = cmake3
@@ -18,6 +18,8 @@ ifneq (OFF,$(USE_OPENSSL))
endif endif
CMAKE_CONFIGURE = $(CMAKE) \ CMAKE_CONFIGURE = $(CMAKE) \
-DCMAKE_SOURCE_DIR=$(srcdir) \
-DCMAKE_BINARY_DIR=$(builddir) \
-DCMAKE_INSTALL_PREFIX=$(INT_DIR) \ -DCMAKE_INSTALL_PREFIX=$(INT_DIR) \
-DBUILD_TESTING=OFF \ -DBUILD_TESTING=OFF \
-DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \ -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \
@@ -31,41 +33,46 @@ all: extension
.PHONY: all extension .PHONY: all extension
# configure for static aws-crt-ffi.a # configure for static aws-crt-ffi.a
build/aws-crt-ffi-static/CMakeCache.txt: $(builddir)/aws-crt-ffi-static/CMakeCache.txt:
$(CMAKE_CONFIGURE) -Hcrt/aws-crt-ffi -Bbuild/aws-crt-ffi-static -DBUILD_SHARED_LIBS=OFF $(CMAKE_CONFIGURE) -H$(srcdir)/crt/aws-crt-ffi -B$(builddir)/aws-crt-ffi-static -DBUILD_SHARED_LIBS=OFF
# build static libaws-crt-ffi.a # build static libaws-crt-ffi.a
build/aws-crt-ffi-static/libaws-crt-ffi.a: build/aws-crt-ffi-static/CMakeCache.txt $(builddir)/aws-crt-ffi-static/libaws-crt-ffi.a: $(builddir)/aws-crt-ffi-static/CMakeCache.txt
$(CMAKE_BUILD) build/aws-crt-ffi-static $(CMAKE_TARGET) $(CMAKE_BUILD) $(builddir)/aws-crt-ffi-static $(CMAKE_TARGET)
# PHP extension target # PHP extension target
extension: ext/awscrt.lo extension: $(builddir)/ext/awscrt.lo
# Force the crt object target to depend on the CRT static library # Force the crt object target to depend on the CRT static library
ext/awscrt.lo: ext/awscrt.c $(builddir)/ext/awscrt.lo: $(builddir)/ext/awscrt.c
ext/awscrt.c: build/aws-crt-ffi-static/libaws-crt-ffi.a ext/api.h ext/awscrt_arginfo.h $(builddir)/ext/awscrt.c: $(builddir)/aws-crt-ffi-static/libaws-crt-ffi.a $(builddir)/ext/api.h $(builddir)/ext/awscrt_arginfo.h
ext/awscrt_arginfo.h: ext/awscrt.stub.php gen_stub.php $(builddir)/ext/awscrt_arginfo.h: $(srcdir)/ext/awscrt.stub.php $(srcdir)/gen_stub.php
ifeq ($(GENERATE_STUBS),1) ifeq ($(GENERATE_STUBS),1)
# generate awscrt_arginfo.h # generate awscrt_arginfo.h
php gen_stub.php --minimal-arginfo ext/awscrt.stub.php mkdir -p $(builddir)/ext && php $(srcdir)/gen_stub.php --minimal-arginfo $(srcdir)/ext/awscrt.stub.php
endif endif
# transform/install api.h from FFI lib # transform/install api.h from FFI lib
src/api.h: crt/aws-crt-ffi/src/api.h $(srcdir)/src/api.h: $(srcdir)/crt/aws-crt-ffi/src/api.h
php gen_api.php crt/aws-crt-ffi/src/api.h > src/api.h php $(srcdir)/gen_api.php $(srcdir)/crt/aws-crt-ffi/src/api.h > $(srcdir)/src/api.h
# install api.h to ext/ as well # install api.h to ext/ as well
ext/api.h : src/api.h $(builddir)/ext/api.h : $(srcdir)/src/api.h
cp -v src/api.h ext/api.h mkdir -p $(builddir)/ext && cp -v $(srcdir)/src/api.h $(srcdir)/ext/api.h
ext/php_aws_crt.h: ext/awscrt_arginfo.h ext/api.h $(builddir)/ext/php_aws_crt.h: $(srcdir)/ext/awscrt_arginfo.h $(srcdir)/ext/api.h
vendor/bin/phpunit: vendor/bin/phpunit:
cp -v $(srcdir)/composer.json $(builddir)
composer update composer update
test-extension: vendor/bin/phpunit extension test-extension: vendor/bin/phpunit extension
cp -v $(srcdir)/composer.json $(builddir)
cp -vr $(srcdir)/src $(builddir)
cp -vr $(srcdir)/tests $(builddir)
cp -v $(srcdir)/run_tests $(builddir)
composer run test-extension composer run test-extension
# Use PHPUnit to run tests # Use PHPUnit to run tests
config.m4
+2 -2
View File
@@ -15,9 +15,9 @@ if test "$PHP_AWSCRT" != "no"; then
else else
platform_tls_libs="-ls2n -lcrypto" platform_tls_libs="-ls2n -lcrypto"
fi fi
CRT_LIBPATHS="-L${cwd}/build/install/lib -L${cwd}/build/install/lib64" CRT_LIBPATHS="-L${cwd}/install/lib -L${cwd}/install/lib64"
CRT_LIBS="-laws-crt-ffi -laws-c-auth -laws-c-http -laws-c-io -laws-c-cal -laws-c-compression -laws-checksums -laws-c-common ${platform_tls_libs}" CRT_LIBS="-laws-crt-ffi -laws-c-auth -laws-c-http -laws-c-io -laws-c-cal -laws-c-compression -laws-checksums -laws-c-common ${platform_tls_libs}"
PHP_ADD_INCLUDE(${cwd}/build/install/include) PHP_ADD_INCLUDE(${cwd}/install/include)
PHP_EVAL_LIBLINE([$CRT_LIBPATHS $CRT_LIBS], AWSCRT_SHARED_LIBADD) PHP_EVAL_LIBLINE([$CRT_LIBPATHS $CRT_LIBS], AWSCRT_SHARED_LIBADD)
# Shoves the linker line into the Makefile # Shoves the linker line into the Makefile