diff options
| author | Remi Collet <remi@remirepo.net> | 2020-04-02 16:34:05 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2020-04-03 10:48:20 +0200 |
| commit | e11d3b169000e44a82006b29a611afcf0c5e40b4 (patch) | |
| tree | c2f5b304fcb767d73f66f4a63c1f0967044261c1 | |
| parent | 6e1ff5f95198dc863d3aa08c5663e962f188becd (diff) | |
| download | php-git-e11d3b169000e44a82006b29a611afcf0c5e40b4.tar.gz | |
Move gen_stub.php to build directory and install it so phpize can take care of it, and thus extension can use it as it is already in Makefile
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | build/Makefile.global | 6 | ||||
| -rwxr-xr-x | build/gen_stub.php (renamed from scripts/dev/gen_stub.php) | 0 | ||||
| -rw-r--r-- | scripts/Makefile.frag | 1 | ||||
| -rw-r--r-- | scripts/phpize.in | 3 |
5 files changed, 8 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index af807328f6..4fd4da9b37 100644 --- a/.gitignore +++ b/.gitignore @@ -80,8 +80,8 @@ include/ libs/ modules/ -# Used by scripts/dev/gen_stub.php -scripts/dev/PHP-Parser-* +# Used by build/gen_stub.php +build/PHP-Parser-* # ------------------------------------------------------------------------------ # Configuration headers generated by the PHP build system diff --git a/build/Makefile.global b/build/Makefile.global index 86cd287610..7774cefb7f 100644 --- a/build/Makefile.global +++ b/build/Makefile.global @@ -144,12 +144,12 @@ prof-use: # olny php above 7.1.0 supports nullable return type %_arginfo.h: %.stub.php - @if test -e "$(top_srcdir)/scripts/dev/gen_stub.php"; then \ + @if test -e "$(top_srcdir)/build/gen_stub.php"; then \ if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \ - $(PHP_EXECUTABLE) $(top_srcdir)/scripts/dev/gen_stub.php $<; \ + $(PHP_EXECUTABLE) $(top_srcdir)/build/gen_stub.php $<; \ elif type php >/dev/null 2>/dev/null; then \ if test `php -v | head -n1 | cut -d" " -f 2 | sed "s/$$/\n7.0.99/" | sort -rV | head -n1` != "7.0.99"; then \ - php $(top_srcdir)/scripts/dev/gen_stub.php $<; \ + php $(top_srcdir)/build/gen_stub.php $<; \ fi; \ fi; \ fi; diff --git a/scripts/dev/gen_stub.php b/build/gen_stub.php index f3a9a492b0..f3a9a492b0 100755 --- a/scripts/dev/gen_stub.php +++ b/build/gen_stub.php diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag index bfbac62ab3..1049832145 100644 --- a/scripts/Makefile.frag +++ b/scripts/Makefile.frag @@ -15,6 +15,7 @@ BUILD_FILES = \ build/pkg.m4 \ build/Makefile.global \ build/php.m4 \ + build/gen_stub.php \ run-tests.php BUILD_FILES_EXEC = \ diff --git a/scripts/phpize.in b/scripts/phpize.in index 04864733ae..7d9c1df14c 100644 --- a/scripts/phpize.in +++ b/scripts/phpize.in @@ -9,7 +9,8 @@ includedir="`eval echo @includedir@`/php" builddir="`pwd`" SED="@SED@" -FILES_BUILD="php.m4 shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.m4 pkg.m4 config.guess config.sub ltmain.sh Makefile.global" +FILES_BUILD="php.m4 shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.m4 pkg.m4 \ + config.guess config.sub ltmain.sh Makefile.global gen_stub.php" FILES="run-tests*.php" CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ \ config.nice configure configure.ac \ |