Skip to content

Refactor AC_INIT in configure.ac and PHP versions #3967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Refactor AC_INIT in configure.ac and PHP versions #3967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d3123e
Refactor AC_INIT in configure.ac and PHP versions
petk Mar 19, 2019
2191bc2
Trim AC_INIT
petk Apr 3, 2019
68e351c
Improve regex
petk Apr 3, 2019
1c56000
Simplify phpize
petk Apr 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions buildconf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ debug=0
# Go to project root.
cd $(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)

eval $(grep '^PHP_EXTRA_VERSION=' configure.ac)
case "$PHP_EXTRA_VERSION" in
*-dev)
php_extra_version=$(grep '^AC_INIT(' configure.ac)
case "$php_extra_version" in
*-dev*)
dev=1
;;
*)
Expand Down
14 changes: 9 additions & 5 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ dnl Basic autoconf initialization, generation of config.nice.
dnl -------------------------------------------------------------------------

AC_PREREQ([2.68])
AC_INIT([main/php_version.h])
AC_INIT([PHP],[7.4.0-dev],[https://bugs.php.net],[php],[https://www.php.net])
AC_CONFIG_SRCDIR([main/php_version.h])
AC_CONFIG_AUX_DIR([build])
AC_PRESERVE_HELP_ORDER

Expand Down Expand Up @@ -99,10 +100,13 @@ extern "C++" {
#endif /* PHP_CONFIG_H */
])

PHP_MAJOR_VERSION=7
PHP_MINOR_VERSION=4
PHP_RELEASE_VERSION=0
PHP_EXTRA_VERSION="-dev"
ac_IFS=$IFS; IFS="."
set $(echo AC_PACKAGE_VERSION | $SED 's/\([[0-9\.]]*\)\(.*\)/\1\.\2/')
IFS=$ac_IFS
PHP_MAJOR_VERSION=[$]1
PHP_MINOR_VERSION=[$]2
PHP_RELEASE_VERSION=[$]3
PHP_EXTRA_VERSION=[$]4
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`

Expand Down
3 changes: 2 additions & 1 deletion scripts/phpize.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
dnl This file becomes configure.ac for self-contained extensions.

AC_PREREQ([2.68])
AC_INIT(config.m4)
AC_INIT
AC_CONFIG_SRCDIR([config.m4])
AC_CONFIG_AUX_DIR([build])
AC_PRESERVE_HELP_ORDER

Expand Down
21 changes: 7 additions & 14 deletions win32/build/confutils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,24 +105,17 @@ var PHP_VERSION_STRING = "7.3.0";
function get_version_numbers()
{
var cin = file_get_contents("configure.ac");
var regex = /AC_INIT.+(\d+)\.(\d+)\.(\d+)([^\,^\]]*).+/g;

if (cin.match(new RegExp("PHP_MAJOR_VERSION=(\\d+)"))) {
if (cin.match(new RegExp(regex))) {
PHP_VERSION = RegExp.$1;
PHP_MINOR_VERSION = RegExp.$2;
PHP_RELEASE_VERSION = RegExp.$3;
PHP_EXTRA_VERSION = RegExp.$4;
}
if (cin.match(new RegExp("PHP_MINOR_VERSION=(\\d+)"))) {
PHP_MINOR_VERSION = RegExp.$1;
}
if (cin.match(new RegExp("PHP_RELEASE_VERSION=(\\d+)"))) {
PHP_RELEASE_VERSION = RegExp.$1;
}
PHP_VERSION_STRING = PHP_VERSION + "." + PHP_MINOR_VERSION + "." + PHP_RELEASE_VERSION;

if (cin.match(new RegExp("PHP_EXTRA_VERSION=\"([^\"]+)\""))) {
PHP_EXTRA_VERSION = RegExp.$1;
if (PHP_EXTRA_VERSION.length) {
PHP_VERSION_STRING += PHP_EXTRA_VERSION;
}
}
PHP_VERSION_STRING = PHP_VERSION + "." + PHP_MINOR_VERSION + "." + PHP_RELEASE_VERSION + PHP_EXTRA_VERSION;

DEFINE('PHP_VERSION_STRING', PHP_VERSION_STRING);
}

Expand Down