Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/Configuration.cmake

@@ -221,23 +221,6 @@ block()
   endif()
 endblock()
 
-set(
-  PHP_FULL_EXTENSION_DIR "" CACHE INTERNAL
-  "Absolute path for the dynamically loadable extensions."
-)
-
-if(IS_ABSOLUTE "${PHP_EXTENSION_DIR}")
-  set_property(
-    CACHE PHP_FULL_EXTENSION_DIR
-    PROPERTY VALUE "${PHP_EXTENSION_DIR}"
-  )
-elseif(PHP_EXTENSION_DIR)
-  set_property(
-    CACHE PHP_FULL_EXTENSION_DIR
-    PROPERTY VALUE "${CMAKE_INSTALL_PREFIX}/${PHP_EXTENSION_DIR}"
-  )
-endif()
-
 ################################################################################
 # Various global internal configuration.
 ################################################################################

cmake/ext/phar/CMakeLists.txt

@@ -1,6 +1,5 @@
 include(CMakeDependentOption)
 include(FeatureSummary)
-include(PHP/Install)
 
 option(EXT_PHAR "Enable the phar extension" ON)
 
@@ -185,7 +184,7 @@ if(PHP_EXECUTABLE)
   # Install phar.phar file to destination. Here a duplicate phar.phar generation
   # step is used to generate it to a destination directory because of the
   # install prefix used in shebang (when using 'cmake --install --prefix ...').
-  php_install(CODE "
+  install(CODE "
     execute_process(
       COMMAND
         ${PHP_EXECUTABLE}
@@ -203,7 +202,7 @@ if(PHP_EXECUTABLE)
             -p 0
             -s ${CMAKE_CURRENT_SOURCE_DIR}/phar/phar.php
             -h sha1
-            -b \${CMAKE_INSTALL_FULL_BINDIR}/$<TARGET_FILE_NAME:php_cli>
+            -b $<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_BINDIR},\${CMAKE_INSTALL_PREFIX}>/$<TARGET_FILE_NAME:php_cli>
             ${CMAKE_CURRENT_SOURCE_DIR}/phar
     )
 
@@ -223,13 +222,13 @@ if(PHP_EXECUTABLE)
     file(
       COPY_FILE
       ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/phar.phar
-      \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_BINDIR}/${PHP_PROGRAM_PREFIX}phar${PHP_PROGRAM_SUFFIX}.phar
+      \$ENV{DESTDIR}$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_BINDIR},\${CMAKE_INSTALL_PREFIX}>/${PHP_PROGRAM_PREFIX}phar${PHP_PROGRAM_SUFFIX}.phar
     )
 
     file(
       CREATE_LINK
       ${PHP_PROGRAM_PREFIX}phar${PHP_PROGRAM_SUFFIX}.phar
-      \$ENV{DESTDIR}\${CMAKE_INSTALL_FULL_BINDIR}/${PHP_PROGRAM_PREFIX}phar${PHP_PROGRAM_SUFFIX}
+      \$ENV{DESTDIR}$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_BINDIR},\${CMAKE_INSTALL_PREFIX}>/${PHP_PROGRAM_PREFIX}phar${PHP_PROGRAM_SUFFIX}
       SYMBOLIC
     )
   ")

cmake/main/CMakeLists.txt

@@ -284,10 +284,27 @@ function(_php_main_create_files)
 
   # TODO: Set configure command string.
   set(CONFIGURE_COMMAND "cmake")
-  # Set the 'include_path' INI directive.
-  set(INCLUDE_PATH ".:${EXPANDED_PEAR_INSTALLDIR}")
+
   # TODO: Fix the installation prefix when passed via --prefix option.
-  set(EXPANDED_EXTENSION_DIR "${PHP_FULL_EXTENSION_DIR}")
+  if(PHP_PEAR_DIR)
+    set(
+      EXPANDED_PEAR_INSTALLDIR
+      "$<PATH:ABSOLUTE_PATH,NORMALIZE,${PHP_PEAR_DIR},${CMAKE_INSTALL_PREFIX}>"
+    )
+  endif()
+
+  # Set the 'include_path' INI directive.
+  set(
+    INCLUDE_PATH
+    ".$<IF:$<PLATFORM_ID:Windows>,;,:>${EXPANDED_PEAR_INSTALLDIR}"
+  )
+
+  # Set the PHP extensions directory.
+  set(
+    EXPANDED_EXTENSION_DIR
+    "$<PATH:ABSOLUTE_PATH,NORMALIZE,${PHP_EXTENSION_DIR},${CMAKE_INSTALL_PREFIX}>"
+  )
+
   set(EXPANDED_PHP_CONFIG_FILE_PATH "${PHP_FULL_CONFIG_FILE_PATH}")
   set(EXPANDED_PHP_CONFIG_FILE_SCAN_DIR "${PHP_FULL_CONFIG_FILE_SCAN_DIR}")
   set(EXPANDED_BINDIR "${CMAKE_INSTALL_FULL_BINDIR}")

cmake/main/php_config.cmake.h.in

@@ -2050,7 +2050,7 @@
 # cmakedefine CONFIGURE_COMMAND "@CONFIGURE_COMMAND@"
 
 /* The PEAR installation directory. */
-# define PEAR_INSTALLDIR "@PREFIX@\\pear"
+# define PEAR_INSTALLDIR "@EXPANDED_PEAR_INSTALLDIR@"
 
 /* The path to the bin directory. */
 # define PHP_BINDIR "@PREFIX@"
@@ -2068,7 +2068,7 @@
 # define PHP_EXTENSION_DIR "@PREFIX@\\ext"
 
 /* The 'include_path' PHP INI directive. */
