X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fpecl-ci;a=blobdiff_plain;f=Makefile;h=411aaeaac18116c07622ed93d5d045978aa6f28c;hp=8330ebc090ae9f6355e8f0f3584b6d164f514e2d;hb=HEAD;hpb=63c2c573f9ef2893c223d2d1087c198598e85df3

diff --git a/Makefile b/Makefile
index 8330ebc..411aaea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,23 @@
 export
 
-PHP ?= 7.3
+PHP ?= 8.0
 JOBS ?= 2
 PHP_MIRROR ?= https://php.net/distributions/
 TMPDIR ?= /tmp
 
-makdir := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
+mkfile := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
+makdir := $(dir $(mkfile))
 
-ifdef TRAVIS
-prefix ?= $(HOME)/cache/php-$(PHP)-$(shell env |grep -E '^with_|^enable_' | tr -c '[a-zA-Z_]' -)
-else
-prefix ?= $(TMPDIR)/php-$(PHP)-$(shell env |grep -E '^with_|^enable_' | tr -c '[a-zA-Z_]' -)
+ifeq (,$(findstring printenv,$(MAKECMDGOALS)))
+mkargs := $(shell $(MAKE) -f $(mkfile) printenv | sed -n -e '/=no$$/ d; s/=yes$$//' -e 's,with_,,gp' -e 's,enable_,,gp' | tr -c '[a-zA-Z_]' -)
 endif
+
+prefix ?= $(TMPDIR)/php-$(PHP)-$(mkargs)
 exec_prefix ?= $(prefix)
 bindir = $(exec_prefix)/bin
 srcdir = $(prefix)/src
-ifdef TRAVIS_BUILD_DIR
-curdir ?= $(TRAVIS_BUILD_DIR)
-else
 # CURDIR is a make builtin
 curdir ?= $(CURDIR)
-endif
 
 enable_maintainer_zts ?= no
 enable_debug ?= no
@@ -56,12 +53,19 @@ CPPCHECK_ARGS ?= -v -j $(JOBS) --std=$(CPPCHECK_STD) --enable=$(CPPCHECK_ENABLE)
 .PHONY: all
 all: php
 
+.PHONY: printenv
+printenv:
+	@env | grep -E 'prefix=|dir=' | grep -v config_file_scan_dir | sort
+	@env | grep -E '^PHP|^PECL' | sort
+	@env | grep -E '^with_|^enable_' | grep -Ev 'php_config|config_file_scan_dir' | sort
+
 .PHONY: versions
 versions: $(PHP_RELEASES)
 	grep "^$(PHP)" $< | cut -f1-2
 
 $(PHP_RELEASES): $(makdir)/php-version-url-dist.php $(makdir)/php-version-url-qa.php | $(srcdir)
 	cd $(makdir) && printf "master\tmaster\t%s/fetch-master.sh\n" $$(pwd) >$@
+	curl -sSL "https://php.net/releases/index.php?json&version=8&max=-1" | $(makdir)/php-version-url-dist.php >>$@
 	curl -sSL "https://php.net/releases/index.php?json&version=7&max=-1" | $(makdir)/php-version-url-dist.php >>$@
 	curl -sSL "https://php.net/releases/index.php?json&version=5&max=-1" | $(makdir)/php-version-url-dist.php >>$@
 	curl -sSL "https://qa.php.net/api.php?type=qa-releases&format=json"  | $(makdir)/php-version-url-qa.php   >>$@
@@ -87,7 +91,11 @@ php: check $(bindir)/php | $(PECL_INI)
 	-for EXT_SONAME in $(extdir)/*.so; do \
 		EXT_SONAME=$$(basename $$EXT_SONAME); \
 		if test "$$EXT_SONAME" != "*.so" && ! grep -q extension=$$EXT_SONAME $(PECL_INI); then \
-			echo extension=$$EXT_SONAME >> $(PECL_INI); \
+			if test "$$EXT_SONAME" = "opcache.so"; then \
+				echo zend_extension=$$EXT_SONAME >> $(PECL_INI); \
+			else \
+				echo extension=$$EXT_SONAME >> $(PECL_INI); \
+			fi; \
 		fi \
 	done
 
@@ -111,7 +119,6 @@ $(srcdir) $(extdir) $(with_config_file_scan_dir):
 .PHONY: pecl-check
 pecl-check:
 	@if test -z "$(PECL)"; then echo "No pecl extension specified, e.g. PECL=pecl_http:http"; exit 1; fi
-	if test -d $(PECL_DIR)/.git; then cd $(PECL_DIR)/; git pull; fi
 
 .PHONY: pecl-clean
 pecl-clean:
@@ -165,12 +172,14 @@ ext: pecl-check pecl
 	$(makdir)/check-packagexml.php package.xml
 
 .PHONY: test
+test: TESTS ?= tests
 test: php
-	REPORT_EXIT_STATUS=1 $(bindir)/php run-tests.php -q -p $(bindir)/php --set-timeout 300 --show-diff tests
+	REPORT_EXIT_STATUS=1 $(bindir)/php run-tests.php -q -p $(bindir)/php --set-timeout 300 --show-diff $(TESTS)
 .PHONY: pecl-test
+pecl-test: TESTS ?= $(PECL_DIR)/tests
 pecl-test: php
-	REPORT_EXIT_STATUS=1 $(bindir)/php $(prefix)/lib/php/build/run-tests.php -q -p $(bindir)/php --set-timeout 300 --show-diff $(PECL_DIR)/tests
-	
+	REPORT_EXIT_STATUS=1 $(bindir)/php $(prefix)/lib/php/build/run-tests.php -q -p $(bindir)/php --set-timeout 300 --show-diff $(TESTS)
+
 pharext/%: $(PECL_INI) php | $(srcdir)/../%.ext.phar
 	for phar in $|; do $(bindir)/php $$phar --prefix=$(prefix) --ini=$(PECL_INI); done