archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
Remi Collet 2020-04-02 16:34:05 +02:00 • committed by Remi Collet
parent 6e1ff5f951
commit e11d3b1690
5 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -80,8 +80,8 @@ include/
libs/ libs/
modules/ modules/
# Used by scripts/dev/gen_stub.php # Used by build/gen_stub.php
scripts/dev/PHP-Parser-* build/PHP-Parser-*
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Configuration headers generated by the PHP build system # Configuration headers generated by the PHP build system

6
build/Makefile.global
View file

@ -144,12 +144,12 @@ prof-use:
# olny php above 7.1.0 supports nullable return type # olny php above 7.1.0 supports nullable return type
%_arginfo.h: %.stub.php %_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 \ 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 \ 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 \ 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; \ fi; \
fi; fi;

0
scripts/dev/gen_stub.php → build/gen_stub.php
View file

1
scripts/Makefile.frag
View file

@ -15,6 +15,7 @@ BUILD_FILES = \
build/pkg.m4 \ build/pkg.m4 \
build/Makefile.global \ build/Makefile.global \
build/php.m4 \ build/php.m4 \
build/gen_stub.php \
run-tests.php run-tests.php
BUILD_FILES_EXEC = \ BUILD_FILES_EXEC = \

3
scripts/phpize.in
View file

@ -9,7 +9,8 @@ includedir="`eval echo @includedir@`/php"
builddir="`pwd`" builddir="`pwd`"
SED="@SED@" 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" FILES="run-tests*.php"
CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ \ CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ \
config.nice configure configure.ac \ config.nice configure configure.ac \