From e03e057a51e95266bf509ce75ba1d39fbfe1eb26 Mon Sep 17 00:00:00 2001 From: Dengke Tang Date: Mon, 7 Nov 2022 19:06:37 -0800 Subject: [PATCH] just use the php from env --- Makefile.frag.w32 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile.frag.w32 b/Makefile.frag.w32 index 7dec0f7..673ae17 100644 --- a/Makefile.frag.w32 +++ b/Makefile.frag.w32 @@ -1,7 +1,5 @@ CMAKE=cmake.exe -COMPOSER_PHAR=C:\ProgramData\ComposerSetup\bin\composer.phar -PHP_BINARY=$(PHP_PREFIX)\php.exe CMAKE_CONFIGURE = $(CMAKE) -DCMAKE_INSTALL_PREFIX=$(AWSCRT_DIR)\build\install -DCMAKE_PREFIX_PATH=$(AWSCRT_DIR)\build\install -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) CMAKE_BUILD = $(CMAKE) --build @@ -32,6 +30,6 @@ $(AWSCRT_DIR)\ext\api.h : $(AWSCRT_DIR)\src\api.h # Use PHPUnit and composer to run tests test-awscrt: install $(AWSCRT_DIR)\src\api.h $(BUILD_DIR)\php_awscrt.dll curl -o composer-setup.php https://getcomposer.org/installer - $(PHP_BINARY) .\composer-setup.php - $(PHP_BINARY) -c $(AWSCRT_DIR)\php-win.ini .\composer.phar --working-dir=$(AWSCRT_DIR) update - $(PHP_BINARY) -c $(AWSCRT_DIR)\php-win.ini .\composer.phar --working-dir=$(AWSCRT_DIR) run test-win + php .\composer-setup.php + php -c $(AWSCRT_DIR)\php-win.ini .\composer.phar --working-dir=$(AWSCRT_DIR) update + php -c $(AWSCRT_DIR)\php-win.ini .\composer.phar --working-dir=$(AWSCRT_DIR) run test-win