From 6f011e82c1fa0d063ed6faf0ded5e73f6e14ebf2 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Wed, 5 Aug 2015 13:13:20 +0200 Subject: [PATCH] sort of support master --- Makefile | 6 +++++- php-version.php | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9f892d1..54c1b19 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,11 @@ $(srcdir)/php-versions.json: $(srcdir)/php-version.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) + if test $(PHP_VERSION) = "master"; then \ + cd $(srcdir) && git clone --depth 1 -b master https://github.com/php/php-src php-master \ + else \ + curl -Ss $(PHP_MIRROR)/php-$(PHP_VERSION).tar.bz2 | tar xj -C $(srcdir) \ + fi $(srcdir)/php-$(PHP_VERSION)/Makefile: $(srcdir)/php-$(PHP_VERSION)/configure | $(srcdir)/php-versions.json cd $(srcdir)/php-$(PHP_VERSION) && ./configure -C --prefix=$(prefix) diff --git a/php-version.php b/php-version.php index 03260ad..47d4574 100755 --- a/php-version.php +++ b/php-version.php @@ -34,7 +34,13 @@ if (isset($by_minor[$version])) { case "5.5": print("5.5.27\n"); break; - default: + case "5.6": print("5.6.11\n"); + break; + case "master": + print("master\n"); + break; + default: + printf("%s\n", $version); } } -- 2.30.2