Skip to content

Commit

Permalink
Merge branch 'main' into feature-sync-code-from-main
Browse files Browse the repository at this point in the history
  • Loading branch information
@jingjingxyk
jingjingxyk committed Oct 28, 2024
2 parents f6516f1 + d9780e0 commit 52d3b00
Show file tree
Hide file tree
Showing 3 changed files with 96 additions and 62 deletions.
3 changes: 3 additions & 0 deletions docs/upgrade.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ php sync-source-code.php
php sync-source-code.php --action run


./bin/runtime/php -c ./bin/runtime/php.ini sync-source-code.php
./bin/runtime/php -c ./bin/runtime/php.ini sync-source-code.php --action run

```

## 目录说明
Expand Down
6 changes: 3 additions & 3 deletions sapi/cli/fpm/fpm_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ static const opt_struct OPTIONS[] = {
{'D', 0, "daemonize"},
{'F', 0, "nodaemonize"},
{'O', 0, "force-stderr"},
{'P', 0, "fpm"},
{'P', 0, "fpm"},
{'-', 0, NULL} /* end of args */
};

Expand Down Expand Up @@ -1690,8 +1690,8 @@ int fpm_main(int argc, char *argv[])
force_stderr = 1;
break;

case 'P':
break;
case 'P': /* enable fpm */
break;

default:
case 'h':
Expand Down
149 changes: 90 additions & 59 deletions sync-source-code.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,34 +67,35 @@
echo "sync"
# ZendVM
cp -rf $SRC/Zend/ ./Zend
cp -rf $SRC/Zend/. ./Zend
# Extension
cp -rf $SRC/ext/bcmath/ ./ext/bcmath
cp -rf $SRC/ext/bz2/ ./ext/bz2
cp -rf $SRC/ext/calendar/ ./ext/calendar
cp -rf $SRC/ext/ctype/ ./ext/ctype
cp -rf $SRC/ext/curl/ ./ext/curl
cp -rf $SRC/ext/date/ ./ext/date
cp -rf $SRC/ext/dom/ ./ext/dom
cp -rf $SRC/ext/exif/ ./ext/exif
cp -rf $SRC/ext/fileinfo/ ./ext/fileinfo
cp -rf $SRC/ext/filter/ ./ext/filter
cp -rf $SRC/ext/gd/ ./ext/gd
cp -rf $SRC/ext/gettext/ ./ext/gettext
cp -rf $SRC/ext/gmp/ ./ext/gmp
cp -rf $SRC/ext/hash/ ./ext/hash
cp -rf $SRC/ext/iconv/ ./ext/iconv
cp -rf $SRC/ext/intl/ ./ext/intl
cp -rf $SRC/ext/json/ ./ext/json
cp -rf $SRC/ext/libxml/ ./ext/libxml
cp -rf $SRC/ext/mbstring/ ./ext/mbstring
cp -rf $SRC/ext/mysqli/ ./ext/mysqli
cp -rf $SRC/ext/mysqlnd/ ./ext/mysqlnd
cp -rf $SRC/ext/opcache/ ./ext/opcache
cp -rf $SRC/ext/bcmath/. ./ext/bcmath
cp -rf $SRC/ext/bz2/. ./ext/bz2
cp -rf $SRC/ext/calendar/. ./ext/calendar
cp -rf $SRC/ext/ctype/. ./ext/ctype
cp -rf $SRC/ext/curl/. ./ext/curl
cp -rf $SRC/ext/date/. ./ext/date
cp -rf $SRC/ext/dom/. ./ext/dom
cp -rf $SRC/ext/exif/. ./ext/exif
cp -rf $SRC/ext/fileinfo/. ./ext/fileinfo
cp -rf $SRC/ext/filter/. ./ext/filter
cp -rf $SRC/ext/gd/. ./ext/gd
cp -rf $SRC/ext/gettext/. ./ext/gettext
cp -rf $SRC/ext/gmp/. ./ext/gmp
cp -rf $SRC/ext/hash/. ./ext/hash
cp -rf $SRC/ext/iconv/. ./ext/iconv
cp -rf $SRC/ext/intl/. ./ext/intl
cp -rf $SRC/ext/json/. ./ext/json
cp -rf $SRC/ext/libxml/. ./ext/libxml
cp -rf $SRC/ext/mbstring/. ./ext/mbstring
cp -rf $SRC/ext/mysqli/. ./ext/mysqli
cp -rf $SRC/ext/mysqlnd/. ./ext/mysqlnd
cp -rf $SRC/ext/opcache/. ./ext/opcache
sed -i.backup 's/ext_shared=yes/ext_shared=no/g' ext/opcache/config.m4
sed -i.backup 's/shared,,/$ext_shared,,/g' ext/opcache/config.m4
# sed -i 's/-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1/-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DPHP_ENABLE_OPCACHE/g' ext/opcache/config.m4
# echo '#include "php.h"\n\nextern zend_module_entry opcache_module_entry;\n#define phpext_opcache_ptr &opcache_module_entry\n' > ext/opcache/php_opcache.h
cat > ext/opcache/php_opcache.h <<PHP_OPCACHE_H_EOF
#include "php.h"
Expand All @@ -104,71 +105,101 @@
PHP_OPCACHE_H_EOF
cp -rf $SRC/ext/openssl/ ./ext/openssl
cp -rf $SRC/ext/pcntl/ ./ext/pcntl
cp -rf $SRC/ext/pcre/ ./ext/pcre
cp -rf $SRC/ext/pdo/ ./ext/pdo
cp -rf $SRC/ext/pdo_mysql/ ./ext/pdo_mysql
cp -rf $SRC/ext/openssl/. ./ext/openssl
cp -rf $SRC/ext/pcntl/. ./ext/pcntl
cp -rf $SRC/ext/pcre/. ./ext/pcre
cp -rf $SRC/ext/pdo/. ./ext/pdo
cp -rf $SRC/ext/pdo_mysql/. ./ext/pdo_mysql
cp -rf $SRC/ext/phar/ ./ext/phar
cp -rf $SRC/ext/phar/. ./ext/phar
echo '\n#include "sapi/cli/sfx/hook_stream.h"' >> ext/phar/phar_internal.h
cp -rf $SRC/ext/posix/ ./ext/posix
cp -rf $SRC/ext/readline/ ./ext/readline
cp -rf $SRC/ext/reflection/ ./ext/reflection
cp -rf $SRC/ext/session/ ./ext/session
cp -rf $SRC/ext/simplexml/ ./ext/simplexml
cp -rf $SRC/ext/soap/ ./ext/soap
cp -rf $SRC/ext/sockets/ ./ext/sockets
cp -rf $SRC/ext/sodium/ ./ext/sodium
cp -rf $SRC/ext/spl/ ./ext/spl
cp -rf $SRC/ext/sqlite3/ ./ext/sqlite3
cp -rf $SRC/ext/standard/ ./ext/standard
cp -rf $SRC/ext/sysvshm/ ./ext/sysvshm
cp -rf $SRC/ext/tokenizer/ ./ext/tokenizer
cp -rf $SRC/ext/xml/ ./ext/xml
cp -rf $SRC/ext/xmlreader/ ./ext/xmlreader
cp -rf $SRC/ext/xmlwriter/ ./ext/xmlwriter
cp -rf $SRC/ext/xsl/ ./ext/xsl
cp -rf $SRC/ext/zip/ ./ext/zip
cp -rf $SRC/ext/zlib/ ./ext/zlib
cp -rf $SRC/ext/posix/. ./ext/posix
cp -rf $SRC/ext/readline/. ./ext/readline
cp -rf $SRC/ext/reflection/. ./ext/reflection
cp -rf $SRC/ext/session/. ./ext/session
cp -rf $SRC/ext/simplexml/. ./ext/simplexml
cp -rf $SRC/ext/soap/. ./ext/soap
cp -rf $SRC/ext/sockets/. ./ext/sockets
cp -rf $SRC/ext/sodium/. ./ext/sodium
cp -rf $SRC/ext/spl/. ./ext/spl
cp -rf $SRC/ext/sqlite3/. ./ext/sqlite3
cp -rf $SRC/ext/standard/. ./ext/standard
cp -rf $SRC/ext/sysvshm/. ./ext/sysvshm
cp -rf $SRC/ext/tokenizer/. ./ext/tokenizer
cp -rf $SRC/ext/xml/. ./ext/xml
cp -rf $SRC/ext/xmlreader/. ./ext/xmlreader
cp -rf $SRC/ext/xmlwriter/. ./ext/xmlwriter
cp -rf $SRC/ext/xsl/. ./ext/xsl
cp -rf $SRC/ext/zip/. ./ext/zip
cp -rf $SRC/ext/zlib/. ./ext/zlib
# main
cp -rf $SRC/main/ ./main
cp -rf $SRC/main/. ./main
sed -i.backup 's/\/\* start Zend extensions \*\//\/\* start Zend extensions \*\/\n#ifdef PHP_ENABLE_OPCACHE\n\textern zend_extension zend_extension_entry;\n\tzend_register_extension(\&zend_extension_entry, NULL);\n#endif/g' main/main.c
# build
cp -rf $SRC/build/ ./build
cp -rf $SRC/build/. ./build
# TSRM
cp -rf $SRC/TSRM/ ./TSRM
# TSRM (more info: https://github.com/swoole/swoole-cli/commit/172c76445a631abb1b32fc2a721a2dd9d5a5fc0d)
# (https://github.com/php/php-src/pull/16568)
# cp -rf $SRC/TSRM/. ./TSRM
cp -f $SRC/configure.ac ./configure.ac
cp -f $SRC/buildconf ./buildconf
cp -f $SRC/run-tests.php ./run-tests.php
# scripts
cp -rf $SRC/scripts/ ./scripts
cp -rf $SRC/scripts/. ./scripts
# 在sed命令中，常见的需要转义的字符有：\、/、$、&、.、*、[、]等
# 在sed命令中，常见的需要转义的字符有：\、 /、 $、 &、 .、 *、 [、]等
# 反斜杠、正斜杠、美元符号、引用符号、点号、星号、方括号等
test -f main/main.c.backup && rm -f main/main.c.backup
test -f ext/opcache/config.m4.backup && rm -f ext/opcache/config.m4.backup
# fpm [Need to manually compare fpm_main.c]
cp -rf $SRC/sapi/fpm/fpm/. ./sapi/cli/fpm
sed -i.backup '/#include "ext\/standard\/php_standard\.h"/a \
\
#include "ext/swoole/include/swoole_version.h"\
extern void show_swoole_version(void);\
' ./sapi/cli/fpm/fpm_main.c
sed -i.backup 's/prog = "php";/prog = "swoole-cli";/' ./sapi/cli/fpm/fpm_main.c
sed -i.backup 's/Usage: %s \[-n\]/Usage: %s (fpm) [-n]/' ./sapi/cli/fpm/fpm_main.c
sed -i.backup "/force_stderr = 1;/a \\
break;\\
\\
case 'P': /* enable fpm */\\
" ./sapi/cli/fpm/fpm_main.c
# fpm
cp -rf $SRC/sapi/fpm/fpm ./sapi/cli/
sed -i.backup 's/int main(int argc, char \*argv\[\])/int fpm_main(int argc, char \*argv\[\])/g' ./sapi/cli/fpm/fpm_main.c
sed -i.backup 's/{'-', 0, NULL}/{'P', 0, "fpm"},\n {'-', 0, NULL}/g' ./sapi/cli/fpm/fpm_main.c
sed -i.backup "s/{'-', 0, NULL}/{'P', 0, \"fpm\"},\n {'-', 0, NULL}/g" ./sapi/cli/fpm/fpm_main.c
X_FPM_MATCH_LINE_NUM=$(sed -n '/__TIME__, get_zend_version());/=' ./sapi/cli/fpm/fpm_main.c)
X_FPM_REPLACE_LINE_NUM=$(($X_FPM_MATCH_LINE_NUM-2))
X_FPM_DELETE_START_LINE_NUM=$(($X_FPM_MATCH_LINE_NUM-1))
X_FPM_DELETE_END_LINE_NUM=$(($X_FPM_MATCH_LINE_NUM+3))
sed -i.backup "${X_FPM_REPLACE_LINE_NUM} s/.*/ show_swoole_version();/" ./sapi/cli/fpm/fpm_main.c
sed -i.backup "${X_FPM_DELETE_START_LINE_NUM},${X_FPM_DELETE_END_LINE_NUM}d" ./sapi/cli/fpm/fpm_main.c
# show changed
# git diff ./sapi/cli/fpm/fpm_main.c | cat
# diff $SRC/sapi/fpm/fpm/fpm_main.c ./sapi/cli/fpm/fpm_main.c
# cli
# 【执行本命令，影响 swoole-cli 特性，请手动确认功能变更】
# cp -rf $SRC/sapi/cli/. ./sapi/cli
cp -rf $SRC/sapi/cli/ps_title.c ./sapi/cli
cp -rf $SRC/sapi/cli/generate_mime_type_map.php ./sapi/cli
cp -rf $SRC/sapi/cli/php.1.in ./sapi/cli
# clean file
test -f main/main.c.backup && rm -f main/main.c.backup
test -f ext/opcache/config.m4.backup && rm -f ext/opcache/config.m4.backup
test -f sapi/cli/fpm/fpm_main.c.backup && rm -f sapi/cli/fpm/fpm_main.c.backup

EOF;

echo PHP_EOL;
Expand Down

0 comments on commit 52d3b00

Please sign in to comment.