diff options
Diffstat (limited to 'win32/installer')
| -rw-r--r-- | win32/installer/README | 2 | ||||
| -rw-r--r-- | win32/installer/gen-nsis.php | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/win32/installer/README b/win32/installer/README index 4c79b9a623..0879497db5 100644 --- a/win32/installer/README +++ b/win32/installer/README @@ -14,7 +14,7 @@ Installer Layout: We have the following features: o PHP Core - Always installed. - Includes php4ts.dll, php.ini + common dlls + Includes php5ts.dll, php.ini + common dlls and config files o SAPI diff --git a/win32/installer/gen-nsis.php b/win32/installer/gen-nsis.php index 7e9938f4c6..da94264c9e 100644 --- a/win32/installer/gen-nsis.php +++ b/win32/installer/gen-nsis.php @@ -22,7 +22,7 @@ $sections = array( "files" => array( "$SYSDIR" => array( "dlls\\*.dll", - "php4ts.dll", + "php5ts.dll", ), "\$INSTDIR" => array( "*.txt", @@ -42,7 +42,7 @@ $sections = array( "php.exe" ), "\$INSTDIR\\sapi" => array( - "sapi\\pws-php4cgi.reg" + "sapi\\pws-php5cgi.reg" ), ), ), @@ -171,7 +171,7 @@ function add_sections($pattern, $groupname, $abbrev, &$sections, $sourcedirs, $i foreach ($avail as $extname) { /* mangle name */ - if (preg_match('/(php_|php4|php)([^_].*)\.dll/', basename($extname), $matches)) { + if (preg_match('/(php_|php5|php)([^_].*)\.dll/', basename($extname), $matches)) { $ext = $matches[2]; } else { $ext = basename($extname); @@ -388,7 +388,7 @@ Function CopyPHPIni CopyFiles "$INSTDIR\php.ini-dist" "$WINDIR\php.ini" ; These files will be deleted during post-installation - CopyFiles "<?= $SYSDIR ?>\php4ts.dll" "$INSTDIR\php4ts.dll" + CopyFiles "<?= $SYSDIR ?>\php5ts.dll" "$INSTDIR\php5ts.dll" File "<?= dirname(__FILE__) ?>\setini.php" ; Set the extension_dir setting in the php.ini @@ -411,7 +411,7 @@ Section -post Delete "$INSTDIR\.ini-add" ; Created by the AddIniSetting function Delete "$INSTDIR\setini.php" - Delete "$INSTDIR\php4ts.dll" + Delete "$INSTDIR\php5ts.dll" ; Add to Add/Remove programs list WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\PHP-<?= PHPVERSION ?>" "UninstallString" "$INSTDIR\Uninstall.exe" |