diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.frag | 1 | ||||
| -rwxr-xr-x | scripts/dev/check_parameters.php | 2 | ||||
| -rwxr-xr-x | scripts/dev/genfiles | 4 | ||||
| -rwxr-xr-x | scripts/dev/makedist | 3 | ||||
| -rwxr-xr-x | scripts/dev/search_underscores.php | 2 | ||||
| -rw-r--r-- | scripts/dev/tidy.php | 12 | ||||
| -rw-r--r-- | scripts/phpize.in | 3 |
7 files changed, 12 insertions, 15 deletions
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/dev/check_parameters.php b/scripts/dev/check_parameters.php index e779d3daee..52424def1e 100755 --- a/scripts/dev/check_parameters.php +++ b/scripts/dev/check_parameters.php @@ -2,8 +2,6 @@ <?php /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/scripts/dev/genfiles b/scripts/dev/genfiles index d29c0d778a..3e085c3e53 100755 --- a/scripts/dev/genfiles +++ b/scripts/dev/genfiles @@ -1,8 +1,6 @@ #!/bin/sh # # +----------------------------------------------------------------------+ -# | PHP Version 7 | -# +----------------------------------------------------------------------+ # | Copyright (c) The PHP Group | # +----------------------------------------------------------------------+ # | This source file is subject to version 3.01 of the PHP license, | @@ -115,7 +113,7 @@ $MAKE RE2C="$RE2C" RE2C_FLAGS="$RE2C_FLAGS" YACC="$YACC" srcdir=sapi/phpdbg buil sapi/phpdbg/phpdbg_parser.c \ sapi/phpdbg/phpdbg_lexer.c -echo "genfiles: enerating json extension parser and lexer files" +echo "genfiles: Generating json extension parser and lexer files" $MAKE RE2C="$RE2C" RE2C_FLAGS="$RE2C_FLAGS" YACC="$YACC" srcdir=ext/json builddir=ext/json top_srcdir=. \ -f ext/json/Makefile.frag \ ext/json/json_parser.tab.c \ diff --git a/scripts/dev/makedist b/scripts/dev/makedist index 515e4ba722..1326929a3a 100755 --- a/scripts/dev/makedist +++ b/scripts/dev/makedist @@ -159,7 +159,8 @@ fi # Reset the modification and access times of all files to be packaged. echo "makedist: Resetting the modification and access times of package files." -find . -exec touch -c {} \; +touch -c NEWS +find . -exec touch -r NEWS -c {} \; cd .. diff --git a/scripts/dev/search_underscores.php b/scripts/dev/search_underscores.php index ff766bcf1f..bd74ea2af7 100755 --- a/scripts/dev/search_underscores.php +++ b/scripts/dev/search_underscores.php @@ -3,8 +3,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/scripts/dev/tidy.php b/scripts/dev/tidy.php index 267f838a61..3829f9092e 100644 --- a/scripts/dev/tidy.php +++ b/scripts/dev/tidy.php @@ -22,9 +22,11 @@ $excludes = [ 'ext/hash/php_hash_whirlpool_tables.h', 'ext/mbstring/libmbfl/', 'ext/mbstring/unicode_data.h', + 'ext/opcache/jit/dynasm', + 'ext/opcache/jit/libudis86', + 'ext/opcache/jit/vtune', 'ext/pcre/pcre2lib/', 'ext/standard/html_tables/html_table_gen.php', - 'ext/xmlrpc/libxmlrpc/', 'sapi/cli/php_http_parser.c', 'sapi/cli/php_http_parser.h', 'sapi/litespeed/', @@ -62,12 +64,11 @@ foreach ($it as $file) { $code = stripTrailingWhitespace($code); $code = reindentToSpaces($code); } else if ($lang === 'phpt') { - // TODO: Don't reformat .phpt on PHP-7.4. - /*$code = transformTestCode($code, function(string $code) { + $code = transformTestCode($code, function(string $code) { $code = stripTrailingWhitespace($code); $code = reindentToSpaces($code); return $code; - });*/ + }); } if ($origCode !== $code) { @@ -134,8 +135,7 @@ function getLanguageFromExtension(string $ext): ?string { case 're': return 'c'; case 'php': - // TODO: Reformat .inc files. - //case 'inc': + case 'inc': return 'php'; case 'phpt': return 'phpt'; 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 \ |