X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile;h=30fee1a4452a8409e5eb6a4c29f87ae2f6816410;hb=b2b55407068832287e9e96dba9e9fc8c1696954c;hp=201d530f8d9b1256c6862311c80c6d8ff62445ff;hpb=3f32c9f45f15e329d1751cdb58cd411a3a5adfcd;p=m6w6%2Fpecl-ci

diff --git a/Makefile b/Makefile
index 201d530..30fee1a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 export
 
-PHP = 5.6
+PHP ?= 5.6
 JOBS ?= 2
 PHP_MIRROR ?= http://us1.php.net/distributions/
 
-prefix ?= $(HOME)
+prefix ?= $(HOME)/job-$(TRAVIS_JOB_NUMBER)
 exec_prefix ?= $(prefix)
 bindir = $(exec_prefix)/bin
 srcdir := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
@@ -23,7 +23,7 @@ PECL_SONAME ?= $(if $(shell echo $(PECL) | cut -d: -f2),$(shell echo $(PECL) | c
 PECL_VERSION ?= $(shell echo $(PECL) | cut -d: -f3 -s)
 PECL_INI = $(with_config_file_scan_dir)/pecl.ini
 
-PHP_VERSION ?= $(shell test -e $(srcdir)/php-versions.json && cat $(srcdir)/php-versions.json | /usr/bin/php $(srcdir)/php-version.php $(PHP))
+PHP_VERSION ?= $(shell test -e $(srcdir)/php-versions.json && cat $(srcdir)/php-versions.json | $(srcdir)/php-version.php $(PHP))
 
 .PHONY: all php check clean reconf pecl ext test
 .SUFFIXES:
@@ -44,7 +44,7 @@ reconf: check $(srcdir)/php-$(PHP_VERSION)/configure
 php: check $(bindir)/php
 
 $(srcdir)/php-versions.json: $(srcdir)/php-version.php
-	curl -Sso $@ http://php.net/releases/active.php
+	curl -Sso $@ "http://php.net/releases/index.php?json&version=5&max=-1"
 
 $(srcdir)/php-$(PHP_VERSION)/configure: | $(srcdir)/php-versions.json
 	curl -Ss $(PHP_MIRROR)/php-$(PHP_VERSION).tar.bz2 | tar xj -C $(srcdir)
@@ -92,6 +92,7 @@ pecl: pecl-check php $(extdir)/$(PECL_SONAME).so | $(PECL_INI)
 	grep -q extension=$(PECL_SONAME).so $(PECL_INI) || echo extension=$(PECL_SONAME).so >> $(PECL_INI)
 
 ext: pecl-check $(srcdir)/pecl-$(PECL_EXTENSION) pecl
+	$(srcdir)/check-packagexml.php package.xml
 
 test: php
-	REPORT_EXIT_STATUS=1 NO_INTERACTION=1 $(bindir)/php run-tests.php -p $(bindir)/php --show-diff tests
+	REPORT_EXIT_STATUS=1 $(bindir)/php run-tests.php -q -p $(bindir)/php --set-timeout 180 --show-diff tests