[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFeatures54.wxs ExtensionsFeatures60.wxs ExtensionsFragment54.wxs ExtensionsFragment60.wxs PHPInstallerBase54.wxs PHPInstallerBase54NTS.wxs PHPInstall

2011-10-03 Thread John Mertic 
jmertic  Mon, 03 Oct 2011 19:16:26 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=317677

Log:
Renamed 60 installer components to 54

Changed paths:
A   php/win-installer/trunk/ExtensionsFeatures54.wxs
D   php/win-installer/trunk/ExtensionsFeatures60.wxs
A   php/win-installer/trunk/ExtensionsFragment54.wxs
D   php/win-installer/trunk/ExtensionsFragment60.wxs
A   php/win-installer/trunk/PHPInstallerBase54.wxs
A   php/win-installer/trunk/PHPInstallerBase54NTS.wxs
D   php/win-installer/trunk/PHPInstallerBase60.wxs
D   php/win-installer/trunk/PHPInstallerBase60NTS.wxs
A   php/win-installer/trunk/PHPInstallerCommon54.wxs
A   php/win-installer/trunk/PHPInstallerCommon54NTS.wxs
D   php/win-installer/trunk/PHPInstallerCommon60.wxs
D   php/win-installer/trunk/PHPInstallerCommon60NTS.wxs
A   php/win-installer/trunk/PHPInstallerScripts54.vbs
D   php/win-installer/trunk/PHPInstallerScripts60.vbs
A   php/win-installer/trunk/WebServerConfig54.wxs
A   php/win-installer/trunk/WebServerConfig54NTS.wxs
D   php/win-installer/trunk/WebServerConfig60.wxs
D   php/win-installer/trunk/WebServerConfig60NTS.wxs

diffs exceeded maximum size
-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerScripts52.vbs PHPInstallerScripts53.vbs PHPInstallerScripts54.vbs

2011-10-03 Thread John Mertic 
jmertic  Mon, 03 Oct 2011 19:24:19 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=317678

Log:
Bug 55778 - Write out httpd.conf with forward slashes on Windows 7.

Bug: https://bugs.php.net/55778 (Assigned) PHPIniDir only works correctly for 
forward slashes, not backward slashes
  
Changed paths:
U   php/win-installer/trunk/PHPInstallerScripts52.vbs
U   php/win-installer/trunk/PHPInstallerScripts53.vbs
U   php/win-installer/trunk/PHPInstallerScripts54.vbs

Modified: php/win-installer/trunk/PHPInstallerScripts52.vbs
===
--- php/win-installer/trunk/PHPInstallerScripts52.vbs   2011-10-03 19:16:26 UTC 
(rev 317677)
+++ php/win-installer/trunk/PHPInstallerScripts52.vbs   2011-10-03 19:24:19 UTC 
(rev 317678)
@@ -14,8 +14,14 @@
 If ( right(strApacheDir,1)  \ ) then
 strApacheDir = strApacheDir  \
 End If
-strPHPPath = strInstallDir

+' Bug 55778 - Use forward slashes in Windows 7
+If ( FormatNumber(GetWindowsVersion) = FormatNumber(7.0) ) Then
+strPHPPath = Replace(strInstallDir,\,/)
+Else
+strPHPPath = strInstallDir
+End If
+
 strDirective = vbCrLf  vbCrLf  #BEGIN PHP INSTALLER EDITS - REMOVE ONLY 
ON UNINSTALL  vbCrLf
 If ( strWebServerType = apacheCGI ) Then
 strDirective = strDirective  ScriptAlias /php/   strPHPPath  
  vbCrLf

Modified: php/win-installer/trunk/PHPInstallerScripts53.vbs
===
--- php/win-installer/trunk/PHPInstallerScripts53.vbs   2011-10-03 19:16:26 UTC 
(rev 317677)
+++ php/win-installer/trunk/PHPInstallerScripts53.vbs   2011-10-03 19:24:19 UTC 
(rev 317678)
@@ -14,8 +14,14 @@
 If ( right(strApacheDir,1)  \ ) then
 strApacheDir = strApacheDir  \
 End If
-strPHPPath = strInstallDir

+' Bug 55778 - Use forward slashes in Windows 7
+If ( FormatNumber(GetWindowsVersion) = FormatNumber(7.0) ) Then
+strPHPPath = Replace(strInstallDir,\,/)
+Else
+strPHPPath = strInstallDir
+End If
+
 strDirective = vbCrLf  vbCrLf  #BEGIN PHP INSTALLER EDITS - REMOVE ONLY 
ON UNINSTALL  vbCrLf
 If ( strWebServerType = apacheCGI ) Then
 strDirective = strDirective  ScriptAlias /php/   strPHPPath  
  vbCrLf

Modified: php/win-installer/trunk/PHPInstallerScripts54.vbs
===
--- php/win-installer/trunk/PHPInstallerScripts54.vbs   2011-10-03 19:16:26 UTC 
(rev 317677)
+++ php/win-installer/trunk/PHPInstallerScripts54.vbs   2011-10-03 19:24:19 UTC 
(rev 317678)
@@ -14,8 +14,14 @@
 If ( right(strApacheDir,1)  \ ) then
 strApacheDir = strApacheDir  \
 End If
-strPHPPath = strInstallDir

+' Bug 55778 - Use forward slashes in Windows 7
+If ( FormatNumber(GetWindowsVersion) = FormatNumber(7.0) ) Then
+strPHPPath = Replace(strInstallDir,\,/)
+Else
+strPHPPath = strInstallDir
+End If
+
 strDirective = vbCrLf  vbCrLf  #BEGIN PHP INSTALLER EDITS - REMOVE ONLY 
ON UNINSTALL  vbCrLf
 If ( strWebServerType = apacheCGI ) Then
 strDirective = strDirective  ScriptAlias /php/   strPHPPath  
  vbCrLf

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerScripts52.vbs PHPInstallerScripts53.vbs PHPInstallerScripts60.vbs

2011-01-19 Thread John Mertic 
jmertic  Wed, 19 Jan 2011 20:54:39 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=307597

Log:
Bug 53689 - Fixed typo in the scripts that add the httpd.conf entries.

Bug: http://bugs.php.net/53689 (Open) Installer fails to enter PHP-path into 
httpd.conf
  
Changed paths:
U   php/win-installer/trunk/PHPInstallerScripts52.vbs
U   php/win-installer/trunk/PHPInstallerScripts53.vbs
U   php/win-installer/trunk/PHPInstallerScripts60.vbs

Modified: php/win-installer/trunk/PHPInstallerScripts52.vbs
===
--- php/win-installer/trunk/PHPInstallerScripts52.vbs   2011-01-19 19:48:28 UTC 
(rev 307596)
+++ php/win-installer/trunk/PHPInstallerScripts52.vbs   2011-01-19 20:54:39 UTC 
(rev 307597)
@@ -14,8 +14,7 @@
 If ( right(strApacheDir,1)  \ ) then
 strApacheDir = strApacheDir  \
 End If
-' Bug 52753 - Comment out since it causes an invalid http.conf file
-' strPHPPath = Replace(strInstallDir,\,/)
+strPHPPath = strInstallDir

 strDirective = vbCrLf  vbCrLf  #BEGIN PHP INSTALLER EDITS - REMOVE ONLY 
ON UNINSTALL  vbCrLf
 If ( strWebServerType = apacheCGI ) Then

Modified: php/win-installer/trunk/PHPInstallerScripts53.vbs
===
--- php/win-installer/trunk/PHPInstallerScripts53.vbs   2011-01-19 19:48:28 UTC 
(rev 307596)
+++ php/win-installer/trunk/PHPInstallerScripts53.vbs   2011-01-19 20:54:39 UTC 
(rev 307597)
@@ -14,8 +14,7 @@
 If ( right(strApacheDir,1)  \ ) then
 strApacheDir = strApacheDir  \
 End If
-' Bug 52753 - Comment out since it causes an invalid http.conf file
-' strPHPPath = Replace(strInstallDir,\,/)
+strPHPPath = strInstallDir

 strDirective = vbCrLf  vbCrLf  #BEGIN PHP INSTALLER EDITS - REMOVE ONLY 
ON UNINSTALL  vbCrLf
 If ( strWebServerType = apacheCGI ) Then

Modified: php/win-installer/trunk/PHPInstallerScripts60.vbs
===
--- php/win-installer/trunk/PHPInstallerScripts60.vbs   2011-01-19 19:48:28 UTC 
(rev 307596)
+++ php/win-installer/trunk/PHPInstallerScripts60.vbs   2011-01-19 20:54:39 UTC 
(rev 307597)
@@ -14,8 +14,7 @@
 If ( right(strApacheDir,1)  \ ) then
 strApacheDir = strApacheDir  \
 End If
-' Bug 52753 - Comment out since it causes an invalid http.conf file
-' strPHPPath = Replace(strInstallDir,\,/)
+strPHPPath = strInstallDir

 strDirective = vbCrLf  vbCrLf  #BEGIN PHP INSTALLER EDITS - REMOVE ONLY 
ON UNINSTALL  vbCrLf
 If ( strWebServerType = apacheCGI ) Then

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

2010-12-22 Thread John Mertic 
jmertic  Wed, 22 Dec 2010 15:53:33 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306573

Log:
Bug 12595 - Fix problem where only the first argument to the php script is 
passed; now support up to 9 arguments.

Bug: http://bugs.php.net/12595 (Open) $argv passing
  
Changed paths:
U   php/win-installer/trunk/PHPInstallerBase52.wxs
U   php/win-installer/trunk/PHPInstallerBase52NTS.wxs
U   php/win-installer/trunk/PHPInstallerBase53.wxs
U   php/win-installer/trunk/PHPInstallerBase53NTS.wxs
U   php/win-installer/trunk/PHPInstallerBase60.wxs
U   php/win-installer/trunk/PHPInstallerBase60NTS.wxs

Modified: php/win-installer/trunk/PHPInstallerBase52.wxs
===
--- php/win-installer/trunk/PHPInstallerBase52.wxs  2010-12-22 10:25:33 UTC 
(rev 306572)
+++ php/win-installer/trunk/PHPInstallerBase52.wxs  2010-12-22 15:53:33 UTC 
(rev 306573)
@@ -197,7 +197,7 @@
   Sequence=10
   Command=Run
   Target=[!file13]
-  Argument=quot;%1quot;/
+  Argument=quot;%1quot; quot;%2quot; quot;%3quot; 
quot;%4quot; quot;%5quot; quot;%6quot; quot;%7quot; quot;%8quot; 
quot;%9quot;/
   /Extension
 /ProgId
   /Component

Modified: php/win-installer/trunk/PHPInstallerBase52NTS.wxs
===
--- php/win-installer/trunk/PHPInstallerBase52NTS.wxs   2010-12-22 10:25:33 UTC 
(rev 306572)
+++ php/win-installer/trunk/PHPInstallerBase52NTS.wxs   2010-12-22 15:53:33 UTC 
(rev 306573)
@@ -175,7 +175,7 @@
   Sequence=10
   Command=Run
   Target=[!file13]
-  Argument=quot;%1quot;/
+  Argument=quot;%1quot; quot;%2quot; quot;%3quot; 
quot;%4quot; quot;%5quot; quot;%6quot; quot;%7quot; quot;%8quot; 
quot;%9quot;/
   /Extension
 /ProgId
   /Component

Modified: php/win-installer/trunk/PHPInstallerBase53.wxs
===
--- php/win-installer/trunk/PHPInstallerBase53.wxs  2010-12-22 10:25:33 UTC 
(rev 306572)
+++ php/win-installer/trunk/PHPInstallerBase53.wxs  2010-12-22 15:53:33 UTC 
(rev 306573)
@@ -196,8 +196,8 @@
 Verb Id=open
   Sequence=10
   Command=Run
-  Target=[!file13]
-  Argument=quot;%1quot;/
+  Target=[!file13]
+  Argument=quot;%1quot; quot;%2quot; quot;%3quot; 
quot;%4quot; quot;%5quot; quot;%6quot; quot;%7quot; quot;%8quot; 
quot;%9quot;/
   /Extension
 /ProgId
   /Component

Modified: php/win-installer/trunk/PHPInstallerBase53NTS.wxs
===
--- php/win-installer/trunk/PHPInstallerBase53NTS.wxs   2010-12-22 10:25:33 UTC 
(rev 306572)
+++ php/win-installer/trunk/PHPInstallerBase53NTS.wxs   2010-12-22 15:53:33 UTC 
(rev 306573)
@@ -175,7 +175,7 @@
   Sequence=10
   Command=Run
   Target=[!file13]
-  Argument=quot;%1quot;/
+  Argument=quot;%1quot; quot;%2quot; quot;%3quot; 
quot;%4quot; quot;%5quot; quot;%6quot; quot;%7quot; quot;%8quot; 
quot;%9quot;/
   /Extension
 /ProgId
   /Component

Modified: php/win-installer/trunk/PHPInstallerBase60.wxs
===
--- php/win-installer/trunk/PHPInstallerBase60.wxs  2010-12-22 10:25:33 UTC 
(rev 306572)
+++ php/win-installer/trunk/PHPInstallerBase60.wxs  2010-12-22 15:53:33 UTC 
(rev 306573)
@@ -197,7 +197,7 @@
   Sequence=10
   Command=Run
   Target=[!file13]
-  Argument=quot;%1quot;/
+  Argument=quot;%1quot; quot;%2quot; quot;%3quot; 
quot;%4quot; quot;%5quot; quot;%6quot; quot;%7quot; quot;%8quot; 
quot;%9quot;/
   /Extension
 /ProgId
   /Component

Modified: php/win-installer/trunk/PHPInstallerBase60NTS.wxs
===
--- php/win-installer/trunk/PHPInstallerBase60NTS.wxs   2010-12-22 10:25:33 UTC 
(rev 306572)
+++ php/win-installer/trunk/PHPInstallerBase60NTS.wxs   2010-12-22 15:53:33 UTC 
(rev 306573)
@@ -175,7 +175,7 @@
   Sequence=10
   Command=Run
   Target=[!file13]
-  Argument=quot;%1quot;/
+  Argument=quot;%1quot; quot;%2quot; quot;%3quot; 
quot;%4quot; quot;%5quot; quot;%6quot; quot;%7quot; quot;%8quot; 
quot;%9quot;/
   /Extension
 /ProgId
   /Component

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerScripts52.vbs PHPInstallerScripts53.vbs PHPInstallerScripts60.vbs

2010-12-22 Thread John Mertic 
jmertic  Wed, 22 Dec 2010 16:03:43 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306574

Log:
Bug 52753 - Comment out changing '\' to '/' in the path to the PHP dll/exe 
since it causes an invalid http.conf file

Bug: http://bugs.php.net/52753 (Assigned) With proposed fix: use of '/' in 
httpd.conf causes apache crash 
  
Changed paths:
U   php/win-installer/trunk/PHPInstallerScripts52.vbs
U   php/win-installer/trunk/PHPInstallerScripts53.vbs
U   php/win-installer/trunk/PHPInstallerScripts60.vbs

Modified: php/win-installer/trunk/PHPInstallerScripts52.vbs
===
--- php/win-installer/trunk/PHPInstallerScripts52.vbs   2010-12-22 15:53:33 UTC 
(rev 306573)
+++ php/win-installer/trunk/PHPInstallerScripts52.vbs   2010-12-22 16:03:43 UTC 
(rev 306574)
@@ -14,7 +14,8 @@
 If ( right(strApacheDir,1)  \ ) then
 strApacheDir = strApacheDir  \
 End If
-strPHPPath = Replace(strInstallDir,\,/)
+' Bug 52753 - Comment out since it causes an invalid http.conf file
+' strPHPPath = Replace(strInstallDir,\,/)

 strDirective = vbCrLf  vbCrLf  #BEGIN PHP INSTALLER EDITS - REMOVE ONLY 
ON UNINSTALL  vbCrLf
 If ( strWebServerType = apacheCGI ) Then

Modified: php/win-installer/trunk/PHPInstallerScripts53.vbs
===
--- php/win-installer/trunk/PHPInstallerScripts53.vbs   2010-12-22 15:53:33 UTC 
(rev 306573)
+++ php/win-installer/trunk/PHPInstallerScripts53.vbs   2010-12-22 16:03:43 UTC 
(rev 306574)
@@ -14,7 +14,8 @@
 If ( right(strApacheDir,1)  \ ) then
 strApacheDir = strApacheDir  \
 End If
-strPHPPath = Replace(strInstallDir,\,/)
+' Bug 52753 - Comment out since it causes an invalid http.conf file
+' strPHPPath = Replace(strInstallDir,\,/)

 strDirective = vbCrLf  vbCrLf  #BEGIN PHP INSTALLER EDITS - REMOVE ONLY 
ON UNINSTALL  vbCrLf
 If ( strWebServerType = apacheCGI ) Then

Modified: php/win-installer/trunk/PHPInstallerScripts60.vbs
===
--- php/win-installer/trunk/PHPInstallerScripts60.vbs   2010-12-22 15:53:33 UTC 
(rev 306573)
+++ php/win-installer/trunk/PHPInstallerScripts60.vbs   2010-12-22 16:03:43 UTC 
(rev 306574)
@@ -14,7 +14,8 @@
 If ( right(strApacheDir,1)  \ ) then
 strApacheDir = strApacheDir  \
 End If
-strPHPPath = Replace(strInstallDir,\,/)
+' Bug 52753 - Comment out since it causes an invalid http.conf file
+' strPHPPath = Replace(strInstallDir,\,/)

 strDirective = vbCrLf  vbCrLf  #BEGIN PHP INSTALLER EDITS - REMOVE ONLY 
ON UNINSTALL  vbCrLf
 If ( strWebServerType = apacheCGI ) Then

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

2010-12-22 Thread John Mertic 
jmertic  Wed, 22 Dec 2010 19:15:03 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306577

Log:
Newer versions of Windows allow the use of %*, so let's go with that instead.

Changed paths:
U   php/win-installer/trunk/PHPInstallerBase53.wxs
U   php/win-installer/trunk/PHPInstallerBase53NTS.wxs
U   php/win-installer/trunk/PHPInstallerBase60.wxs
U   php/win-installer/trunk/PHPInstallerBase60NTS.wxs

Modified: php/win-installer/trunk/PHPInstallerBase53.wxs
===
--- php/win-installer/trunk/PHPInstallerBase53.wxs  2010-12-22 18:42:46 UTC 
(rev 306576)
+++ php/win-installer/trunk/PHPInstallerBase53.wxs  2010-12-22 19:15:03 UTC 
(rev 306577)
@@ -197,7 +197,7 @@
   Sequence=10
   Command=Run
   Target=[!file13]
-  Argument=quot;%1quot; quot;%2quot; quot;%3quot; 
quot;%4quot; quot;%5quot; quot;%6quot; quot;%7quot; quot;%8quot; 
quot;%9quot;/
+  Argument=quot;%*quot;/
   /Extension
 /ProgId
   /Component

Modified: php/win-installer/trunk/PHPInstallerBase53NTS.wxs
===
--- php/win-installer/trunk/PHPInstallerBase53NTS.wxs   2010-12-22 18:42:46 UTC 
(rev 306576)
+++ php/win-installer/trunk/PHPInstallerBase53NTS.wxs   2010-12-22 19:15:03 UTC 
(rev 306577)
@@ -175,7 +175,7 @@
   Sequence=10
   Command=Run
   Target=[!file13]
-  Argument=quot;%1quot; quot;%2quot; quot;%3quot; 
quot;%4quot; quot;%5quot; quot;%6quot; quot;%7quot; quot;%8quot; 
quot;%9quot;/
+  Argument=quot;%*quot;/
   /Extension
 /ProgId
   /Component

Modified: php/win-installer/trunk/PHPInstallerBase60.wxs
===
--- php/win-installer/trunk/PHPInstallerBase60.wxs  2010-12-22 18:42:46 UTC 
(rev 306576)
+++ php/win-installer/trunk/PHPInstallerBase60.wxs  2010-12-22 19:15:03 UTC 
(rev 306577)
@@ -197,7 +197,7 @@
   Sequence=10
   Command=Run
   Target=[!file13]
-  Argument=quot;%1quot; quot;%2quot; quot;%3quot; 
quot;%4quot; quot;%5quot; quot;%6quot; quot;%7quot; quot;%8quot; 
quot;%9quot;/
+  Argument=quot;%*quot;/
   /Extension
 /ProgId
   /Component

Modified: php/win-installer/trunk/PHPInstallerBase60NTS.wxs
===
--- php/win-installer/trunk/PHPInstallerBase60NTS.wxs   2010-12-22 18:42:46 UTC 
(rev 306576)
+++ php/win-installer/trunk/PHPInstallerBase60NTS.wxs   2010-12-22 19:15:03 UTC 
(rev 306577)
@@ -175,7 +175,7 @@
   Sequence=10
   Command=Run
   Target=[!file13]
-  Argument=quot;%1quot; quot;%2quot; quot;%3quot; 
quot;%4quot; quot;%5quot; quot;%6quot; quot;%7quot; quot;%8quot; 
quot;%9quot;/
+  Argument=quot;%*quot;/
   /Extension
 /ProgId
   /Component

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFeatures53.wxs ExtensionsFragment53.wxs

2010-06-17 Thread Pierre Joye 
pajoye   Thu, 17 Jun 2010 19:44:46 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=300545

Log:
- add libsasl (ldap)

Changed paths:
U   php/win-installer/trunk/ExtensionsFeatures53.wxs
U   php/win-installer/trunk/ExtensionsFragment53.wxs

Modified: php/win-installer/trunk/ExtensionsFeatures53.wxs
===
--- php/win-installer/trunk/ExtensionsFeatures53.wxs2010-06-17 19:26:34 UTC 
(rev 300544)
+++ php/win-installer/trunk/ExtensionsFeatures53.wxs2010-06-17 19:44:46 UTC 
(rev 300545)
@@ -194,6 +194,7 @@
ComponentRef Id=php_ldap/
ComponentRef Id=libeay32DLL/
ComponentRef Id=ssleay32DLL/
+   ComponentRef Id=libsaslDLL/
/Feature
Feature AllowAdvertise=no Id=ext_php_lzf 
Title=$(loc.Featureext_php_lzfTitle) 
Description=$(loc.Featureext_php_lzfDescription) Level=10
ComponentRef Id=php_lzf/

Modified: php/win-installer/trunk/ExtensionsFragment53.wxs
===
--- php/win-installer/trunk/ExtensionsFragment53.wxs2010-06-17 19:26:34 UTC 
(rev 300544)
+++ php/win-installer/trunk/ExtensionsFragment53.wxs2010-06-17 19:44:46 UTC 
(rev 300545)
@@ -44,6 +44,9 @@
Component Id=ssleay32DLL DiskId=1 
Guid=D7E5F122-9764-4165-BDDA-922D60408C2F
File Id=filessleay32DLL Name=ssleay32.dll 
Source=Files\ssleay32.dll /
/Component
+   Component Id=libsaslDLL DiskId=1 
Guid=5A75E72B-6871-4d40-9FB4-0EA8ABE4F041
+   File Id=filelibsaslDLL Name=libsasl.dll 
Source=Files\libsasl.dll /
+   /Component
Component Id=yazDLL DiskId=1 
Guid=4C0CE69A-DBE4-4294-88CC-F6E82A3CFCD1
File Id=fileyazSLL Name=yaz.dll 
Source=Files\yaz.dll /
/Component

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs PHPInstaller

2010-05-12 Thread John Mertic 
jmertic  Wed, 12 May 2010 19:18:22 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=299304

Log:
Bug #50584 - Fix problem with expecting newly created registry values to be 
available in the VB installer scripts by instead passing those values to the 
custom action via CustomActionData property.

Bug: http://bugs.php.net/50584 (Assigned) Windows installer does not configure 
Apache in silent mode
  
Changed paths:
U   php/win-installer/trunk/PHPInstallerBase52.wxs
U   php/win-installer/trunk/PHPInstallerBase52NTS.wxs
U   php/win-installer/trunk/PHPInstallerBase53.wxs
U   php/win-installer/trunk/PHPInstallerBase53NTS.wxs
U   php/win-installer/trunk/PHPInstallerBase60.wxs
U   php/win-installer/trunk/PHPInstallerBase60NTS.wxs
U   php/win-installer/trunk/PHPInstallerScripts52.vbs
U   php/win-installer/trunk/PHPInstallerScripts53.vbs
U   php/win-installer/trunk/PHPInstallerScripts60.vbs

Modified: php/win-installer/trunk/PHPInstallerBase52.wxs
===
--- php/win-installer/trunk/PHPInstallerBase52.wxs	2010-05-12 18:51:53 UTC (rev 299303)
+++ php/win-installer/trunk/PHPInstallerBase52.wxs	2010-05-12 19:18:22 UTC (rev 299304)
@@ -794,10 +794,18 @@
   Execute=deferred
   Impersonate=no
   VBScriptCall=configIIS4 /
-CustomAction Id=configIIS4CustomActionDataValue
+CustomAction Id=configIIS4CGICustomActionDataValue
   Return=check
   Property=configIIS4
-  Value=[INSTALLDIR] /
+  Value=[INSTALLDIR],iis4CGI /
+CustomAction Id=configIIS4ISAPICustomActionDataValue
+  Return=check
+  Property=configIIS4
+  Value=[INSTALLDIR],iis4ISAPI /
+CustomAction Id=configIIS4FastCGICustomActionDataValue
+  Return=check
+  Property=configIIS4
+  Value=[INSTALLDIR],iis4FastCGI /
 CustomAction Id=unconfigIIS4
   BinaryKey=PHPInstallerScripts
   Return=check
@@ -810,10 +818,22 @@
   Execute=deferred
   Impersonate=no
   VBScriptCall=configApache /
-CustomAction Id=configApacheCustomActionDataValue
+CustomAction Id=configApache13CustomActionDataValue
   Return=check
   Property=configApache
-  Value=[APACHEDIR],[INSTALLDIR] /
+  Value=[APACHEDIR],[INSTALLDIR],apache13 /
+CustomAction Id=configApache20CustomActionDataValue
+  Return=check
+  Property=configApache
+  Value=[APACHEDIR],[INSTALLDIR],apache20 /
+CustomAction Id=configApache22CustomActionDataValue
+  Return=check
+  Property=configApache
+  Value=[APACHEDIR],[INSTALLDIR],apache22 /
+CustomAction Id=configApacheCGICustomActionDataValue
+  Return=check
+  Property=configApache
+  Value=[APACHEDIR],[INSTALLDIR],apacheCGI /
 CustomAction Id=unconfigApache
   BinaryKey=PHPInstallerScripts
   Return=check
@@ -972,19 +992,34 @@
   Custom Action=fcgiconfigJSFastCGIremoveXP After=fcgiconfigJSFastCGIremoveCmdXP
 ![CDATA[(VersionNT = 501 AND ServicePackLevel = 2) AND iis4FastCGI = 2]]
   /Custom
-  Custom Action=configIIS4CustomActionDataValue After=WriteRegistryValues
-![CDATA[VersionNT  600 AND iis4FastCGI = 3]]
+  Custom Action=configIIS4CGICustomActionDataValue After=WriteRegistryValues
+![CDATA[VersionNT  600 AND iis4CGI = 3]]
   /Custom
-  Custom Action=configIIS4 After=configIIS4CustomActionDataValue
+  Custom Action=configIIS4ISAPICustomActionDataValue After=WriteRegistryValues
+![CDATA[VersionNT  600 AND iis4ISAPI = 3]]
+  /Custom
+  Custom Action=configIIS4FastCGICustomActionDataValue After=WriteRegistryValues
 ![CDATA[VersionNT  600 AND iis4FastCGI = 3]]
   /Custom
+  Custom Action=configIIS4 After=configIIS4FastCGICustomActionDataValue
+![CDATA[VersionNT  600 AND (iis4FastCGI = 3 OR iis4ISAPI = 3 OR iis4CGI = 3)]]
+  /Custom
   Custom Action=unconfigIIS4 After=InstallInitialize
-![CDATA[VersionNT  600 AND iis4FastCGI = 2]]
+![CDATA[VersionNT  600 AND (iis4FastCGI = 2 OR iis4ISAPI = 2 OR iis4CGI = 2)]]
   /Custom
-  Custom Action=configApacheCustomActionDataValue After=WriteRegistryValues
-![CDATA[apache13 = 3 OR apache20 = 3 OR apache22 = 3 OR apacheCGI = 3]]
+  Custom Action=configApache13CustomActionDataValue After=WriteRegistryValues
+![CDATA[apache13 = 3]]
   /Custom
-  Custom Action=configApache After=configApacheCustomActionDataValue
+  Custom Action=configApache20CustomActionDataValue After=WriteRegistryValues
+![CDATA[apache20 = 3]]
+  /Custom
+  Custom Action=configApache22CustomActionDataValue After=WriteRegistryValues
+![CDATA[apache22 = 3]]
+  /Custom
+  Custom Action=configApacheCGICustomActionDataValue After=WriteRegistryValues
+![CDATA[apacheCGI = 3]]
+  /Custom
+  Custom Action=configApache After=configApacheCGICustomActionDataValue

[PHP-CVS] svn: /php/win-installer/trunk/ license.rtf

2010-05-10 Thread John Mertic 
jmertic  Mon, 10 May 2010 17:43:23 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=299220

Log:
Update license year.

Changed paths:
U   php/win-installer/trunk/license.rtf

Modified: php/win-installer/trunk/license.rtf
===
(Binary files differ)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/win-installer/trunk/

2010-03-23 Thread John Mertic 
jmertic  Tue, 23 Mar 2010 17:34:11 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296683

Log:
Updated the ignored files.

Changed paths:
_U  php/win-installer/trunk/


Property changes on: php/win-installer/trunk
___
Modified: svn:ignore
   - *.wixobj
*.wixlib
*.msi
Files

   + *.wixobj
*.wixlib
*.msi
Files
ExtensionsComponents.wxs
ExtensionsFeatures.wxs
ExtensionsFeaturesBuild.wxs


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFragment53.wxs

2010-02-15 Thread Pierre Joye 
pajoye   Mon, 15 Feb 2010 19:14:30 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=295097

Log:
- #51046, fix long names for enchant deps

Bug: http://bugs.php.net/51046 (Feedback) 'gmodul_2.dll' should be named 
'gmodule-2.dll'
  
Changed paths:
U   php/win-installer/trunk/ExtensionsFragment53.wxs

Modified: php/win-installer/trunk/ExtensionsFragment53.wxs
===
--- php/win-installer/trunk/ExtensionsFragment53.wxs2010-02-15 18:50:14 UTC 
(rev 295096)
+++ php/win-installer/trunk/ExtensionsFragment53.wxs2010-02-15 19:14:30 UTC 
(rev 295097)
@@ -24,13 +24,13 @@
File Id=fileglib2DLL Name=glib-2.dll 
Source=Files\glib-2.dll /
/Component
Component Id=gmodule2DLL DiskId=1 
Guid=9F64F164-C395-4edf-A615-44A212FBCCB7
-   File Id=filegmodule2DLL Name=gmodul_2.dll 
Source=Files\gmodule-2.dll /
+   File Id=filegmodule2DLL Name=gmodul2.dll 
LongName=gmodule-2.dll Source=Files\gmodule-2.dll /
/Component
Component Id=libenchantmyspellDLL DiskId=1 
Guid=A53BEC7D-A42C-4bfb-A64B-1727E786A270
-   File Id=filelibenchantmyspellDLL 
Name=libenm_1.dll Source=Files\libenchant_myspell.dll /
+   File Id=filelibenchantmyspellDLL 
Name=libenm_1.dll LongName=libenchant_myspell.dll 
Source=Files\libenchant_myspell.dll /
/Component
Component Id=libenchantispellDLL DiskId=1 
Guid=C39C22EC-D3F5-4a73-A27A-BF4C1F45F8C1
-   File Id=filelibenchantispellDLL 
Name=libeni_1.dll Source=Files\libenchant_ispell.dll /
+   File Id=filelibenchantispellDLL 
Name=libeni_1.dll LongName=libenchant_ispell.dll  
Source=Files\libenchant_ispell.dll /
/Component
Component Id=ntwdblibDLL DiskId=1 
Guid=7FA2C1EB-5166-4D16-AD36-DEF92A491D8B
File Id=filentwdblibDLL Name=ntwdblib.dll 
Source=Files\ntwdblib.dll /

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/win-installer/trunk/ GenPHPInstaller.wxs.php PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInsta

2009-10-29 Thread Kalle Sommer Nielsen 
Hi John

2009/10/28 John Mertic jmer...@php.net:
 Modified: php/win-installer/trunk/PHPInstallerBase53.wxs
 ===
 --- php/win-installer/trunk/PHPInstallerBase53.wxs      2009-10-28 14:53:28 
 UTC (rev 290032)
 +++ php/win-installer/trunk/PHPInstallerBase53.wxs      2009-10-28 14:59:10 
 UTC (rev 290033)
 @@ -211,6 +211,13 @@
               Action='write'
               Type='string'
               Value='[INSTALLDIR]' /
 +            Registry Id='PHPRegistryVersion'
 +              Root='HKLM'
 +              Key='Software\PHP'
 +              Name='Version'
 +              Action='write'
 +              Type='string'
 +              Value='5.2.0' /
           /Component
           Component Id=phpEXE
             DiskId=1

For 5.3 and 6.0 I guess this value shouldn't be 5.2 :)


-- 
regrads,

Kalle Sommer Nielsen
ka...@php.net

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/win-installer/trunk/ GenPHPInstaller.wxs.php PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstall

2009-10-29 Thread John Mertic 
It's actually just a placeholder value that get's changed to the  
correct value as a part of the build script. But good catch  
nonetheless :-).


