Improve regex

petk · petk · commit 68e351cc083c · 2019-04-03T22:07:45.000+02:00
diff --git a/buildconf b/buildconf
@@ -9,7 +9,7 @@ debug=0
 # Go to project root.
 cd $(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
 
-php_extra_version=$(grep '^AC_INIT(\[' configure.ac)
+php_extra_version=$(grep '^AC_INIT(' configure.ac)
 case "$php_extra_version" in
   *-dev*)
     dev=1
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
@@ -105,7 +105,7 @@ var PHP_VERSION_STRING = "7.3.0";
 function get_version_numbers()
 {
 	var cin = file_get_contents("configure.ac");
-	var regex = /AC_INIT\(\[PHP\],\[(\d+)\.(\d+)\.(\d+)([^\]]*)\],.+\)/g;
+	var regex = /AC_INIT.+(\d+)\.(\d+)\.(\d+)([^\,^\]]*).+/g;
 
 	if (cin.match(new RegExp(regex))) {
 		PHP_VERSION = RegExp.$1;

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ var PHP_VERSION_STRING = "7.3.0";`
`105`	`105`	`function get_version_numbers()`
`106`	`106`	`{`
`107`	`107`	`var cin = file_get_contents("configure.ac");`
`108`		`- var regex = /AC_INIT\(\[PHP\],\[(\d+)\.(\d+)\.(\d+)([^\]]*)\],.+\)/g;`
	`108`	`+ var regex = /AC_INIT.+(\d+)\.(\d+)\.(\d+)([^\,^\]]*).+/g;`
`109`	`109`
`110`	`110`	`if (cin.match(new RegExp(regex))) {`
`111`	`111`	`PHP_VERSION = RegExp.$1;`