Skip to content

Commit 17614bf

Browse files
committed
Update docs
TSRM simplifications to treat it more like a part of the Zend Engine than a standalone project/library.
1 parent 8d11e87 commit 17614bf

File tree

5 files changed

+5
-11
lines changed

5 files changed

+5
-11
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ PHP tests and other associated files:
213213
└─📄 ...
214214
├─📂 ...
215215
└─📄 ext_skel.php # Helper script that creates a new PHP extension
216-
└─📂 main # Binding that ties extensions, SAPIs, Zend Engine and TSRM together
216+
└─📂 main # Binding that ties extensions, SAPIs, and Zend Engine together
217217
├─📂 streams # Streams layer subsystem
218218
├─📄 debug_gdb_scripts.c # Generated by `scripts/gdb/debug_gdb_scripts_gen.php`
219219
└─📄 ...
@@ -226,7 +226,7 @@ PHP tests and other associated files:
226226
└─📄 ...
227227
├─📂 scripts # php-config, phpize and internal development scripts
228228
├─📂 tests # Core features tests
229-
├─📂 TSRM # Thread safe resource manager
229+
├─📂 TSRM # Thread Safe Resource Manager
230230
└─📂 Zend # Zend Engine
231231
├─📂 asm # Bundled from src/asm in https://github.com/boostorg/context
232232
├─📂 Optimizer # For faster PHP execution through opcode caching and optimization

docs/autotools.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ PHP build system is a collection of various files across the php-src repository:
120120
└─📄 config.m4 # Autoconf M4 file for SAPI
121121
├─📂 scripts
122122
└─📂 TSRM
123-
├─📄 threads.m4 # Autoconf macros for pthreads
124-
└─📄 tsrm.m4 # Autoconf macros for TSRM
123+
└─📄 threads.m4 # Autoconf macros for pthreads
125124
└─📂 Zend
126125
├─📄 Makefile.frag # Makefile fragment for Zend Engine
127126
└─📄 Zend.m4 # Autoconf macros for Zend Engine

docs/cmake/cmake-code-style.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -463,10 +463,6 @@ Naming pattern when creating libraries and executables across the build system:
463463

464464
Target name of the PHP main binding.
465465

466-
* `php_tsrm`:
467-
468-
Target name of the PHP thread-safe resource manager (TSRM).
469-
470466
* `zend`:
471467

472468
Target name for the Zend Engine.

docs/cmake/cmake.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ repository:
6868
└─📄 config.cmake.h.in # SAPI's configuration header template
6969
└─📂 scripts
7070
└─📄 CMakeLists.txt # CMake file for creating scripts files
71-
└─📂 TSRM
72-
└─📄 CMakeLists.txt # CMake file for thread safe resource manager
7371
└─📂 win32 # Windows build files
7472
└─📂 build # Windows build files
7573
└─📄 wsyslog.mc # Message template file for win32/wsyslog.h
@@ -287,6 +285,7 @@ version available on the operating system.
287285
* `COMPILE_ONLY` generator expression
288286
* `INSTALL_PREFIX` generator expression in `install(CODE)`
289287
* `$<LIST:SORT,list[,...]>` generator expression
288+
* `<PACKAGENAME>_ROOT` variables in addition to `<PackageName>_ROOT`
290289
* 3.29
291290
* `CMAKE_LINKER_TYPE`
292291
* `if(IS_EXECUTABLE)`

docs/php-installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ Default PHP Autotools directory structure with GNU layout (`--with-layout=GNU`):
157157
├─📂 ext # ├─📂 ext # PHP extensions header files
158158
├─📂 main # ├─📂 main # PHP main binding header files
159159
├─📂 sapi # ├─📂 sapi # PHP SAPI header files
160-
├─📂 TSRM # ├─📂 TSRM # PHP TSRM header files
160+
├─📂 TSRM # ├─📂 TSRM # TSRM header files
161161
└─📂 Zend # └─📂 Zend # Zend Engine header files
162162
└─📂 ${libdir} # └─📂 lib
163163
└─📂 php # └─📂 php # PHP shared libraries, build files, PEAR

0 commit comments

Comments
 (0)