Thanks!

John Mertic
jmer...@gmail.com



On Oct 29, 2009, at 9:03 AM, Kalle Sommer Nielsen wrote:


Hi John

2009/10/28 John Mertic jmer...@php.net:

Modified: php/win-installer/trunk/PHPInstallerBase53.wxs
===
--- php/win-installer/trunk/PHPInstallerBase53.wxs  2009-10-28  
14:53:28 UTC (rev 290032)
+++ php/win-installer/trunk/PHPInstallerBase53.wxs  2009-10-28  
14:59:10 UTC (rev 290033)

@@ -211,6 +211,13 @@
  Action='write'
  Type='string'
  Value='[INSTALLDIR]' /
+Registry Id='PHPRegistryVersion'
+  Root='HKLM'
+  Key='Software\PHP'
+  Name='Version'
+  Action='write'
+  Type='string'
+  Value='5.2.0' /
  /Component
  Component Id=phpEXE
DiskId=1


For 5.3 and 6.0 I guess this value shouldn't be 5.2 :)


--
regrads,

Kalle Sommer Nielsen
ka...@php.net



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerCommon52NTS.wxs PHPInstallerCommon53NTS.wxs PHPInstallerCommon60NTS.wxs PHPInstallerCommonNTS52.wxs PHPInstallerCommonNTS53.wxs PHPInstallerCommonN

