X-Git-Url: https://git.m6w6.name/?p=m6w6%2Ftravis-pecl;a=blobdiff_plain;f=Makefile;h=4a903a800030c45581df06f9fd58e99cff648477;hp=0e404ee9816ed72e5e9839ee57ad8f929f094f64;hb=HEAD;hpb=80f88f4e1ceffebbb47bc6fb9875fd833d829a0b diff --git a/Makefile b/Makefile index 0e404ee..4a903a8 100644 --- a/Makefile +++ b/Makefile @@ -1,21 +1,20 @@ export -PHP ?= 5.6 +PHP ?= 7.4 JOBS ?= 2 -PHP_MIRROR ?= http://us2.php.net/distributions/ +PHP_MIRROR ?= https://php.net/distributions/ TMPDIR ?= /tmp -tmpnam := $(TMPDIR)/php-$(PHP)-$(shell env |grep -E '^with_|^enable_' | tr -c '[a-zA-Z_]' -) makdir := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))) -ifdef TRAVIS_JOB_NUMBER -prefix ?= $(HOME)/job-$(TRAVIS_JOB_NUMBER) +ifdef TRAVIS +prefix ?= $(HOME)/cache/php-$(PHP)-$(shell env |grep -E '^with_|^enable_' | tr -c '[a-zA-Z_]' -) else -prefix ?= $(tmpnam) +prefix ?= $(TMPDIR)/php-$(PHP)-$(shell env |grep -E '^with_|^enable_' | tr -c '[a-zA-Z_]' -) endif exec_prefix ?= $(prefix) bindir = $(exec_prefix)/bin -srcdir := $(prefix)/src +srcdir = $(prefix)/src ifdef TRAVIS_BUILD_DIR curdir ?= $(TRAVIS_BUILD_DIR) else @@ -37,7 +36,7 @@ PECL_EXTENSION ?= $(word 1,$(PECL_WORDS)) PECL_SONAME ?= $(if $(word 2,$(PECL_WORDS)),$(word 2,$(PECL_WORDS)),$(PECL_EXTENSION)) PECL_VERSION ?= $(word 3,$(PECL_WORDS)) PECL_INI = $(with_config_file_scan_dir)/pecl.ini -PECL_DIR := $(if $(filter ext ext%, $(MAKECMDGOALS)), $(curdir), $(srcdir)/pecl-$(PECL_EXTENSION)) +PECL_DIR := $(if $(filter ext ext%, $(MAKECMDGOALS)), $(curdir), $(srcdir)/pecl-$(PECL_EXTENSION)-$(PECL_VERSION)) #PHP_VERSION_MAJOR = $(firstword $(subst ., ,$(PHP))) @@ -49,7 +48,7 @@ CPPCHECK_ENABLE ?= portability,style CPPCHECK_EXITCODE ?= 42 CPPCHECK_SUPPRESSIONS ?= $(makdir)/cppcheck.suppressions CPPCHECK_INCLUDES ?= -I. $(shell test -f Makefile && awk -F= '/^CPPFLAGS|^INCLUDES/{print $$2}' $@ - curl -Ss "http://php.net/releases/index.php?json&version=7&max=-1" | $(makdir)/php-version-url-dist.php >>$@ - curl -Ss "http://php.net/releases/index.php?json&version=5&max=-1" | $(makdir)/php-version-url-dist.php >>$@ - curl -Ss "http://qa.php.net/api.php?type=qa-releases&format=json" | $(makdir)/php-version-url-qa.php >>$@ + 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 >>$@ ## -- PHP @@ -76,10 +76,12 @@ clean: .PHONY: check check: $(PHP_RELEASES) @if test -z "$(PHP)"; then echo "No php version specified, e.g. PHP=5.6"; exit 1; fi + @if test -z "$(PHP_VERSION)"; then echo "No PHP version akin to $(PHP) available"; exit 1; fi + if test -d $(srcdir)/php-$(PHP_VERSION)/.git; then cd $(srcdir)/php-$(PHP_VERSION)/; git pull; fi .PHONY: reconf reconf: check $(srcdir)/php-$(PHP_VERSION)/configure - cd $(srcdir)/php-$(PHP_VERSION) && ./configure --cache-file=config.cache --prefix=$(prefix) + cd $(srcdir)/php-$(PHP_VERSION) && ./configure --cache-file=config.cache --prefix=$(prefix) && rm -f sapi/cli/php .PHONY: php php: check $(bindir)/php | $(PECL_INI) @@ -100,7 +102,7 @@ $(srcdir)/php-$(PHP_VERSION)/sapi/cli/php: $(srcdir)/php-$(PHP_VERSION)/Makefile cd $(srcdir)/php-$(PHP_VERSION) && make -j $(JOBS) || make $(bindir)/php: $(srcdir)/php-$(PHP_VERSION)/sapi/cli/php | $(PHP_RELEASES) - cd $(srcdir)/php-$(PHP_VERSION) && make install + cd $(srcdir)/php-$(PHP_VERSION) && make -j $(JOBS) install INSTALL=install $(srcdir) $(extdir) $(with_config_file_scan_dir): mkdir -p $@ @@ -110,6 +112,7 @@ $(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: @@ -123,11 +126,17 @@ $(PECL_INI): | $(with_config_file_scan_dir) touch $@ $(PECL_DIR)/config.m4: - if test -z "$(PECL_VERSION)" || expr + "$(PECL_VERSION)" : "[[:digit:]]\.[[:digit:]]"; then \ - mkdir -p $(PECL_DIR); \ - curl -Ss $(PECL_MIRROR)/$(PECL_EXTENSION)$(if $(PECL_VERSION),/$(PECL_VERSION)) | tar xz --strip-components 1 -C $(PECL_DIR); \ + if test "$(PECL_VERSION)" = "master"; then \ + if test -d $(PECL_DIR); then \ + cd $(PECL_DIR); \ + git pull; \ + else \ + git clone https://github.com/$(PECL_EXTENSION) $(PECL_DIR); \ + fi; \ else \ - git clone -b $(PECL_VERSION) $$(dirname $$(git remote get-url $$(git remote)))/$(PECL_EXTENSION) $(PECL_DIR); \ + mkdir -p $(PECL_DIR); \ + curl -LSs $(PECL_MIRROR)/$(PECL_EXTENSION)$(if $(PECL_VERSION),/$(PECL_VERSION)) \ + | tar xz --strip-components 1 -C $(PECL_DIR); \ fi $(PECL_DIR)/configure: $(PECL_DIR)/config.m4 @@ -140,7 +149,7 @@ $(PECL_DIR)/.libs/$(PECL_SONAME).so: $(PECL_DIR)/Makefile cd $(PECL_DIR) && make -j $(JOBS) || make $(extdir)/$(PECL_SONAME).so: $(PECL_DIR)/.libs/$(PECL_SONAME).so $(extdir) - cd $(PECL_DIR) && make install + cd $(PECL_DIR) && make -j $(JOBS) install INSTALL=install .PHONY: pecl pecl: pecl-check php $(extdir)/$(PECL_SONAME).so | $(PECL_INI) @@ -157,9 +166,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 $(TESTS) + pharext/%: $(PECL_INI) php | $(srcdir)/../%.ext.phar for phar in $|; do $(bindir)/php $$phar --prefix=$(prefix) --ini=$(PECL_INI); done