Skip to content

Commit e11d3b1

Browse files
committed
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
1 parent 6e1ff5f commit e11d3b1

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

Diff for: .gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ include/
8080
libs/
8181
modules/
8282

83-
# Used by scripts/dev/gen_stub.php
84-
scripts/dev/PHP-Parser-*
83+
# Used by build/gen_stub.php
84+
build/PHP-Parser-*
8585

8686
# ------------------------------------------------------------------------------
8787
# Configuration headers generated by the PHP build system

Diff for: build/Makefile.global

+3-3
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,12 @@ prof-use:
144144

145145
# olny php above 7.1.0 supports nullable return type
146146
%_arginfo.h: %.stub.php
147-
@if test -e "$(top_srcdir)/scripts/dev/gen_stub.php"; then \
147+
@if test -e "$(top_srcdir)/build/gen_stub.php"; then \
148148
if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
149-
$(PHP_EXECUTABLE) $(top_srcdir)/scripts/dev/gen_stub.php $<; \
149+
$(PHP_EXECUTABLE) $(top_srcdir)/build/gen_stub.php $<; \
150150
elif type php >/dev/null 2>/dev/null; then \
151151
if test `php -v | head -n1 | cut -d" " -f 2 | sed "s/$$/\n7.0.99/" | sort -rV | head -n1` != "7.0.99"; then \
152-
php $(top_srcdir)/scripts/dev/gen_stub.php $<; \
152+
php $(top_srcdir)/build/gen_stub.php $<; \
153153
fi; \
154154
fi; \
155155
fi;
File renamed without changes.

Diff for: scripts/Makefile.frag

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ BUILD_FILES = \
1515
build/pkg.m4 \
1616
build/Makefile.global \
1717
build/php.m4 \
18+
build/gen_stub.php \
1819
run-tests.php
1920

2021
BUILD_FILES_EXEC = \

Diff for: scripts/phpize.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ includedir="`eval echo @includedir@`/php"
99
builddir="`pwd`"
1010
SED="@SED@"
1111

12-
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"
12+
FILES_BUILD="php.m4 shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.m4 pkg.m4 \
13+
config.guess config.sub ltmain.sh Makefile.global gen_stub.php"
1314
FILES="run-tests*.php"
1415
CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ \
1516
config.nice configure configure.ac \

0 commit comments

Comments
 (0)