2009-10-28 Thread John Mertic 
jmertic  Wed, 28 Oct 2009 13:13:45 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=290031

Log:
Renamed the PHPInstalerCommon*.php files to use the name naming convention for 
the NTS variants.

Changed paths:
A + php/win-installer/trunk/PHPInstallerCommon52NTS.wxs
(from php/win-installer/trunk/PHPInstallerCommonNTS52.wxs:r290026)
A + php/win-installer/trunk/PHPInstallerCommon53NTS.wxs
(from php/win-installer/trunk/PHPInstallerCommonNTS53.wxs:r290026)
A + php/win-installer/trunk/PHPInstallerCommon60NTS.wxs
(from php/win-installer/trunk/PHPInstallerCommonNTS60.wxs:r290026)
D   php/win-installer/trunk/PHPInstallerCommonNTS52.wxs
D   php/win-installer/trunk/PHPInstallerCommonNTS53.wxs
D   php/win-installer/trunk/PHPInstallerCommonNTS60.wxs
U   php/win-installer/trunk/build.bat

diffs exceeded maximum size
-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/win-installer/trunk/ GenPHPInstaller.wxs.php PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBa

2009-10-28 Thread John Mertic 
jmertic  Wed, 28 Oct 2009 14:59:10 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=290033

Log:
Add HKLM/Software/PHP/Version registry key on install.

