X-Git-Url: https://git.m6w6.name/?p=m6w6%2Ftravis-pecl;a=blobdiff_plain;f=Makefile;h=d20e6a420344dd344d47b76f844227aabb84ab6e;hp=93caffb1843b2388d82a819506546c1ffb0427bd;hb=3529c77d8f6844c8817873490e290e203b9bfc50;hpb=79de9c8e52f16a2e06324683cf4c00c91df1b6c1

diff --git a/Makefile b/Makefile
index 93caffb..d20e6a4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,16 @@
 export
 
-PHP ?= 5.6
+PHP ?= 7.3
 JOBS ?= 2
-PHP_MIRROR ?= http://us1.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
@@ -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}' <Makefile)
-CPPCHECK_VERSION ?= 1.75
+CPPCHECK_VERSION ?= 1.82
 CPPCHECK_ARGS ?= -v -j $(JOBS) --std=$(CPPCHECK_STD) --enable=$(CPPCHECK_ENABLE) --error-exitcode=$(CPPCHECK_EXITCODE) --suppressions-list=$(CPPCHECK_SUPPRESSIONS) $(CPPCHECK_INCLUDES)
 
 .SUFFIXES:
@@ -59,13 +58,13 @@ all: php
 
 .PHONY: versions
 versions: $(PHP_RELEASES)
-	grep "^$(PHP)" $<
+	grep "^$(PHP)" $< | cut -f1-2
 
 $(PHP_RELEASES): $(makdir)/php-version-url-dist.php $(makdir)/php-version-url-qa.php | $(srcdir)
-	printf "master\tmaster\tgit clone --depth 1 -b master https://github.com/php/php-src php-master && cd php-master && ./buildconf\n" >$@
-	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=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 +75,11 @@ 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 -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 +100,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 +110,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,8 +124,19 @@ $(PECL_INI): | $(with_config_file_scan_dir)
 	touch $@
 
 $(PECL_DIR)/config.m4:
-	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 -b $(PECL_VERSION) \
+				$$(dirname $$(git remote get-url $$(git remote)))/$(PECL_EXTENSION) $(PECL_DIR); \
+		fi; \
+	else \
+		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
 	cd $(PECL_DIR) && $(bindir)/phpize
@@ -136,7 +148,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)