-# define PHP_INCLUDE_PATH ".;@PREFIX@\\pear"
+# define PHP_INCLUDE_PATH "@INCLUDE_PATH@"
 
 /* The path containing system libraries (lib or lib64). */
 # define PHP_LIBDIR "@PREFIX@"

cmake/pear/CMakeLists.txt

@@ -11,16 +11,17 @@ add_feature_info(
 
 if(PHP_PEAR)
   set(
-    PHP_PEAR_DIR ""
+    PHP_PEAR_DIR "${CMAKE_INSTALL_DATADIR}/pear"
     CACHE FILEPATH
-    "Install PEAR in DIR (PREFIX/lib/php)"
+    "The PEAR installation directory (default: DATADIR/pear)"
   )
   # Change from INTERNAL type to show variable on consecutive configuration run.
   set_property(CACHE PHP_PEAR_DIR PROPERTY TYPE FILEPATH)
 elseif(DEFINED PHP_PEAR_DIR)
   # Hide variable.
   set_property(CACHE PHP_PEAR_DIR PROPERTY TYPE INTERNAL)
 endif()
+mark_as_advanced(PHP_PEAR_DIR)
 
 message(CHECK_START "Checking for PEAR")
 
@@ -44,16 +45,6 @@ if(NOT EXT_XML)
     "PEAR requires the xml extension to be enabled. Set EXT_XML to 'ON'.")
 endif()
 
-if(NOT PHP_PEAR_DIR)
-  set(_php_pear_dir "\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/pear")
-else()
-  set(_php_pear_dir "${PHP_PEAR_DIR}")
-endif()
-
-# Defined for build-defs.h.
-# TODO: INSTALL_PREFIX here cannot be evaluated during the install phase.
-set(EXPANDED_PEAR_INSTALLDIR "${_php_pear_dir}" CACHE INTERNAL "PEAR dir")
-
 if(NOT CMAKE_CROSSCOMPILING)
   set(PHP_EXECUTABLE "$<TARGET_FILE:php_cli>")
 elseif(CMAKE_CROSSCOMPILING AND CMAKE_CROSSCOMPILING_EMULATOR)
@@ -63,7 +54,16 @@ endif()
 set(_phpPearInstallerUrl "https://pear.php.net/install-pear-nozlib.phar")
 
 php_install(CODE "
-  message(STATUS \"Installing PEAR: \$ENV{DESTDIR}${_php_pear_dir}\")
+  set(
+    pearInstallDir
+    \"$<PATH:ABSOLUTE_PATH,NORMALIZE,${PHP_PEAR_DIR},\${CMAKE_INSTALL_PREFIX}>\"
+  )
+  set(
+    binDir
+    \"$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_BINDIR},\${CMAKE_INSTALL_PREFIX}>\"
+  )
+
+  message(STATUS \"Installing PEAR to \$ENV{DESTDIR}\${pearInstallDir}\")
 
   if(EXISTS \"${CMAKE_CURRENT_SOURCE_DIR}/install-pear-nozlib.phar\"
     AND NOT \"${CMAKE_CURRENT_SOURCE_DIR}\" STREQUAL \"${CMAKE_CURRENT_BINARY_DIR}\"
@@ -89,7 +89,7 @@ php_install(CODE "
       execute_process(
         COMMAND ${PHP_EXECUTABLE}
           -n
-          ${CMAKE_CURRENT_BINARY_DIR}/fetch.php
+          ${CMAKE_CURRENT_SOURCE_DIR}/fetch.php
             ${_phpPearInstallerUrl}
             ${CMAKE_CURRENT_BINARY_DIR}/install-pear-nozlib.phar
         OUTPUT_VARIABLE output
@@ -110,14 +110,15 @@ php_install(CODE "
       set(ENV{INSTALL_ROOT} \"\$ENV{DESTDIR}\")
     endif()
 
-    # The PEAR's --config option doesn't seem to install the pear.conf into the
-    # specified directory, but the sysconf can be also bypassed with the
-    # environment variable.
+    # The PEAR sysconf directory by default matches the PHP SYSCONFDIR and it
+    # doesn't seem that any configuration option installs the pear.conf into the
+    # manually specified directory. But the sysconf can be also bypassed with
+    # the environment variable for the installation time.
     set(ENV{PHP_PEAR_SYSCONF_DIR} \${CMAKE_INSTALL_FULL_SYSCONFDIR})
 
     file(
       MAKE_DIRECTORY
-      \$ENV{DESTDIR}${_php_pear_dir}
+      \$ENV{DESTDIR}\${pearInstallDir}
       ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/pear
     )
 
@@ -130,12 +131,12 @@ php_install(CODE "
         -dmemory_limit=-1
         -ddetect_unicode=0
         ${CMAKE_CURRENT_BINARY_DIR}/install-pear-nozlib.phar
-          --dir \"${_php_pear_dir}\"
-          --bin \"\${CMAKE_INSTALL_FULL_BINDIR}\"
-          --metadata \"${_php_pear_dir}\"
-          --data \"${_php_pear_dir}\"
+          --dir \"\${pearInstallDir}\"
+          --bin \"\${binDir}\"
+          --metadata \"\${pearInstallDir}\"
+          --data \"\${pearInstallDir}\"
           --temp \"${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/pear\"
-          #--php \${CMAKE_INSTALL_FULL_BINDIR}/$<TARGET_FILE_NAME:php_cli>
+          --php \${binDir}/$<TARGET_FILE_NAME:php_cli>
           -dp a${PHP_PROGRAM_PREFIX}
           -ds a${PHP_PROGRAM_SUFFIX}
       OUTPUT_VARIABLE output