Changed paths:
_U  php/win-installer/trunk/
U   php/win-installer/trunk/GenPHPInstaller.wxs.php
U   php/win-installer/trunk/PHPInstallerBase52.wxs
U   php/win-installer/trunk/PHPInstallerBase52NTS.wxs
U   php/win-installer/trunk/PHPInstallerBase53.wxs
U   php/win-installer/trunk/PHPInstallerBase53NTS.wxs
U   php/win-installer/trunk/PHPInstallerBase60.wxs
U   php/win-installer/trunk/PHPInstallerBase60NTS.wxs


Property changes on: php/win-installer/trunk
___
Modified: svn:ignore
   - *.wixobj
*.wixlib
*.msi

   + *.wixobj
*.wixlib
*.msi
Files


Modified: php/win-installer/trunk/GenPHPInstaller.wxs.php
===
--- php/win-installer/trunk/GenPHPInstaller.wxs.php 2009-10-28 14:53:28 UTC 
(rev 290032)
+++ php/win-installer/trunk/GenPHPInstaller.wxs.php 2009-10-28 14:59:10 UTC 
(rev 290033)
@@ -15,6 +15,15 @@
 
$PHPInstallerBaseWXS-getElementsByTagName('Product')-item(0)-setAttribute(Version,$version);
 
$PHPInstallerBaseWXS-getElementsByTagName('Product')-item(0)-setAttribute(Id,genGUID());
 
$PHPInstallerBaseWXS-getElementsByTagName('Package')-item(0)-setAttribute(Description,PHP
 $version Installer);
