com php-src: Revert "Update versions/dates for PHP 7.1.0beta2": NEWS configure.in main/php_version.h
| From: | Davey Shafik | Date: | Fri, 05 Aug 2016 18:07:15 +0000 |
| Subject: | com php-src: Revert "Update versions/dates for PHP 7.1.0beta2": NEWS configure.in main/php_version.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93630@lists.php.net to get a copy of this message | ||
Commit: a8ab3b4f0ebede8268353e480169f8b9ff371d63
Author: Davey Shafik <me@daveyshafik.com> Fri, 5 Aug 2016 11:07:15 -0700
Parents: 050a5d5662fa5cb4590efbb2b412957ad9e7f311
Branches: PHP-7.1.0beta2
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a8ab3b4f0ebede8268353e480169f8b9ff371d63
Log:
Revert "Update versions/dates for PHP 7.1.0beta2"
This reverts commit 050a5d5662fa5cb4590efbb2b412957ad9e7f311.
Changed paths:
M NEWS
M configure.in
M main/php_version.h
Diff:
diff --git a/NEWS b/NEWS
index c7bccfa..eaec429 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-04 Aug 2016, PHP 7.1.0beta2
+?? ??? 2016, PHP 7.1.0beta2
- Core:
. Implemented FR #72614 (Support "nmake test" on building extensions by
diff --git a/configure.in b/configure.in
index f3b2cd2..a35f413 100644
--- a/configure.in
+++ b/configure.in
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=7
PHP_MINOR_VERSION=1
PHP_RELEASE_VERSION=0
-PHP_EXTRA_VERSION=beta2
+PHP_EXTRA_VERSION="-dev"
PHP_VERSION="$PHP_MAJOR_VERSION..$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
PHP_VERSION_ID=
expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 +
[$]PHP_RELEASE_VERSION
diff --git a/main/php_version.h b/main/php_version.h
index dab1598..4714e5d 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 7
#define PHP_MINOR_VERSION 1
#define PHP_RELEASE_VERSION 0
-#define PHP_EXTRA_VERSION "beta2"
-#define PHP_VERSION "7.1.0beta2"
+#define PHP_EXTRA_VERSION "-dev"
+#define PHP_VERSION "7.1.0-dev"
#define PHP_VERSION_ID 70100