Move gen_stub.php to build directory and install it so phpize can take care of it...

diff --git a/.gitignore b/.gitignore
index af807328f662706ca442ef9744ff98dbecd3a22a..4fd4da9b37b8fc1ec46f26af97b636864dd85095 100644 (file)
--- 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 86cd287610ce1316b2c1d19d1c84bf5e97fc4fd0..7774cefb7f20136f1d4afd7ddc79f7761e069c7f 100644 (file)
--- 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
similarity index 100%
rename from scripts/dev/gen_stub.php
rename to build/gen_stub.php

diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag
index bfbac62ab3dd3013cd7d1fa104c369982a25b852..104983214546ffe59d6e439f0f66a04ba8bb1531 100644 (file)
--- 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 04864733aef40cd4002bba5691eb208111a452de..7d9c1df14c8ec08f9a07022471f49cfd6b06b5cd 100644 (file)
--- 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 \