projects
/
m6w6
/
travis-pecl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
41ff3b6
)
sort of support master
author
Michael Wallner
<mike@php.net>
Wed, 5 Aug 2015 11:13:20 +0000
(13:13 +0200)
committer
Michael Wallner
<mike@php.net>
Wed, 5 Aug 2015 11:13:20 +0000
(13:13 +0200)
Makefile
patch
|
blob
|
history
php-version.php
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 9f892d1ce9260d40ef10c343e4425056cc874d93..54c1b198d217c9c8a51a0a50b13bab5e29e57f2c 100644
(file)
--- 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 -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)
$(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 03260ad33e41648023b81545085de1e66708835b..47d45740518468f45dc96fab38885047507bd5ca 100755
(executable)
--- 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;
case "5.5":
print("5.5.27\n");
break;
-
default
:
+
case "5.6"
:
print("5.6.11\n");
print("5.6.11\n");
+ break;
+ case "master":
+ print("master\n");
+ break;
+ default:
+ printf("%s\n", $version);
}
}
}
}