X-Git-Url: https://git.m6w6.name/?p=m6w6%2Ftravis-pecl;a=blobdiff_plain;f=Makefile;h=e166eb8f69a5fb84204b30efdd3890ccf89e3573;hp=927a5cdbf7ad39944a25ac2ea473d578ef5a529b;hb=8f5ffe6ca8ea6c15a2e47da5db75ca0d11acdd97;hpb=a2206d5f2eaf963d37ff568dd17cd6435f00f809

diff --git a/Makefile b/Makefile
index 927a5cd..e166eb8 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ export
 
 PHP ?= 5.6
 JOBS ?= 2
-PHP_MIRROR ?= http://us1.php.net/distributions/
+PHP_MIRROR ?= http://us2.php.net/distributions/
 TMPDIR ?= /tmp
 
 tmpnam := $(TMPDIR)/php-$(PHP)-$(shell env |grep -E '^with_|^enable_' | tr -c '[a-zA-Z_]' -)
@@ -42,9 +42,15 @@ PECL_DIR := $(if $(filter ext ext%, $(MAKECMDGOALS)), $(curdir), $(srcdir)/pecl-
 #PHP_VERSION_MAJOR = $(firstword $(subst ., ,$(PHP)))
 
 PHP_RELEASES = $(srcdir)/releases.tsv
-PHP_VERSION ?= $(shell test -e $(PHP_RELEASES) && cat $(PHP_RELEASES) | awk -F "\t" '/^$(PHP)\t/{print $$2}')
+PHP_VERSION ?= $(shell test -e $(PHP_RELEASES) && cat $(PHP_RELEASES) | awk -F "\t" '/^$(PHP)\t/{print $$2; exit}')
 
-CPPCHECK ?= -v -j $(JOBS) --std=c89 --enable=warning,portability,style --error-exitcode=42 --suppressions-list=$(makdir)/cppcheck.suppressions -I.
+CPPCHECK_STD ?= c89
+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.82
+CPPCHECK_ARGS ?= -v -j $(JOBS) --std=$(CPPCHECK_STD) --enable=$(CPPCHECK_ENABLE) --error-exitcode=$(CPPCHECK_EXITCODE) --suppressions-list=$(CPPCHECK_SUPPRESSIONS) $(CPPCHECK_INCLUDES)
 
 .SUFFIXES:
 
@@ -117,8 +123,12 @@ $(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 -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); \
+	else \
+		git clone -b $(PECL_VERSION) $$(dirname $$(git remote get-url $$(git remote)))/$(PECL_EXTENSION) $(PECL_DIR); \
+	fi
 
 $(PECL_DIR)/configure: $(PECL_DIR)/config.m4
 	cd $(PECL_DIR) && $(bindir)/phpize
@@ -150,9 +160,17 @@ ext: pecl-check pecl
 test: php
 	REPORT_EXIT_STATUS=1 $(bindir)/php run-tests.php -q -p $(bindir)/php --set-timeout 300 --show-diff tests
 
-.PHONY: cppcheck
-cppcheck:
-	cppcheck $(CPPCHECK) $$(awk -F= '/^CPPFLAGS|^INCLUDES/{print $$2}' <Makefile) .
-
 pharext/%: $(PECL_INI) php | $(srcdir)/../%.ext.phar
 	for phar in $|; do $(bindir)/php $$phar --prefix=$(prefix) --ini=$(PECL_INI); done
+
+## -- CPPCHECK
+
+$(srcdir)/cppcheck-$(CPPCHECK_VERSION):
+	git clone https://github.com/danmar/cppcheck.git $@ && cd $@ && git checkout $(CPPCHECK_VERSION)
+
+$(srcdir)/cppcheck-$(CPPCHECK_VERSION)/cppcheck: | $(srcdir)/cppcheck-$(CPPCHECK_VERSION)
+	cd $| && make -j $(JOBS) cppcheck
+
+.PHONY: cppcheck
+cppcheck: | $(srcdir)/cppcheck-$(CPPCHECK_VERSION)/cppcheck
+	$| $(CPPCHECK_ARGS) .