+$tags = $PHPInstallerBaseWXS-getElementsByTagName('Registry');
+$i = 0;
+while ( $i  $tags-length ) {
+if ( $tags-item($i)-getAttribute('Id') == 'PHPRegistryVersion' ) {
+$tags-item($i)-setAttribute(Value,$version);
+break;
+}
+$i++;
+}

 // Add in the VC9 MSM if we are building that installer
 if ( !empty($includemsm) ) {

Modified: php/win-installer/trunk/PHPInstallerBase52.wxs
===
--- php/win-installer/trunk/PHPInstallerBase52.wxs  2009-10-28 14:53:28 UTC 
(rev 290032)
+++ php/win-installer/trunk/PHPInstallerBase52.wxs  2009-10-28 14:59:10 UTC 
(rev 290033)
@@ -211,6 +211,13 @@
   Action='write'
   Type='string'
   Value='[INSTALLDIR]' /
+Registry Id='PHPRegistryVersion'
+  Root='HKLM'
+  Key='Software\PHP'
+  Name='Version'
+  Action='write'
+  Type='string'
+  Value='5.2.0' /
   /Component
   Component Id=phpEXE
 DiskId=1

Modified: php/win-installer/trunk/PHPInstallerBase52NTS.wxs
===
--- php/win-installer/trunk/PHPInstallerBase52NTS.wxs   2009-10-28 14:53:28 UTC 
(rev 290032)
+++ php/win-installer/trunk/PHPInstallerBase52NTS.wxs   2009-10-28 14:59:10 UTC 
(rev 290033)
@@ -189,6 +189,13 @@
   Action='write'
   Type='string'
   Value='[INSTALLDIR]' /
+Registry Id='PHPRegistryVersion'
+  Root='HKLM'
+  Key='Software\PHP'
+  Name='Version'
+  Action='write'
+  Type='string'
+  Value='5.2.0' /
   /Component
   Component Id=phpEXE
 DiskId=1

Modified: php/win-installer/trunk/PHPInstallerBase53.wxs
===
--- php/win-installer/trunk/PHPInstallerBase53.wxs  2009-10-28 14:53:28 UTC 
(rev 290032)
+++ php/win-installer/trunk/PHPInstallerBase53.wxs  2009-10-28 14:59:10 UTC 
(rev 290033)
@@ -211,6 +211,13 @@
   Action='write'
   Type='string'
   Value='[INSTALLDIR]' /
+Registry Id='PHPRegistryVersion'
+  Root='HKLM'
+  Key='Software\PHP'
+  Name='Version'
+  Action='write'
+  Type='string'
+  Value='5.2.0' /
   /Component
   Component Id=phpEXE
 DiskId=1

Modified: php/win-installer/trunk/PHPInstallerBase53NTS.wxs
===
--- php/win-installer/trunk/PHPInstallerBase53NTS.wxs   2009-10-28 14:53:28 UTC 
(rev 290032)
+++ php/win-installer/trunk/PHPInstallerBase53NTS.wxs   2009-10-28 14:59:10 UTC 
(rev 290033)
@@ -189,6 +189,13 @@
   Action='write'
   Type='string'
   Value='[INSTALLDIR]' /
+Registry Id='PHPRegistryVersion'
+  Root='HKLM'
+  Key='Software\PHP'
+  Name='Version'
+  Action='write'
+  Type='string'
+  Value='5.2.0' /
   /Component
   Component Id=phpEXE
 DiskId=1

Modified: php/win-installer/trunk/PHPInstallerBase60.wxs
===
--- php/win-installer/trunk/PHPInstallerBase60.wxs  2009-10-28 14:53:28 UTC 
(rev 290032)

[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFeatures53.wxs ExtensionsFragment53.wxs

2009-10-19 Thread Pierre-Alain Joye 
pajoye   Mon, 19 Oct 2009 20:09:19 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=289771

Log:
- add glib and enchant backends to 5.3

Changed paths:
U   php/win-installer/trunk/ExtensionsFeatures53.wxs
U   php/win-installer/trunk/ExtensionsFragment53.wxs

Modified: php/win-installer/trunk/ExtensionsFeatures53.wxs
===
--- php/win-installer/trunk/ExtensionsFeatures53.wxs2009-10-19 20:07:25 UTC 
(rev 289770)
+++ php/win-installer/trunk/ExtensionsFeatures53.wxs2009-10-19 20:09:19 UTC 
(rev 289771)
@@ -80,6 +80,10 @@
Feature AllowAdvertise=no Id=ext_php_enchant 
Title=$(loc.Featureext_php_enchantTitle) 
Description=$(loc.Featureext_php_enchantDescription) Level=10
ComponentRef Id=php_enchant/
ComponentRef Id=libenchantDLL/
+   ComponentRef Id=glib2DLL/
+   ComponentRef Id=gmodule2DLL/
+   ComponentRef Id=libenchantmyspellDLL/
+   ComponentRef Id=libenchantispellDLL/
/Feature
Feature AllowAdvertise=no Id=ext_php_event 
Title=$(loc.Featureext_php_eventTitle) 
Description=$(loc.Featureext_php_eventDescription) Level=10
ComponentRef Id=php_event/

Modified: php/win-installer/trunk/ExtensionsFragment53.wxs
===
--- php/win-installer/trunk/ExtensionsFragment53.wxs2009-10-19 20:07:25 UTC 
(rev 289770)
+++ php/win-installer/trunk/ExtensionsFragment53.wxs2009-10-19 20:09:19 UTC 
(rev 289771)
@@ -20,6 +20,18 @@
Component Id=libenchantDLL DiskId=1 
Guid=E27E4C40-156D-11DE-8C30-0800200C9A66
File Id=filelibenchantDLL 
Name=LIBENC_1.DLL LongName=libenchant.dll Source=Files\libenchant.dll /
/Component
+   Component Id=glib2DLL DiskId=1 
Guid=837C3829-1DB4-4f6e-A6E1-A8C746A0BBBC
+   File Id=fileglib2DLL Name=glib-2.dll 
Source=Files\glib-2.dll /
+   /Component
+   Component Id=gmodule2DLL DiskId=1 
Guid=9F64F164-C395-4edf-A615-44A212FBCCB7
+   File Id=filegmodule2DLL Name=gmodul_2.dll 
Source=Files\gmodule-2.dll /
+   /Component
+   Component Id=libenchantmyspellDLL DiskId=1 
Guid=A53BEC7D-A42C-4bfb-A64B-1727E786A270
+   File Id=filelibenchantmyspellDLL 
Name=libenm_1.dll Source=Files\libenchant_myspell.dll /
+   /Component
+   Component Id=libenchantispellDLL DiskId=1 
Guid=C39C22EC-D3F5-4a73-A27A-BF4C1F45F8C1
+   File Id=filelibenchantispellDLL 
Name=libeni_1.dll Source=Files\libenchant_ispell.dll /
+   /Component
Component Id=ntwdblibDLL DiskId=1 
Guid=7FA2C1EB-5166-4D16-AD36-DEF92A491D8B
File Id=filentwdblibDLL Name=ntwdblib.dll 
Source=Files\ntwdblib.dll /
/Component

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerCommon52.wxs

2009-10-02 Thread John Mertic 
jmertic  Fri, 02 Oct 2009 16:11:30 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=289090

Log:
Fixed bug in 5.2 TS installer where you couldn't select the IIS FastCGI sapi 
very easily.

Changed paths:
U   php/win-installer/trunk/PHPInstallerCommon52.wxs

Modified: php/win-installer/trunk/PHPInstallerCommon52.wxs
===
--- php/win-installer/trunk/PHPInstallerCommon52.wxs2009-10-02 15:45:06 UTC 
(rev 289089)
+++ php/win-installer/trunk/PHPInstallerCommon52.wxs2009-10-02 16:11:30 UTC 
(rev 289090)
@@ -666,20 +666,19 @@
 RadioButton Text=$(loc.Featureiis4ISAPITitle)
   Value=iis4ISAPI X=5 Y=48 Width=250 Height=15 /
 RadioButton Text=$(loc.Featureiis4FastCGITitle)
-  Value=iis4FastCGI X=5 Y=48 Width=250 Height=15 /
+  Value=iis4FastCGI X=5 Y=60 Width=250 Height=15 /
 RadioButton Text=$(loc.Featureiis4CGITitle)
-  Value=iis4CGI X=5 Y=60 Width=250 Height=15 /
+  Value=iis4CGI X=5 Y=72 Width=250 Height=15 /
 RadioButton Text=$(loc.FeaturensapiTitle)
-  Value=nsapi X=5 Y=72 Width=250 Height=15 /
+  Value=nsapi X=5 Y=84 Width=250 Height=15 /
 RadioButton Text=$(loc.FeaturexitamiTitle)
-  Value=xitami X=5 Y=84 Width=250 Height=15 /
+  Value=xitami X=5 Y=96 Width=250 Height=15 /
 RadioButton Text=$(loc.FeaturesambarTitle)
-  Value=sambar X=5 Y=96 Width=250 Height=15 /
+  Value=sambar X=5 Y=108 Width=250 Height=15 /
 RadioButton Text=$(loc.FeaturenetserveTitle)
-  Value=netserve X=5 Y=108 Width=250 Height=15 /
+  Value=netserve X=5 Y=120 Width=250 Height=15 /
 RadioButton Text=$(loc.FeaturecgiTitle)
-  Value=cgi X=5 Y=120 Width=250 Height=15 /
-
+  Value=cgi X=5 Y=132 Width=250 Height=15 /
 RadioButton Text=$(loc.WebServerDlgNoWebServer)
   Value=noconfig X=5 Y=144 Width=250 Height=15 /
   /RadioButtonGroup

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs PHPInstaller

2009-09-30 Thread John Mertic 
jmertic  Wed, 30 Sep 2009 13:44:28 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=288996

Log:
Bug #47855 - Change the VBScript custom actions to be deferred and not to 
impersonate the installing user, so the apache config changes are made as an 
elevated privileges user. Solves problem of not being able to install with 
Apache under Windows Vista/2008/7.

Bug: http://bugs.php.net/47855 (Assigned) VC6 Thread Safe MSI install fails
  
Changed paths:
U   php/win-installer/trunk/PHPInstallerBase52.wxs
U   php/win-installer/trunk/PHPInstallerBase52NTS.wxs
U   php/win-installer/trunk/PHPInstallerBase53.wxs
U   php/win-installer/trunk/PHPInstallerBase53NTS.wxs
U   php/win-installer/trunk/PHPInstallerBase60.wxs
U   php/win-installer/trunk/PHPInstallerBase60NTS.wxs
U   php/win-installer/trunk/PHPInstallerScripts52.vbs
U   php/win-installer/trunk/PHPInstallerScripts53.vbs
U   php/win-installer/trunk/PHPInstallerScripts60.vbs

Modified: php/win-installer/trunk/PHPInstallerBase52.wxs
===
--- php/win-installer/trunk/PHPInstallerBase52.wxs	2009-09-30 13:32:18 UTC (rev 288995)
+++ php/win-installer/trunk/PHPInstallerBase52.wxs	2009-09-30 13:44:28 UTC (rev 288996)
@@ -708,7 +708,7 @@
   DllEntry=CAQuietExec
   Return=ignore
   Execute=deferred
-  Impersonate=no /
+  Impersonate=no /
 CustomAction Id=fcgiconfigJSFastCGISetActivityTimeoutCmd
   Property=fcgiconfigJSFastCGISetActivityTimeout
   Value=quot;\\localhost\admin$\system32\cscript.exequot; quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set -section:quot;PHPquot; -ActivityTimeout:600 /
@@ -784,18 +784,34 @@
 CustomAction Id=configIIS4
   BinaryKey=PHPInstallerScripts
   Return=check
+  Execute=deferred
+  Impersonate=no
   VBScriptCall=configIIS4 /
+CustomAction Id=configIIS4CustomActionDataValue
+  Return=check
+  Property=configIIS4
+  Value=[INSTALLDIR] /
 CustomAction Id=unconfigIIS4
   BinaryKey=PHPInstallerScripts
   Return=check
+  Execute=deferred
+  Impersonate=no
   VBScriptCall=unconfigIIS4 /
 CustomAction Id=configApache
   BinaryKey=PHPInstallerScripts
   Return=check
+  Execute=deferred
+  Impersonate=no
   VBScriptCall=configApache /
+CustomAction Id=configApacheCustomActionDataValue
+  Return=check
+  Property=configApache
+  Value=[APACHEDIR],[INSTALLDIR] /
 CustomAction Id=unconfigApache
   BinaryKey=PHPInstallerScripts
   Return=check
+  Execute=deferred
+  Impersonate=no
   VBScriptCall=unconfigApache /

 InstallExecuteSequence
@@ -949,18 +965,24 @@
   Custom Action=fcgiconfigJSFastCGIremoveXP After=fcgiconfigJSFastCGIremoveCmdXP
 ![CDATA[(VersionNT = 501 AND ServicePackLevel = 2) AND iis4FastCGI = 2]]
   /Custom
-  Custom Action=configIIS4 After=InstallFinalize
+  Custom Action=configIIS4CustomActionDataValue After=WriteRegistryValues
 ![CDATA[VersionNT  600 AND iis4FastCGI = 3]]
   /Custom
+  Custom Action=configIIS4 After=configIIS4CustomActionDataValue
+![CDATA[VersionNT  600 AND iis4FastCGI = 3]]
+  /Custom
   Custom Action=unconfigIIS4 After=InstallInitialize
 ![CDATA[VersionNT  600 AND iis4FastCGI = 2]]
   /Custom
-  Custom Action=unconfigApache After=InstallValidate
-![CDATA[apache13 = 2 OR apache20 = 2 OR apache22 = 2 OR apacheCGI = 2]]
+  Custom Action=configApacheCustomActionDataValue After=WriteRegistryValues
+![CDATA[apache13 = 3 OR apache20 = 3 OR apache22 = 3 OR apacheCGI = 3]]
   /Custom
-  Custom Action=configApache After=InstallFinalize
+  Custom Action=configApache After=configApacheCustomActionDataValue
 ![CDATA[apache13 = 3 OR apache20 = 3 OR apache22 = 3 OR apacheCGI = 3]]
   /Custom
+  Custom Action=unconfigApache After=InstallInitialize 
+![CDATA[apache13 = 2 OR apache20 = 2 OR apache22 = 2 OR apacheCGI = 2]]
+  /Custom
   RemoveExistingProducts After=InstallValidate /
 /InstallExecuteSequence


Modified: php/win-installer/trunk/PHPInstallerBase52NTS.wxs
===
--- php/win-installer/trunk/PHPInstallerBase52NTS.wxs	2009-09-30 13:32:18 UTC (rev 288995)
+++ php/win-installer/trunk/PHPInstallerBase52NTS.wxs	2009-09-30 13:44:28 UTC (rev 288996)
@@ -651,10 +651,18 @@
 CustomAction Id=configIIS4
   BinaryKey=PHPInstallerScripts
   Return=check
+  Execute=deferred
+  Impersonate=no
   VBScriptCall=configIIS4 /
+CustomAction Id=configIIS4CustomActionDataValue
+  Return=check
+  Property=configIIS4
+  Value=[INSTALLDIR] /
 CustomAction Id=unconfigIIS4
   BinaryKey=PHPInstallerScripts
   Return=check
+  Execute=deferred
+  Impersonate=no

[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

2009-09-20 Thread John Mertic 
jmertic  Mon, 21 Sep 2009 03:28:59 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=288495

Log:
Re-add the option to include the pear installer with the PHP install.

Changed paths:
U   php/win-installer/trunk/PHPInstallerBase53.wxs
U   php/win-installer/trunk/PHPInstallerBase53NTS.wxs
U   php/win-installer/trunk/PHPInstallerBase60.wxs
U   php/win-installer/trunk/PHPInstallerBase60NTS.wxs

Modified: php/win-installer/trunk/PHPInstallerBase53.wxs
===
--- php/win-installer/trunk/PHPInstallerBase53.wxs  2009-09-21 03:20:31 UTC 
(rev 288494)
+++ php/win-installer/trunk/PHPInstallerBase53.wxs  2009-09-21 03:28:59 UTC 
(rev 288495)
@@ -131,6 +131,13 @@
 Directory Id=TARGETDIR Name=SourceDir
   Directory Id=ProgramFilesFolder Name=PFiles
 Directory Id=INSTALLDIR Name=PHP
+  Component Id=gopearBAT
+DiskId=1
+Guid=C8385835-A5DD-4A90-9A44-5F49DE05B0B7
+File Id=file2
+  Name=go-pear.bat
+  Source=Files\go-pear.bat/
+  /Component
   Component Id=installTXT
 DiskId=1
 Guid=D1055308-60DA-4C10-A29B-E582D0A3D675
@@ -346,6 +353,17 @@
 Source=Files\dev\php5ts.lib/
 /Component
   /Directory
+  Directory Id=PEARdirectory
+Name=PEAR
+Component Id=gopearPHAR
+  DiskId=1
+  Guid=F3B9AE05-9E15-4E06-8192-91C513C8209A
+  File Id=file181
+Name=GO-PEA_1.PHA
+LongName=go-pear.phar
+Source=Files\PEAR\go-pear.phar/
+/Component
+  /Directory
 /Directory
   /Directory
   Directory Id=ProgramMenuFolder
@@ -506,6 +524,14 @@
 Level=10
 ComponentRef Id=Empty/
 Feature AllowAdvertise=no
+  Id=PEAR
+  Title=$(loc.FeaturePEARTitle)
+  Description=$(loc.FeaturePEARDescription)
+  Level=1
+  ComponentRef Id=gopearPHAR/
+  ComponentRef Id=gopearBAT/
+/Feature
+Feature AllowAdvertise=no
   Id=Manual
   Title=$(loc.FeatureManualTitle)
   Description=$(loc.FeatureManualDescription)

Modified: php/win-installer/trunk/PHPInstallerBase53NTS.wxs
===
--- php/win-installer/trunk/PHPInstallerBase53NTS.wxs   2009-09-21 03:20:31 UTC 
(rev 288494)
+++ php/win-installer/trunk/PHPInstallerBase53NTS.wxs   2009-09-21 03:28:59 UTC 
(rev 288495)
@@ -109,6 +109,13 @@
 Directory Id=TARGETDIR Name=SourceDir
   Directory Id=ProgramFilesFolder Name=PFiles
 Directory Id=INSTALLDIR Name=PHP
+  Component Id=gopearBAT
+DiskId=1
+Guid=C8385835-A5DD-4A90-9A44-5F49DE05B0B7
+File Id=file2
+  Name=go-pear.bat
+  Source=Files\go-pear.bat/
+  /Component
   Component Id=installTXT
 DiskId=1
 Guid=D1055308-60DA-4C10-A29B-E582D0A3D675
@@ -324,6 +331,17 @@
 Source=Files\dev\php5.lib/
 /Component
   /Directory
+  Directory Id=PEARdirectory
+Name=PEAR
+Component Id=gopearPHAR
+  DiskId=1
+  Guid=F3B9AE05-9E15-4E06-8192-91C513C8209A
+  File Id=file181
+Name=GO-PEA_1.PHA
+LongName=go-pear.phar
+Source=Files\PEAR\go-pear.phar/
+/Component
+  /Directory
 /Directory
   /Directory
   Directory Id=ProgramMenuFolder
@@ -423,6 +441,14 @@
 Level=10
 ComponentRef Id=Empty/
 Feature AllowAdvertise=no
+  Id=PEAR
+  Title=$(loc.FeaturePEARTitle)
+  Description=$(loc.FeaturePEARDescription)
+  Level=1
+  ComponentRef Id=gopearPHAR/
+  ComponentRef Id=gopearBAT/
+/Feature
+Feature AllowAdvertise=no
   Id=Manual
   Title=$(loc.FeatureManualTitle)
   Description=$(loc.FeatureManualDescription)

Modified: php/win-installer/trunk/PHPInstallerBase60.wxs
===
--- php/win-installer/trunk/PHPInstallerBase60.wxs  2009-09-21 03:20:31 UTC 
(rev 288494)
+++ php/win-installer/trunk/PHPInstallerBase60.wxs  2009-09-21 03:28:59 UTC 
(rev 288495)
@@ -131,6 +131,13 @@
 Directory Id=TARGETDIR Name=SourceDir
   Directory Id=ProgramFilesFolder Name=PFiles
 Directory Id=INSTALLDIR Name=PHP
+  Component Id=gopearBAT
+DiskId=1
+Guid=C8385835-A5DD-4A90-9A44-5F49DE05B0B7
+File Id=file2
+  Name=go-pear.bat
+  Source=Files\go-pear.bat/
+  /Component
   Component Id=installTXT
 DiskId=1

[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFeatures52.wxs

2009-09-04 Thread Pierre-Alain Joye 
pajoye   Fri, 04 Sep 2009 07:37:07 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=288030

Log:
- fix install of pgsql and mssql, required DLLs were not installed

Changed paths:
U   php/win-installer/trunk/ExtensionsFeatures52.wxs

Modified: php/win-installer/trunk/ExtensionsFeatures52.wxs
===
--- php/win-installer/trunk/ExtensionsFeatures52.wxs2009-09-04 07:28:53 UTC 
(rev 288029)
+++ php/win-installer/trunk/ExtensionsFeatures52.wxs2009-09-04 07:37:07 UTC 
(rev 288030)
@@ -220,6 +220,7 @@
/Feature
Feature AllowAdvertise=no Id=ext_php_mssql 
Title=$(loc.Featureext_php_mssqlTitle) 
Description=$(loc.Featureext_php_mssqlDescription) Level=10
ComponentRef Id=php_mssql/
+   ComponentRef Id=ntwdblibDLL/
/Feature
Feature AllowAdvertise=no Id=ext_php_mysql 
Title=$(loc.Featureext_php_mysqlTitle) 
Description=$(loc.Featureext_php_mysqlDescription) Level=10
ComponentRef Id=php_mysql/
@@ -283,6 +284,7 @@
/Feature
Feature AllowAdvertise=no 
Id=ext_php_pdo_mssql Title=$(loc.Featureext_php_pdo_mssqlTitle) 
Description=$(loc.Featureext_php_pdo_mssqlDescription) Level=10
ComponentRef Id=php_pdo_mssql/
+   ComponentRef Id=ntwdblibDLL/
/Feature
Feature AllowAdvertise=no 
Id=ext_php_pdo_mysql Title=$(loc.Featureext_php_pdo_mysqlTitle) 
Description=$(loc.Featureext_php_pdo_mysqlDescription) Level=10
ComponentRef Id=php_pdo_mysql/
@@ -299,6 +301,7 @@
/Feature
Feature AllowAdvertise=no 
Id=ext_php_pdo_pgsql Title=$(loc.Featureext_php_pdo_pgsqlTitle) 
Description=$(loc.Featureext_php_pdo_pgsqlDescription) Level=10
ComponentRef Id=php_pdo_pgsql/
+   ComponentRef Id=libpqDLL/
/Feature
Feature AllowAdvertise=no 
Id=ext_php_pdo_sqlite Title=$(loc.Featureext_php_pdo_sqliteTitle) 
Description=$(loc.Featureext_php_pdo_sqliteDescription) Level=10
ComponentRef Id=php_pdo_sqlite/
@@ -322,6 +325,7 @@
/Feature
Feature AllowAdvertise=no Id=ext_php_pgsql 
Title=$(loc.Featureext_php_pgsqlTitle) 
Description=$(loc.Featureext_php_pgsqlDescription) Level=10
ComponentRef Id=php_pgsql/
+   ComponentRef Id=libpqDLL/
/Feature
Feature AllowAdvertise=no Id=ext_php_printer 
Title=$(loc.Featureext_php_printerTitle) 
Description=$(loc.Featureext_php_printerDescription) Level=10
ComponentRef Id=php_printer/

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFeatures52.wxs ExtensionsFeatures53.wxs ExtensionsFeatures60.wxs ExtensionsFragment52.wxs

2009-09-04 Thread Pierre-Alain Joye 
pajoye   Fri, 04 Sep 2009 07:57:24 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=288033

Log:
- WS

Changed paths:
U   php/win-installer/trunk/ExtensionsFeatures52.wxs
U   php/win-installer/trunk/ExtensionsFeatures53.wxs
U   php/win-installer/trunk/ExtensionsFeatures60.wxs
U   php/win-installer/trunk/ExtensionsFragment52.wxs

Modified: php/win-installer/trunk/ExtensionsFeatures52.wxs
===
--- php/win-installer/trunk/ExtensionsFeatures52.wxs	2009-09-04 07:56:46 UTC (rev 288032)
+++ php/win-installer/trunk/ExtensionsFeatures52.wxs	2009-09-04 07:57:24 UTC (rev 288033)
@@ -306,10 +306,10 @@
 Feature AllowAdvertise=no Id=ext_php_pdo_sqlite Title=$(loc.Featureext_php_pdo_sqliteTitle) Description=$(loc.Featureext_php_pdo_sqliteDescription) Level=10
 	ComponentRef Id=php_pdo_sqlite/
 /Feature
-Feature AllowAdvertise=no Id=ext_php_pdo_sqlite_external Title=$(loc.Featureext_php_pdo_sqlite_externalTitle) Description=$(loc.Featureext_php_pdo_sqlite_externalDescription) Level=10
+Feature AllowAdvertise=no Id=ext_php_pdo_sqlite_external Title=$(loc.Featureext_php_pdo_sqlite_externalTitle) Description=$(loc.Featureext_php_pdo_sqlite_externalDescription) Level=10
 	ComponentRef Id=php_pdo_sqlite_external/
 /Feature
-Feature AllowAdvertise=no Id=ext_php_pdo_user Title=$(loc.Featureext_php_pdo_userTitle) Description=$(loc.Featureext_php_pdo_userDescription) Level=10
+Feature AllowAdvertise=no Id=ext_php_pdo_user Title=$(loc.Featureext_php_pdo_userTitle) Description=$(loc.Featureext_php_pdo_userDescription) Level=10
 	ComponentRef Id=php_pdo_user/
 /Feature
 			/Feature

Modified: php/win-installer/trunk/ExtensionsFeatures53.wxs
===
--- php/win-installer/trunk/ExtensionsFeatures53.wxs	2009-09-04 07:56:46 UTC (rev 288032)
+++ php/win-installer/trunk/ExtensionsFeatures53.wxs	2009-09-04 07:57:24 UTC (rev 288033)
@@ -118,7 +118,7 @@
 			Feature AllowAdvertise=no Id=ext_php_gopher Title=$(loc.Featureext_php_gopherTitle) Description=$(loc.Featureext_php_gopherDescription) Level=10
 ComponentRef Id=php_gopher/
 			/Feature
-Feature AllowAdvertise=no Id=ext_php_haru Title=$(loc.Featureext_php_haruTitle) Description=$(loc.Featureext_php_haruDescription) Level=10
+			Feature AllowAdvertise=no Id=ext_php_haru Title=$(loc.Featureext_php_haruTitle) Description=$(loc.Featureext_php_haruDescription) Level=10
 ComponentRef Id=php_haru/
 			/Feature
 			Feature AllowAdvertise=no Id=ext_php_htscanner Title=$(loc.Featureext_php_htscannerTitle) Description=$(loc.Featureext_php_htscannerDescription) Level=10
@@ -180,7 +180,7 @@
 ComponentRef Id=php5servlet/
 ComponentRef Id=phpsrvltJAR/
 			/Feature
-Feature AllowAdvertise=no Id=ext_php_java Title=$(loc.Featureext_php_javaTitle) Description=$(loc.Featureext_php_javaDescription) Level=10
+			Feature AllowAdvertise=no Id=ext_php_java Title=$(loc.Featureext_php_javaTitle) Description=$(loc.Featureext_php_javaDescription) Level=10
 ComponentRef Id=php_java/
 ComponentRef Id=php_javaJAR/
 ComponentRef Id=php6servlet/
@@ -304,15 +304,15 @@
 /Feature
 Feature AllowAdvertise=no Id=ext_php_pdo_pgsql Title=$(loc.Featureext_php_pdo_pgsqlTitle) Description=$(loc.Featureext_php_pdo_pgsqlDescription) Level=10
 	ComponentRef Id=php_pdo_pgsql/
-ComponentRef Id=libpqDLL/
+	ComponentRef Id=libpqDLL/
 /Feature
 Feature AllowAdvertise=no Id=ext_php_pdo_sqlite Title=$(loc.Featureext_php_pdo_sqliteTitle) Description=$(loc.Featureext_php_pdo_sqliteDescription) TypicalDefault=install Level=1
 	ComponentRef Id=php_pdo_sqlite/
 /Feature
-Feature AllowAdvertise=no Id=ext_php_pdo_sqlite_external Title=$(loc.Featureext_php_pdo_sqlite_externalTitle) Description=$(loc.Featureext_php_pdo_sqlite_externalDescription) Level=10
+Feature AllowAdvertise=no Id=ext_php_pdo_sqlite_external Title=$(loc.Featureext_php_pdo_sqlite_externalTitle) Description=$(loc.Featureext_php_pdo_sqlite_externalDescription) Level=10
 	ComponentRef Id=php_pdo_sqlite_external/
 /Feature
-Feature AllowAdvertise=no Id=ext_php_pdo_user Title=$(loc.Featureext_php_pdo_userTitle) Description=$(loc.Featureext_php_pdo_userDescription) Level=10
+Feature AllowAdvertise=no Id=ext_php_pdo_user Title=$(loc.Featureext_php_pdo_userTitle) Description=$(loc.Featureext_php_pdo_userDescription) Level=10
 	ComponentRef Id=php_pdo_user/
 /Feature
 			/Feature
@@ -328,7 +328,7 @@
 			/Feature
 			Feature AllowAdvertise=no Id=ext_php_pgsql Title=$(loc.Featureext_php_pgsqlTitle) Description=$(loc.Featureext_php_pgsqlDescription) TypicalDefault=install Level=1
 ComponentRef Id=php_pgsql/
-ComponentRef Id=libpqDLL/
+ComponentRef Id=libpqDLL/

[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

2009-08-18 Thread John Mertic 
jmertic  Tue, 18 Aug 2009 17:30:02 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=287460

Log:
Point the error_log file to the Windows temp directory rather than the User's 
temp directory.

Changed paths:
U   php/win-installer/trunk/PHPInstallerBase52.wxs
U   php/win-installer/trunk/PHPInstallerBase52NTS.wxs
U   php/win-installer/trunk/PHPInstallerBase53.wxs
U   php/win-installer/trunk/PHPInstallerBase53NTS.wxs
U   php/win-installer/trunk/PHPInstallerBase60.wxs
U   php/win-installer/trunk/PHPInstallerBase60NTS.wxs

Modified: php/win-installer/trunk/PHPInstallerBase52.wxs
===
--- php/win-installer/trunk/PHPInstallerBase52.wxs  2009-08-18 16:11:58 UTC 
(rev 287459)
+++ php/win-installer/trunk/PHPInstallerBase52.wxs  2009-08-18 17:30:02 UTC 
(rev 287460)
@@ -302,7 +302,7 @@
  Section=PHP Value=On /
IniFile Id=errorlogINI Action=addLine
  Key=error_log Directory=INSTALLDIR Name=php.ini
- Section=PHP Value=quot;[TempFolder]\php-errors.logquot; /
+ Section=PHP Value=quot;[%windir]\temp\php-errors.logquot; /
  /Component
   Component Id=php5tsDLL
 DiskId=1

Modified: php/win-installer/trunk/PHPInstallerBase52NTS.wxs
===
--- php/win-installer/trunk/PHPInstallerBase52NTS.wxs   2009-08-18 16:11:58 UTC 
(rev 287459)
+++ php/win-installer/trunk/PHPInstallerBase52NTS.wxs   2009-08-18 17:30:02 UTC 
(rev 287460)
@@ -280,7 +280,7 @@
  Section=PHP Value=On /
IniFile Id=errorlogINI Action=addLine
  Key=error_log Directory=INSTALLDIR Name=php.ini
- Section=PHP Value=quot;[TempFolder]\php-errors.logquot; /
+ Section=PHP Value=quot;[%windir]\temp\php-errors.logquot; /
  /Component
   Component Id=php5DLL
 DiskId=1

Modified: php/win-installer/trunk/PHPInstallerBase53.wxs
===
--- php/win-installer/trunk/PHPInstallerBase53.wxs  2009-08-18 16:11:58 UTC 
(rev 287459)
+++ php/win-installer/trunk/PHPInstallerBase53.wxs  2009-08-18 17:30:02 UTC 
(rev 287460)
@@ -295,7 +295,7 @@
  Section=PHP Value=On /
IniFile Id=errorlogINI Action=addLine
  Key=error_log Directory=INSTALLDIR Name=php.ini
- Section=PHP Value=quot;[TempFolder]\php-errors.logquot; /
+ Section=PHP Value=quot;[%windir]\temp\php-errors.logquot; /
  /Component
   Component Id=php5tsDLL
 DiskId=1

Modified: php/win-installer/trunk/PHPInstallerBase53NTS.wxs
===
--- php/win-installer/trunk/PHPInstallerBase53NTS.wxs   2009-08-18 16:11:58 UTC 
(rev 287459)
+++ php/win-installer/trunk/PHPInstallerBase53NTS.wxs   2009-08-18 17:30:02 UTC 
(rev 287460)
@@ -273,7 +273,7 @@
  Section=PHP Value=On /
IniFile Id=errorlogINI Action=addLine
  Key=error_log Directory=INSTALLDIR Name=php.ini
- Section=PHP Value=quot;[TempFolder]\php-errors.logquot; /
+ Section=PHP Value=quot;[%windir]\temp\php-errors.logquot; /
  /Component
   Component Id=php5DLL
 DiskId=1

Modified: php/win-installer/trunk/PHPInstallerBase60.wxs
===
--- php/win-installer/trunk/PHPInstallerBase60.wxs  2009-08-18 16:11:58 UTC 
(rev 287459)
+++ php/win-installer/trunk/PHPInstallerBase60.wxs  2009-08-18 17:30:02 UTC 
(rev 287460)
@@ -295,7 +295,7 @@
  Section=PHP Value=On /
IniFile Id=errorlogINI Action=addLine
  Key=error_log Directory=INSTALLDIR Name=php.ini
- Section=PHP Value=quot;[TempFolder]\php-errors.logquot; /
+ Section=PHP Value=quot;[%windir]\temp\php-errors.logquot; /
  /Component
   Component Id=php6tsDLL
 DiskId=1

Modified: php/win-installer/trunk/PHPInstallerBase60NTS.wxs
===
--- php/win-installer/trunk/PHPInstallerBase60NTS.wxs   2009-08-18 16:11:58 UTC 
(rev 287459)
+++ php/win-installer/trunk/PHPInstallerBase60NTS.wxs   2009-08-18 17:30:02 UTC 
(rev 287460)
@@ -273,7 +273,7 @@
  Section=PHP Value=On /
IniFile Id=errorlogINI Action=addLine
  Key=error_log Directory=INSTALLDIR Name=php.ini
- Section=PHP Value=quot;[TempFolder]\php-errors.logquot; /
+ Section=PHP Value=quot;[%windir]\temp\php-errors.logquot; /
  /Component
  Component Id=php6DLL
 DiskId=1

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

2009-08-17 Thread John Mertic 
jmertic  Mon, 17 Aug 2009 19:39:02 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=287426

Log:
Correctly quote the error_log attribute value.

Changed paths:
U   php/win-installer/trunk/PHPInstallerBase52.wxs
U   php/win-installer/trunk/PHPInstallerBase52NTS.wxs
U   php/win-installer/trunk/PHPInstallerBase53.wxs
U   php/win-installer/trunk/PHPInstallerBase53NTS.wxs
U   php/win-installer/trunk/PHPInstallerBase60.wxs
U   php/win-installer/trunk/PHPInstallerBase60NTS.wxs

Modified: php/win-installer/trunk/PHPInstallerBase52.wxs
===
--- php/win-installer/trunk/PHPInstallerBase52.wxs  2009-08-17 18:23:48 UTC 
(rev 287425)
+++ php/win-installer/trunk/PHPInstallerBase52.wxs  2009-08-17 19:39:02 UTC 
(rev 287426)
@@ -302,7 +302,7 @@
  Section=PHP Value=On /
IniFile Id=errorlogINI Action=addLine
  Key=error_log Directory=INSTALLDIR Name=php.ini
- Section=PHP Value=[TempFolder]\php-errors.log /
+ Section=PHP Value=quot;[TempFolder]\php-errors.logquot; /
  /Component
   Component Id=php5tsDLL
 DiskId=1

Modified: php/win-installer/trunk/PHPInstallerBase52NTS.wxs
===
--- php/win-installer/trunk/PHPInstallerBase52NTS.wxs   2009-08-17 18:23:48 UTC 
(rev 287425)
+++ php/win-installer/trunk/PHPInstallerBase52NTS.wxs   2009-08-17 19:39:02 UTC 
(rev 287426)
@@ -280,7 +280,7 @@
  Section=PHP Value=On /
IniFile Id=errorlogINI Action=addLine
  Key=error_log Directory=INSTALLDIR Name=php.ini
- Section=PHP Value=[TempFolder]\php-errors.log /
+ Section=PHP Value=quot;[TempFolder]\php-errors.logquot; /
  /Component
   Component Id=php5DLL
 DiskId=1

Modified: php/win-installer/trunk/PHPInstallerBase53.wxs
===
--- php/win-installer/trunk/PHPInstallerBase53.wxs  2009-08-17 18:23:48 UTC 
(rev 287425)
+++ php/win-installer/trunk/PHPInstallerBase53.wxs  2009-08-17 19:39:02 UTC 
(rev 287426)
@@ -295,7 +295,7 @@
  Section=PHP Value=On /
IniFile Id=errorlogINI Action=addLine
  Key=error_log Directory=INSTALLDIR Name=php.ini
- Section=PHP Value=[TempFolder]\php-errors.log /
+ Section=PHP Value=quot;[TempFolder]\php-errors.logquot; /
  /Component
   Component Id=php5tsDLL
 DiskId=1

Modified: php/win-installer/trunk/PHPInstallerBase53NTS.wxs
===
--- php/win-installer/trunk/PHPInstallerBase53NTS.wxs   2009-08-17 18:23:48 UTC 
(rev 287425)
+++ php/win-installer/trunk/PHPInstallerBase53NTS.wxs   2009-08-17 19:39:02 UTC 
(rev 287426)
@@ -273,7 +273,7 @@
  Section=PHP Value=On /
IniFile Id=errorlogINI Action=addLine
  Key=error_log Directory=INSTALLDIR Name=php.ini
- Section=PHP Value=[TempFolder]\php-errors.log /
+ Section=PHP Value=quot;[TempFolder]\php-errors.logquot; /
  /Component
   Component Id=php5DLL
 DiskId=1

Modified: php/win-installer/trunk/PHPInstallerBase60.wxs
===
--- php/win-installer/trunk/PHPInstallerBase60.wxs  2009-08-17 18:23:48 UTC 
(rev 287425)
+++ php/win-installer/trunk/PHPInstallerBase60.wxs  2009-08-17 19:39:02 UTC 
(rev 287426)
@@ -295,7 +295,7 @@
  Section=PHP Value=On /
IniFile Id=errorlogINI Action=addLine
  Key=error_log Directory=INSTALLDIR Name=php.ini
- Section=PHP Value=[TempFolder]\php-errors.log /
+ Section=PHP Value=quot;[TempFolder]\php-errors.logquot; /
  /Component
   Component Id=php6tsDLL
 DiskId=1

Modified: php/win-installer/trunk/PHPInstallerBase60NTS.wxs
===
--- php/win-installer/trunk/PHPInstallerBase60NTS.wxs   2009-08-17 18:23:48 UTC 
(rev 287425)
+++ php/win-installer/trunk/PHPInstallerBase60NTS.wxs   2009-08-17 19:39:02 UTC 
(rev 287426)
@@ -273,7 +273,7 @@
  Section=PHP Value=On /
IniFile Id=errorlogINI Action=addLine
  Key=error_log Directory=INSTALLDIR Name=php.ini
- Section=PHP Value=[TempFolder]\php-errors.log /
+ Section=PHP Value=quot;[TempFolder]\php-errors.logquot; /
  /Component
  Component Id=php6DLL
 DiskId=1

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: php/win-installer/trunk/ PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs WebServerConf

2009-07-16 Thread John Mertic 
jmertic Thu, 16 Jul 2009 18:47:14 +

URL: http://svn.php.net/viewvc?view=revisionrevision=284197

Changed paths:
U   php/win-installer/trunk/PHPInstallerBase52.wxs
U   php/win-installer/trunk/PHPInstallerBase52NTS.wxs
U   php/win-installer/trunk/PHPInstallerBase53.wxs
U   php/win-installer/trunk/PHPInstallerBase53NTS.wxs
U   php/win-installer/trunk/PHPInstallerBase60.wxs
U   php/win-installer/trunk/PHPInstallerBase60NTS.wxs
U   php/win-installer/trunk/WebServerConfig52.wxs
U   php/win-installer/trunk/WebServerConfig52NTS.wxs
U   php/win-installer/trunk/WebServerConfig53.wxs
U   php/win-installer/trunk/WebServerConfig53NTS.wxs
U   php/win-installer/trunk/WebServerConfig60.wxs
U   php/win-installer/trunk/WebServerConfig60NTS.wxs

Log:
- Move the ActivityTimeout and RequestTimeout for IIS/FastCGI to 600 seconds
-
Set fastcgi.logging to 0 for IIS/FastCGI installs
- Turn on log_errors and write
all errors to the %TEMP%/php-errors.log file.
Modified: php/win-installer/trunk/PHPInstallerBase52.wxs
===
--- php/win-installer/trunk/PHPInstallerBase52.wxs	2009-07-16 16:11:50 UTC (rev 284196)
+++ php/win-installer/trunk/PHPInstallerBase52.wxs	2009-07-16 18:47:14 UTC (rev 284197)
@@ -294,6 +294,16 @@
   Value=7/
 ConditionVersionNT = 502/Condition
   /Component
+	  Component Id=errorlog
+	DiskId=1
+	Guid=C90F9100-7234-11DE-8A39-0800200C9A66
+	IniFile Id=logerrorsINI Action=addLine
+	  Key=log_errors Directory=INSTALLDIR Name=php.ini
+	  Section=PHP Value=On /
+	IniFile Id=errorlogINI Action=addLine
+	  Key=error_log Directory=INSTALLDIR Name=php.ini
+	  Section=PHP Value=[TempFolder]\php-errors.log /
+	  /Component
   Component Id=php5tsDLL
 DiskId=1
 Guid=14A95C34-564F-4BF9-BFC7-0DAA48A96BA2
@@ -371,6 +381,7 @@
   ComponentRef Id=php5tsLIB/
   ComponentRef Id=php5embedLIB/
   ComponentRef Id=phpEXE/
+  ComponentRef Id=errorlog/
 Feature AllowAdvertise=no
   Id=ScriptExecutable
   Title=$(loc.FeatureScriptExecutableTitle)
@@ -463,6 +474,7 @@
   ComponentRef Id=phpcgiEXE/
   ComponentRef Id=cgiforceredirect/
   ComponentRef Id=fastcgiimpersonate/
+  ComponentRef Id=fastcgilogging/
   ComponentRef Id=maxexecutiontime /
   ComponentRef Id=iis4FastCGIregistry/
 /Feature
@@ -593,7 +605,7 @@
   Impersonate=no /
 CustomAction Id=iis700FastCGISetActivityTimeoutCmd
   Property=iis700FastCGISetActivityTimeout
-  Value=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET CONFIG -section:system.webServer/fastCGI quot;/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:300quot; /commit:apphost /
+  Value=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET CONFIG -section:system.webServer/fastCGI quot;/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].activityTimeout:600quot; /commit:apphost /
 CustomAction Id=iis700FastCGISetActivityTimeout
   BinaryKey=WixCA
   DllEntry=CAQuietExec
@@ -602,7 +614,7 @@
   Impersonate=no /
 CustomAction Id=iis700FastCGISetRequestTimeoutCmd
   Property=iis700FastCGISetRequestTimeout
-  Value=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET CONFIG -section:system.webServer/fastCGI quot;/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:300quot; /commit:apphost /
+  Value=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET CONFIG -section:system.webServer/fastCGI quot;/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].requestTimeout:600quot; /commit:apphost /
 CustomAction Id=iis700FastCGISetRequestTimeout
   BinaryKey=WixCA
   DllEntry=CAQuietExec
@@ -699,7 +711,7 @@
   Impersonate=no /
 CustomAction Id=fcgiconfigJSFastCGISetActivityTimeoutCmd
   Property=fcgiconfigJSFastCGISetActivityTimeout
-  Value=quot;\\localhost\admin$\system32\cscript.exequot; quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set -section:quot;PHPquot; -ActivityTimeout:300 /
+  Value=quot;\\localhost\admin$\system32\cscript.exequot; quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set -section:quot;PHPquot; -ActivityTimeout:600 /
 CustomAction Id=fcgiconfigJSFastCGISetActivityTimeout
   BinaryKey=WixCA
   DllEntry=CAQuietExec
@@ -708,7 +720,7 @@
   Impersonate=no /
 CustomAction Id=fcgiconfigJSFastCGISetActivityTimeoutCmdXP
   Property=fcgiconfigJSFastCGISetActivityTimeoutXP
-  Value=quot;cscriptquot; quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set -section:quot;PHPquot; -ActivityTimeout:300 /
+  Value=quot;cscriptquot; quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set -section:quot;PHPquot; -ActivityTimeout:600 /
 CustomAction Id=fcgiconfigJSFastCGISetActivityTimeoutXP

[PHP-CVS] svn: php/win-installer/trunk/ WebServerConfig52.wxs WebServerConfig52NTS.wxs WebServerConfig53.wxs WebServerConfig53NTS.wxs WebServerConfig60.wxs WebServerConfig60NTS.wxs

2009-07-16 Thread John Mertic 
jmertic Thu, 16 Jul 2009 19:56:57 +

URL: http://svn.php.net/viewvc?view=revisionrevision=284198

Changed paths:
U   php/win-installer/trunk/WebServerConfig52.wxs
U   php/win-installer/trunk/WebServerConfig52NTS.wxs
U   php/win-installer/trunk/WebServerConfig53.wxs
U   php/win-installer/trunk/WebServerConfig53NTS.wxs
U   php/win-installer/trunk/WebServerConfig60.wxs
U   php/win-installer/trunk/WebServerConfig60NTS.wxs

Log:
Adjust max_execution_time back down to 300 seconds, that one shouldn't have
changed.

Modified: php/win-installer/trunk/WebServerConfig52.wxs
===
--- php/win-installer/trunk/WebServerConfig52.wxs   2009-07-16 18:47:14 UTC 
(rev 284197)
+++ php/win-installer/trunk/WebServerConfig52.wxs   2009-07-16 19:56:57 UTC 
(rev 284198)
@@ -49,7 +49,7 @@
   Component Id=maxexecutiontime DiskId=1 
Guid=5C6D1771-0D27-42C3-946B-3E0E138CF5DA
 IniFile Id=maxexecutiontimeINI Action=addLine
   Key=max_execution_time Directory=INSTALLDIR Name=php.ini
-  Section=PHP Value=600/
+  Section=PHP Value=300/
   /Component
   Component Id=iis3CGI DiskId=1 
Guid=20842834-47E2-483C-AE09-B4E90C12E314
 Registry Id=iis3RegScriptMap

Modified: php/win-installer/trunk/WebServerConfig52NTS.wxs
===
--- php/win-installer/trunk/WebServerConfig52NTS.wxs2009-07-16 18:47:14 UTC 
(rev 284197)
+++ php/win-installer/trunk/WebServerConfig52NTS.wxs2009-07-16 19:56:57 UTC 
(rev 284198)
@@ -20,7 +20,7 @@
   Component Id=maxexecutiontime DiskId=1 
Guid=5C6D1771-0D27-42C3-946B-3E0E138CF5DA
 IniFile Id=maxexecutiontimeINI Action=addLine
   Key=max_execution_time Directory=INSTALLDIR Name=php.ini
-  Section=PHP Value=600/
+  Section=PHP Value=300/
   /Component
   Component Id=iis4FastCGIregistry
 DiskId=1

Modified: php/win-installer/trunk/WebServerConfig53.wxs
===
--- php/win-installer/trunk/WebServerConfig53.wxs   2009-07-16 18:47:14 UTC 
(rev 284197)
+++ php/win-installer/trunk/WebServerConfig53.wxs   2009-07-16 19:56:57 UTC 
(rev 284198)
@@ -37,7 +37,7 @@
   Component Id=maxexecutiontime DiskId=1 
Guid=5C6D1771-0D27-42C3-946B-3E0E138CF5DA
 IniFile Id=maxexecutiontimeINI Action=addLine
   Key=max_execution_time Directory=INSTALLDIR Name=php.ini
-  Section=PHP Value=600/
+  Section=PHP Value=300/
   /Component
   Component Id=iis3CGI DiskId=1 
Guid=20842834-47E2-483C-AE09-B4E90C12E314
 Registry Id=iis3RegScriptMap

Modified: php/win-installer/trunk/WebServerConfig53NTS.wxs
===
--- php/win-installer/trunk/WebServerConfig53NTS.wxs2009-07-16 18:47:14 UTC 
(rev 284197)
+++ php/win-installer/trunk/WebServerConfig53NTS.wxs2009-07-16 19:56:57 UTC 
(rev 284198)
@@ -20,7 +20,7 @@
   Component Id=maxexecutiontime DiskId=1 
Guid=5C6D1771-0D27-42C3-946B-3E0E138CF5DA
 IniFile Id=maxexecutiontimeINI Action=addLine
   Key=max_execution_time Directory=INSTALLDIR Name=php.ini
-  Section=PHP Value=600/
+  Section=PHP Value=300/
   /Component
   Component Id=iis4FastCGIregistry
 DiskId=1

Modified: php/win-installer/trunk/WebServerConfig60.wxs
===
--- php/win-installer/trunk/WebServerConfig60.wxs   2009-07-16 18:47:14 UTC 
(rev 284197)
+++ php/win-installer/trunk/WebServerConfig60.wxs   2009-07-16 19:56:57 UTC 
(rev 284198)
@@ -37,7 +37,7 @@
   Component Id=maxexecutiontime DiskId=1 
Guid=5C6D1771-0D27-42C3-946B-3E0E138CF5DA
 IniFile Id=maxexecutiontimeINI Action=addLine
   Key=max_execution_time Directory=INSTALLDIR Name=php.ini
-  Section=PHP Value=600/
+  Section=PHP Value=300/
   /Component
   Component Id=iis3CGI DiskId=1 
Guid=20842834-47E2-483C-AE09-B4E90C12E314
 Registry Id=iis3RegScriptMap

Modified: php/win-installer/trunk/WebServerConfig60NTS.wxs
===
--- php/win-installer/trunk/WebServerConfig60NTS.wxs2009-07-16 18:47:14 UTC 
(rev 284197)
+++ php/win-installer/trunk/WebServerConfig60NTS.wxs2009-07-16 19:56:57 UTC 
(rev 284198)
@@ -20,7 +20,7 @@
   Component Id=maxexecutiontime DiskId=1 
Guid=5C6D1771-0D27-42C3-946B-3E0E138CF5DA
 IniFile Id=maxexecutiontimeINI Action=addLine
   Key=max_execution_time Directory=INSTALLDIR Name=php.ini
-  Section=PHP Value=600/
+  Section=PHP Value=300/
   /Component
   Component Id=iis4FastCGIregistry
 DiskId=1

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php