from:"John Mertic"

[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/ 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

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/ 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/ 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

[PHP-CVS] cvs: win-installer / PHPInstallerCommon52.wxs

2009-07-05 Thread John Mertic

jmertic Sun Jul  5 14:09:39 2009 UTC

  Modified files:  
/win-installer  PHPInstallerCommon52.wxs 
  Log:
  Bug 48586 - Re-enable IIS/ISAPI in the 5.2 installers.
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerCommon52.wxs?r1=1.1r2=1.2diff_format=u
Index: win-installer/PHPInstallerCommon52.wxs
diff -u win-installer/PHPInstallerCommon52.wxs:1.1 
win-installer/PHPInstallerCommon52.wxs:1.2
--- win-installer/PHPInstallerCommon52.wxs:1.1  Fri Mar 20 20:36:58 2009
+++ win-installer/PHPInstallerCommon52.wxs  Sun Jul  5 14:09:38 2009
@@ -609,7 +609,7 @@
   Publish Event=AddLocal Value=apache20![CDATA[WEBSERVERPICKER 
= apache20]]/Publish
   Publish Event=AddLocal Value=apache22![CDATA[WEBSERVERPICKER 
= apache22]]/Publish
   Publish Event=AddLocal Value=apacheCGI![CDATA[WEBSERVERPICKER 
= apacheCGI]]/Publish
-  !--Publish Event=AddLocal 
Value=iis4ISAPI![CDATA[WEBSERVERPICKER = iis4ISAPI]]/Publish--
+  Publish Event=AddLocal Value=iis4ISAPI![CDATA[WEBSERVERPICKER 
= iis4ISAPI]]/Publish
   Publish Event=AddLocal 
Value=iis4FastCGI![CDATA[WEBSERVERPICKER = iis4FastCGI]]/Publish
   Publish Event=AddLocal Value=iis4CGI![CDATA[WEBSERVERPICKER = 
iis4CGI]]/Publish
   Publish Event=AddLocal Value=nsapi![CDATA[WEBSERVERPICKER = 
nsapi]]/Publish
@@ -622,7 +622,7 @@
   Publish Event=Remove Value=apache20![CDATA[WEBSERVERPICKER  
apache20]]/Publish
   Publish Event=Remove Value=apache22![CDATA[WEBSERVERPICKER  
apache22]]/Publish
   Publish Event=Remove Value=apacheCGI![CDATA[WEBSERVERPICKER 
 apacheCGI]]/Publish
-  !--Publish Event=Remove 
Value=iis4ISAPI![CDATA[WEBSERVERPICKER  iis4ISAPI]]/Publish--
+  Publish Event=Remove Value=iis4ISAPI![CDATA[WEBSERVERPICKER 
 iis4ISAPI]]/Publish
   Publish Event=Remove Value=iis4FastCGI![CDATA[WEBSERVERPICKER 
 iis4FastCGI]]/Publish
   Publish Event=Remove Value=iis4CGI![CDATA[WEBSERVERPICKER  
iis4CGI]]/Publish
   Publish Event=Remove Value=nsapi![CDATA[WEBSERVERPICKER  
nsapi]]/Publish
@@ -663,8 +663,8 @@
   Value=apache22 X=5 Y=24 Width=250 Height=15 /
 RadioButton Text=$(loc.FeatureapacheCGITitle)
   Value=apacheCGI X=5 Y=36 Width=250 Height=15 /
-!--RadioButton Text=$(loc.Featureiis4ISAPITitle)
-  Value=iis4ISAPI X=5 Y=48 Width=250 Height=15 /--
+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 /
 RadioButton Text=$(loc.Featureiis4CGITitle)



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

[PHP-CVS] cvs: win-installer / WixUI_en-us.wxl

2009-07-04 Thread John Mertic

jmertic Sat Jul  4 13:19:24 2009 UTC

  Modified files:  
/win-installer  WixUI_en-us.wxl 
  Log:
  One more place to change Oracle 8 to Oracle 10.
  
http://cvs.php.net/viewvc.cgi/win-installer/WixUI_en-us.wxl?r1=1.31r2=1.32diff_format=u
Index: win-installer/WixUI_en-us.wxl
diff -u win-installer/WixUI_en-us.wxl:1.31 win-installer/WixUI_en-us.wxl:1.32
--- win-installer/WixUI_en-us.wxl:1.31  Sat Jul  4 03:19:51 2009
+++ win-installer/WixUI_en-us.wxl   Sat Jul  4 13:19:24 2009
@@ -732,7 +732,7 @@
   String Id=Featureext_php_operatorTitleoperator/String
   String Id=Featureext_php_operatorDescriptionOperator overloading for 
Objects/String
   String Id=Featureext_php_oracleTitleOracle *DEPRECATED*/String
-  String Id=Featureext_php_oracleDescriptionOracle 7 functions NOTE: 
DEPRECATED - USE ORACLE 8 FUNCTIONS BELOW/String
+  String Id=Featureext_php_oracleDescriptionOracle 7 functions NOTE: 
DEPRECATED - USE ORACLE 10 FUNCTIONS BELOW/String
   String Id=Featureext_php_oci8TitleOracle (10)/String
   String Id=Featureext_php_oci8DescriptionOracle 10 functions/String
   String Id=Featureext_php_oci8_11gTitleOracle (11g)/String



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

Re: [PHP-CVS] cvs: win-installer / WixUI_en-us.wxl

2009-07-04 Thread John Mertic

Good catch, fixed now. Thanks!

John Mertic
jmer...@gmail.com | http://jmertic.wordpress.com



On Sat, Jul 4, 2009 at 4:57 AM, Hannes
Magnussonhannes.magnus...@gmail.com wrote:
 On Sat, Jul 4, 2009 at 05:19, John Merticjmer...@php.net wrote:
 jmertic         Sat Jul  4 03:19:51 2009 UTC

  Modified files:
    /win-installer      WixUI_en-us.wxl
  Log:
  Changed language string for php_oci8 extension to refered to it as Oracle 
 10 instead of Oracle 8.

 http://cvs.php.net/viewvc.cgi/win-installer/WixUI_en-us.wxl?r1=1.30r2=1.31diff_format=u
 Index: win-installer/WixUI_en-us.wxl
 diff -u win-installer/WixUI_en-us.wxl:1.30 win-installer/WixUI_en-us.wxl:1.31
 --- win-installer/WixUI_en-us.wxl:1.30  Fri Mar 20 20:36:58 2009
 +++ win-installer/WixUI_en-us.wxl       Sat Jul  4 03:19:51 2009
 @@ -733,8 +733,8 @@
   String Id=Featureext_php_operatorDescriptionOperator overloading for 
 Objects/String
   String Id=Featureext_php_oracleTitleOracle *DEPRECATED*/String
   String Id=Featureext_php_oracleDescriptionOracle 7 functions NOTE: 
 DEPRECATED - USE ORACLE 8 FUNCTIONS BELOW/String

 This should probably be changed to 'oracle 10' too then?

 -Hannes


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

[PHP-CVS] cvs: win-installer / WixUI_en-us.wxl

2009-07-03 Thread John Mertic

jmertic Sat Jul  4 03:19:51 2009 UTC

  Modified files:  
/win-installer  WixUI_en-us.wxl 
  Log:
  Changed language string for php_oci8 extension to refered to it as Oracle 10 
instead of Oracle 8.
  
http://cvs.php.net/viewvc.cgi/win-installer/WixUI_en-us.wxl?r1=1.30r2=1.31diff_format=u
Index: win-installer/WixUI_en-us.wxl
diff -u win-installer/WixUI_en-us.wxl:1.30 win-installer/WixUI_en-us.wxl:1.31
--- win-installer/WixUI_en-us.wxl:1.30  Fri Mar 20 20:36:58 2009
+++ win-installer/WixUI_en-us.wxl   Sat Jul  4 03:19:51 2009
@@ -733,8 +733,8 @@
   String Id=Featureext_php_operatorDescriptionOperator overloading for 
Objects/String
   String Id=Featureext_php_oracleTitleOracle *DEPRECATED*/String
   String Id=Featureext_php_oracleDescriptionOracle 7 functions NOTE: 
DEPRECATED - USE ORACLE 8 FUNCTIONS BELOW/String
-  String Id=Featureext_php_oci8TitleOracle (8)/String
-  String Id=Featureext_php_oci8DescriptionOracle 8 functions/String
+  String Id=Featureext_php_oci8TitleOracle (10)/String
+  String Id=Featureext_php_oci8DescriptionOracle 10 functions/String
   String Id=Featureext_php_oci8_11gTitleOracle (11g)/String
   String Id=Featureext_php_oci8_11gDescriptionOracle Driver for Oracle 
11g/String
   String Id=Featureext_php_parsekitTitleparsekit/String



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

[PHP-CVS] cvs: win-installer /Bitmaps bannrbmp.bmp dlgbmp.bmp

2009-07-01 Thread John Mertic

jmertic Wed Jul  1 15:02:59 2009 UTC

  Modified files:  
/win-installer/Bitmaps  bannrbmp.bmp dlgbmp.bmp 
  Log:
  Bug #48616 - Change graphic to match the current one used on the PHP for 
Windows site, being less version centric.
  
http://cvs.php.net/viewvc.cgi/win-installer/Bitmaps/bannrbmp.bmp?r1=1.1r2=1.2diff_format=u
Index: win-installer/Bitmaps/bannrbmp.bmp
http://cvs.php.net/viewvc.cgi/win-installer/Bitmaps/dlgbmp.bmp?r1=1.1r2=1.2diff_format=u
Index: win-installer/Bitmaps/dlgbmp.bmp



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

[PHP-CVS] cvs: win-installer / PHPInstallerBase53NTS.wxs PHPInstallerScripts53.vbs

2009-06-28 Thread John Mertic

jmertic Sun Jun 28 18:16:36 2009 UTC

  Modified files:  
/win-installer  PHPInstallerBase53NTS.wxs PHPInstallerScripts53.vbs 
  Log:
  Removed any trailing references to IIS ISAPI option in 5.3 installer.
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.22r2=1.23diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.22 
win-installer/PHPInstallerBase53NTS.wxs:1.23
--- win-installer/PHPInstallerBase53NTS.wxs:1.22Thu Jun 25 20:51:04 2009
+++ win-installer/PHPInstallerBase53NTS.wxs Sun Jun 28 18:16:36 2009
@@ -371,12 +371,6 @@
 Level=10
 ComponentRef Id=Empty/
 Feature AllowAdvertise=no 
-  Id=iis4ISAPI 
-  Title=$(loc.Featureiis4ISAPITitle) 
-  Description=$(loc.Featureiis4ISAPIDescription) 
-  Level=10
-/Feature
-Feature AllowAdvertise=no 
   Id=iis4CGI 
   Title=$(loc.Featureiis4CGITitle) 
   Description=$(loc.Featureiis4CGIDescription) 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerScripts53.vbs?r1=1.1r2=1.2diff_format=u
Index: win-installer/PHPInstallerScripts53.vbs
diff -u win-installer/PHPInstallerScripts53.vbs:1.1 
win-installer/PHPInstallerScripts53.vbs:1.2
--- win-installer/PHPInstallerScripts53.vbs:1.1 Thu May 21 02:41:06 2009
+++ win-installer/PHPInstallerScripts53.vbs Sun Jun 28 18:16:36 2009
@@ -166,9 +166,6 @@
 If ( Session.FeatureRequestState(iis4CGI) = 3 ) Then
 PHPExecutable = strPHPPath  php-cgi.exe
 End If
-If ( Session.FeatureRequestState(iis4ISAPI) = 3 ) Then
-PHPExecutable = strPHPPath  php5isapi.dll
-End If
 If ( Session.FeatureRequestState(iis4FastCGI) = 3 ) Then
 fAddScriptMap = FALSE
 End If



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

[PHP-CVS] cvs: win-installer / GenPHPInstaller.wxs.php PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wx

2009-06-25 Thread John Mertic

jmertic Thu Jun 25 15:59:13 2009 UTC

  Modified files:  
/win-installer  GenPHPInstaller.wxs.php PHPInstallerBase52.wxs 
PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs 
PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs 
PHPInstallerBase60NTS.wxs 
  Log:
  Added including the readme-redist-bins.txt with the installer only if it 
exists.
  http://cvs.php.net/viewvc.cgi/win-installer/GenPHPInstaller.wxs.php?r1=1.13r2=1.14diff_format=u
Index: win-installer/GenPHPInstaller.wxs.php
diff -u win-installer/GenPHPInstaller.wxs.php:1.13 
win-installer/GenPHPInstaller.wxs.php:1.14
--- win-installer/GenPHPInstaller.wxs.php:1.13  Wed Apr  1 19:47:32 2009
+++ win-installer/GenPHPInstaller.wxs.php   Thu Jun 25 15:59:13 2009
@@ -41,8 +41,6 @@
$MergeRef-setAttribute('Id','VCRedist_policy');
 }
 
-$PHPInstallerBaseWXS-save(PHPInstaller$version.wxs);
-
 // remove extension info from php.ini-production
 if ( is_file(Files/php.ini-production) )
$infile = fopen(Files/php.ini-production,'r');
@@ -62,5 +60,31 @@
 fclose($infile);
 fclose($outfile);
 
+// check for presence of certain file; if not there then remove the feature 
from the installer
+$files = array(
+'readme-redist-bins.txt' = 'readmedistbinsTXT',
+);
+
+foreach ( $files as $filename = $component ) {
+if ( !file_exists(Files/$filename) ) {
+$Components = $PHPInstallerBaseWXS-getElementsByTagName('Component');
+foreach ( $Components as $Component ) {
+if ( $Component-getAttribute('Id') == $component ) {
+$Component-parentNode-removeChild($Component);
+break;
+}
+}
+$ComponentRefs = 
$PHPInstallerBaseWXS-getElementsByTagName('ComponentRef');
+foreach ( $ComponentRefs as $ComponentRef ) {
+if ( $ComponentRef-getAttribute('Id') == $component ) {
+$ComponentRef-parentNode-removeChild($ComponentRef);
+break;
+}
+}
+}
+}
+
+$PHPInstallerBaseWXS-save(PHPInstaller$version.wxs);
+
 exit;
 ?
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.44r2=1.45diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.44 
win-installer/PHPInstallerBase52.wxs:1.45
--- win-installer/PHPInstallerBase52.wxs:1.44   Mon Jun  8 21:02:56 2009
+++ win-installer/PHPInstallerBase52.wxsThu Jun 25 15:59:13 2009
@@ -164,6 +164,14 @@
   Name=news.txt 
   Source=Files\news.txt/
   /Component
+  Component Id=readmedistbinsTXT 
+DiskId=1 
+Guid=23359910-5f6e-11de-8a39-0800200c9a66
+File Id=filereadmedistbinsTXT 
+Name=README_1.TXT 
+LongName=readme-redist-bins.txt
+Source=Files\readme-redist-bins.txt/
+  /Component
   Component Id=phpcgiEXE 
 DiskId=1 
 Guid=7ECF5817-CAB7-41EE-9E91-DDD2B1F5951B
@@ -353,6 +361,7 @@
   Level=1
   ComponentRef Id=licenseTXT/
   ComponentRef Id=newsTXT/
+  ComponentRef Id=readmedistbinsTXT/
   ComponentRef Id=installTXT/
   ComponentRef Id=phpGIF/
   ComponentRef Id=phprecommendedINI/
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.20r2=1.21diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.20 
win-installer/PHPInstallerBase52NTS.wxs:1.21
--- win-installer/PHPInstallerBase52NTS.wxs:1.20Mon Jun  8 21:02:56 2009
+++ win-installer/PHPInstallerBase52NTS.wxs Thu Jun 25 15:59:13 2009
@@ -142,6 +142,14 @@
   Name=news.txt 
   Source=Files\news.txt/
   /Component
+  Component Id=readmedistbinsTXT 
+DiskId=1 
+Guid=23359910-5f6e-11de-8a39-0800200c9a66
+File Id=filereadmedistbinsTXT 
+Name=README_1.TXT 
+LongName=readme-redist-bins.txt
+Source=Files\readme-redist-bins.txt/
+  /Component
   Component Id=phpcgiEXE 
 DiskId=1 
 Guid=7ECF5817-CAB7-41EE-9E91-DDD2B1F5951B
@@ -331,6 +339,7 @@
   Level=1
   ComponentRef Id=licenseTXT/
   ComponentRef Id=newsTXT/
+  ComponentRef Id=readmedistbinsTXT/
   ComponentRef Id=installTXT/
   ComponentRef Id=phpGIF/
   ComponentRef Id=phprecommendedINI/
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.23r2=1.24diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.23 
win-installer/PHPInstallerBase53.wxs:1.24
--- win-installer/PHPInstallerBase53.wxs:1.23   Mon Jun  8 21:02:56 2009
+++ win-installer/PHPInstallerBase53.wxsThu Jun 25 15:59:13 2009
@@ -157,12 +157,13 @@
   Name=news.txt 
   Source=Files\news.txt/
   /Component
-

[PHP-CVS] cvs: win-installer / PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

2009-06-25 Thread John Mertic

jmertic Thu Jun 25 20:51:05 2009 UTC

  Modified files:  
/win-installer  PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
  Log:
  Added installing phar.phar.bat and pharcommand.phar files automatically.
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.24r2=1.25diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.24 
win-installer/PHPInstallerBase53.wxs:1.25
--- win-installer/PHPInstallerBase53.wxs:1.24   Thu Jun 25 15:59:13 2009
+++ win-installer/PHPInstallerBase53.wxsThu Jun 25 20:51:04 2009
@@ -165,6 +165,13 @@
 LongName=readme-redist-bins.txt
 Source=Files\readme-redist-bins.txt/
   /Component
+  Component Id=phpcgiEXE 
+DiskId=1 
+Guid=7ECF5817-CAB7-41EE-9E91-DDD2B1F5951B
+File Id=file12 
+Name=php-cgi.exe 
+Source=Files\php-cgi.exe/
+  /Component
   Component Id=phpwinEXE 
 DiskId=1 
 Guid=BA2ADC66-E28C-4D5F-B4DA-E5F0874B2A10
@@ -287,6 +294,22 @@
   Name=php5ts.dll 
   Source=Files\php5ts.dll/
   /Component
+  Component Id=pharcommandPHAR 
+DiskId=1 
+Guid=86e9a7a0-5f6c-11de-8a39-0800200c9a66
+File Id=filepharcommandPHAR 
+  Name=PHARCO_1.PHA 
+  LongName=pharcommand.phar 
+  Source=Files\pharcommand.phar/
+  /Component
+  Component Id=pharBAT 
+DiskId=1 
+Guid=d266c230-5f6c-11de-8a39-0800200c9a66
+File Id=filepharpharBAT 
+  Name=PHAR.P_1.bat
+  LongName=phar.phar.bar 
+  Source=Files\phar.phar.bat/
+  /Component
   Component Id=phpCHM 
 DiskId=1 
 Guid=43C45330-3624-11DC-999C-478455D89593
@@ -343,6 +366,8 @@
   ComponentRef Id=php5tsLIB/
   ComponentRef Id=php5embedLIB/
   ComponentRef Id=phpEXE/
+  ComponentRef Id=pharcommandPHAR/
+  ComponentRef Id=pharBAT/
 Feature AllowAdvertise=no 
   Id=ScriptExecutable 
   Title=$(loc.FeatureScriptExecutableTitle) 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.21r2=1.22diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.21 
win-installer/PHPInstallerBase53NTS.wxs:1.22
--- win-installer/PHPInstallerBase53NTS.wxs:1.21Thu Jun 25 15:59:13 2009
+++ win-installer/PHPInstallerBase53NTS.wxs Thu Jun 25 20:51:04 2009
@@ -272,6 +272,22 @@
   Name=php5.dll 
   Source=Files\php5.dll/
   /Component
+  Component Id=pharcommandPHAR 
+DiskId=1 
+Guid=86e9a7a0-5f6c-11de-8a39-0800200c9a66
+File Id=filepharcommandPHAR 
+  Name=PHARCO_1.PHA 
+  LongName=pharcommand.phar 
+  Source=Files\pharcommand.phar/
+  /Component
+  Component Id=pharBAT 
+DiskId=1 
+Guid=d266c230-5f6c-11de-8a39-0800200c9a66
+File Id=filepharpharBAT 
+  Name=PHAR.P_1.bat
+  LongName=phar.phar.bar 
+  Source=Files\phar.phar.bat/
+  /Component
   Component Id=phpCHM 
 DiskId=1 
 Guid=43C45330-3624-11DC-999C-478455D89593
@@ -328,6 +344,8 @@
   ComponentRef Id=php5LIB/
   ComponentRef Id=php5embedLIB/
   ComponentRef Id=phpEXE/
+  ComponentRef Id=pharcommandPHAR/
+  ComponentRef Id=pharBAT/
 Feature AllowAdvertise=no 
   Id=ScriptExecutable 
   Title=$(loc.FeatureScriptExecutableTitle) 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.37r2=1.38diff_format=u
Index: win-installer/PHPInstallerBase60.wxs
diff -u win-installer/PHPInstallerBase60.wxs:1.37 
win-installer/PHPInstallerBase60.wxs:1.38
--- win-installer/PHPInstallerBase60.wxs:1.37   Thu Jun 25 15:59:13 2009
+++ win-installer/PHPInstallerBase60.wxsThu Jun 25 20:51:04 2009
@@ -294,6 +294,22 @@
   Name=php6ts.dll 
   Source=Files\php6ts.dll/
   /Component
+  Component Id=pharcommandPHAR 
+DiskId=1 
+Guid=86e9a7a0-5f6c-11de-8a39-0800200c9a66
+File Id=filepharcommandPHAR 
+  Name=PHARCO_1.PHA 
+  LongName=pharcommand.phar 
+  Source=Files\pharcommand.phar/
+  /Component
+  Component Id=pharBAT 
+DiskId=1 
+Guid=d266c230-5f6c-11de-8a39-0800200c9a66
+File Id=filepharpharBAT 
+  Name=PHAR.P_1.bat
+  LongName=phar.phar.bar 
+  Source=Files\phar.phar.bat/
+  /Component
   Component Id=phpCHM 
 DiskId=1

[PHP-CVS] cvs: win-installer / GenExtensionsComponents.wxs.php

2009-06-25 Thread John Mertic

jmertic Thu Jun 25 20:53:02 2009 UTC

  Modified files:  
/win-installer  GenExtensionsComponents.wxs.php 
  Log:
  Remove some debugging statements from the build code.
  
http://cvs.php.net/viewvc.cgi/win-installer/GenExtensionsComponents.wxs.php?r1=1.20r2=1.21diff_format=u
Index: win-installer/GenExtensionsComponents.wxs.php
diff -u win-installer/GenExtensionsComponents.wxs.php:1.20 
win-installer/GenExtensionsComponents.wxs.php:1.21
--- win-installer/GenExtensionsComponents.wxs.php:1.20  Tue May 19 19:02:35 2009
+++ win-installer/GenExtensionsComponents.wxs.php   Thu Jun 25 20:53:02 2009
@@ -138,9 +138,7 @@
 }
 
 // If this is a VC9 build, change the ICU library version
-var_dump($buildtype);
 if ( stripos($buildtype,'VC9') !== FALSE ) {
-   var_dump(I'm here);
$icuVer = '36';
if ( $phpver == '53' )
$icuVer = '38';



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

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

2009-05-27 Thread John Mertic

jmertic Wed May 27 13:12:02 2009 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
  Log:
  Install the PHP CLI exe always, removing the ability for a user to not select 
it.
  http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.41r2=1.42diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.41 
win-installer/PHPInstallerBase52.wxs:1.42
--- win-installer/PHPInstallerBase52.wxs:1.41   Fri Feb 20 15:48:15 2009
+++ win-installer/PHPInstallerBase52.wxsWed May 27 13:12:01 2009
@@ -358,23 +358,10 @@
   ComponentRef Id=phprecommendedINI/
   ComponentRef Id=win2003eventlog/
   ComponentRef Id=PHPRegistry/
-
-  Feature AllowAdvertise=no 
-Id=MainProgram 
-Title=$(loc.FeatureMainProgramTitle) 
-Description=$(loc.FeatureMainProgramDescription) 
-TypicalDefault=install 
-Level=1
-ComponentRef Id=php5tsDLL/
-ComponentRef Id=php5tsLIB/
-ComponentRef Id=php5embedLIB/
-Feature AllowAdvertise=no 
-  Id=MainExecutable 
-  Title=$(loc.FeatureMainExecutableTitle) 
-  Description=$(loc.FeatureMainExecutableDescription) 
-  Level=1
-  ComponentRef Id=phpEXE/
-/Feature
+  ComponentRef Id=php5tsDLL/
+  ComponentRef Id=php5tsLIB/
+  ComponentRef Id=php5embedLIB/
+  ComponentRef Id=phpEXE/
 Feature AllowAdvertise=no 
   Id=ScriptExecutable 
   Title=$(loc.FeatureScriptExecutableTitle) 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.17r2=1.18diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.17 
win-installer/PHPInstallerBase52NTS.wxs:1.18
--- win-installer/PHPInstallerBase52NTS.wxs:1.17Fri Feb 20 15:48:15 2009
+++ win-installer/PHPInstallerBase52NTS.wxs Wed May 27 13:12:01 2009
@@ -336,23 +336,10 @@
   ComponentRef Id=phprecommendedINI/
   ComponentRef Id=win2003eventlog/
   ComponentRef Id=PHPRegistry/
-
-  Feature AllowAdvertise=no 
-Id=MainProgram 
-Title=$(loc.FeatureMainProgramTitle) 
-Description=$(loc.FeatureMainProgramDescription) 
-TypicalDefault=install 
-Level=1
-ComponentRef Id=php5DLL/
-ComponentRef Id=php5LIB/
-ComponentRef Id=php5embedLIB/
-Feature AllowAdvertise=no 
-  Id=MainExecutable 
-  Title=$(loc.FeatureMainExecutableTitle) 
-  Description=$(loc.FeatureMainExecutableDescription) 
-  Level=1
-  ComponentRef Id=phpEXE/
-/Feature
+  ComponentRef Id=php5DLL/
+  ComponentRef Id=php5LIB/
+  ComponentRef Id=php5embedLIB/
+  ComponentRef Id=phpEXE/
 Feature AllowAdvertise=no 
   Id=ScriptExecutable 
   Title=$(loc.FeatureScriptExecutableTitle) 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.20r2=1.21diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.20 
win-installer/PHPInstallerBase53.wxs:1.21
--- win-installer/PHPInstallerBase53.wxs:1.20   Thu May 21 02:41:06 2009
+++ win-installer/PHPInstallerBase53.wxsWed May 27 13:12:01 2009
@@ -337,23 +337,10 @@
   ComponentRef Id=phprecommendedINI/
   ComponentRef Id=win2003eventlog/
   ComponentRef Id=PHPRegistry/
-
-  Feature AllowAdvertise=no 
-Id=MainProgram 
-Title=$(loc.FeatureMainProgramTitle) 
-Description=$(loc.FeatureMainProgramDescription) 
-TypicalDefault=install 
-Level=1
-ComponentRef Id=php5tsDLL/
-ComponentRef Id=php5tsLIB/
-ComponentRef Id=php5embedLIB/
-Feature AllowAdvertise=no 
-  Id=MainExecutable 
-  Title=$(loc.FeatureMainExecutableTitle) 
-  Description=$(loc.FeatureMainExecutableDescription) 
-  Level=1
-  ComponentRef Id=phpEXE/
-/Feature
+  ComponentRef Id=php5tsDLL/
+  ComponentRef Id=php5tsLIB/
+  ComponentRef Id=php5embedLIB/
+  ComponentRef Id=phpEXE/
 Feature AllowAdvertise=no 
   Id=ScriptExecutable 
   Title=$(loc.FeatureScriptExecutableTitle) 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.17r2=1.18diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.17 
win-installer/PHPInstallerBase53NTS.wxs:1.18
--- win-installer/PHPInstallerBase53NTS.wxs:1.17Thu May 21 02:41:06 2009
+++ win-installer/PHPInstallerBase53NTS.wxs Wed May 27 13:12:01 2009
@@ -315,23 +315,10 @@
   ComponentRef Id=phprecommendedINI/
   ComponentRef Id=win2003eventlog/

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

2009-05-27 Thread John Mertic

jmertic Wed May 27 19:40:57 2009 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
  Log:
  Fixed removing an end tag from earlier checkin.
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.42r2=1.43diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.42 
win-installer/PHPInstallerBase52.wxs:1.43
--- win-installer/PHPInstallerBase52.wxs:1.42   Wed May 27 13:12:01 2009
+++ win-installer/PHPInstallerBase52.wxsWed May 27 19:40:57 2009
@@ -376,7 +376,6 @@
 ComponentRef Id=RegisterPHPFilesREG/
   /Feature
 /Feature
-  /Feature
 
   FeatureRef Id=Extensions/
   
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.18r2=1.19diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.18 
win-installer/PHPInstallerBase52NTS.wxs:1.19
--- win-installer/PHPInstallerBase52NTS.wxs:1.18Wed May 27 13:12:01 2009
+++ win-installer/PHPInstallerBase52NTS.wxs Wed May 27 19:40:57 2009
@@ -354,7 +354,6 @@
 ComponentRef Id=RegisterPHPFilesREG/
   /Feature
 /Feature
-  /Feature
 
   FeatureRef Id=Extensions/
   
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.21r2=1.22diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.21 
win-installer/PHPInstallerBase53.wxs:1.22
--- win-installer/PHPInstallerBase53.wxs:1.21   Wed May 27 13:12:01 2009
+++ win-installer/PHPInstallerBase53.wxsWed May 27 19:40:57 2009
@@ -355,7 +355,6 @@
 ComponentRef Id=RegisterPHPFilesREG/
   /Feature
 /Feature
-  /Feature
 
   FeatureRef Id=Extensions/
   
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.18r2=1.19diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.18 
win-installer/PHPInstallerBase53NTS.wxs:1.19
--- win-installer/PHPInstallerBase53NTS.wxs:1.18Wed May 27 13:12:01 2009
+++ win-installer/PHPInstallerBase53NTS.wxs Wed May 27 19:40:57 2009
@@ -333,7 +333,6 @@
 ComponentRef Id=RegisterPHPFilesREG/
   /Feature
 /Feature
-  /Feature
 
   FeatureRef Id=Extensions/
   
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.34r2=1.35diff_format=u
Index: win-installer/PHPInstallerBase60.wxs
diff -u win-installer/PHPInstallerBase60.wxs:1.34 
win-installer/PHPInstallerBase60.wxs:1.35
--- win-installer/PHPInstallerBase60.wxs:1.34   Wed May 27 13:12:01 2009
+++ win-installer/PHPInstallerBase60.wxsWed May 27 19:40:57 2009
@@ -355,7 +355,6 @@
 ComponentRef Id=RegisterPHPFilesREG/
   /Feature
 /Feature
-  /Feature
 
   FeatureRef Id=Extensions/
   
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.18r2=1.19diff_format=u
Index: win-installer/PHPInstallerBase60NTS.wxs
diff -u win-installer/PHPInstallerBase60NTS.wxs:1.18 
win-installer/PHPInstallerBase60NTS.wxs:1.19
--- win-installer/PHPInstallerBase60NTS.wxs:1.18Wed May 27 13:12:02 2009
+++ win-installer/PHPInstallerBase60NTS.wxs Wed May 27 19:40:57 2009
@@ -333,7 +333,6 @@
 ComponentRef Id=RegisterPHPFilesREG/
   /Feature
 /Feature
-  /Feature
 
   FeatureRef Id=Extensions/
   



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

[PHP-CVS] cvs: win-installer / PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerScripts53.vbs

2009-05-20 Thread John Mertic

jmertic Thu May 21 02:41:06 2009 UTC

  Added files: 
/win-installer  PHPInstallerScripts53.vbs 

  Modified files:  
/win-installer  PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
  Log:
  Bug 47855: Remove references to apache13 sapi in vbs custom actions.
  http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.19r2=1.20diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.19 
win-installer/PHPInstallerBase53.wxs:1.20
--- win-installer/PHPInstallerBase53.wxs:1.19   Sat Mar 21 01:58:33 2009
+++ win-installer/PHPInstallerBase53.wxsThu May 21 02:41:06 2009
@@ -489,7 +489,7 @@
   /Feature
 /Feature
 
-Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts52.vbs / 
+Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts53.vbs / 
 Binary Id=WixCA src=Wix\wixca.dll/
 
 CustomAction Id=netserveCGIInterpretersaddCmd
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.16r2=1.17diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.16 
win-installer/PHPInstallerBase53NTS.wxs:1.17
--- win-installer/PHPInstallerBase53NTS.wxs:1.16Fri Feb 20 15:48:16 2009
+++ win-installer/PHPInstallerBase53NTS.wxs Thu May 21 02:41:06 2009
@@ -412,7 +412,7 @@
   /Feature
 /Feature
 
-Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts52.vbs / 
+Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts53.vbs / 
 Binary Id=WixCA src=Wix\wixca.dll/
 
 CustomAction Id=iis700FastCGIaddCmd

http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerScripts53.vbs?view=markuprev=1.1
Index: win-installer/PHPInstallerScripts53.vbs
+++ win-installer/PHPInstallerScripts53.vbs
Const ForReading = 1
Const ForWriting = 2

Sub configApache

Dim objFSO
Dim objFile

strDirective = vbCrLf  vbCrLf  #BEGIN PHP INSTALLER EDITS - REMOVE ONLY 
ON UNINSTALL  vbCrLf
strApacheDir = Session.Property(APACHEDIR)
strPHPPath = Replace(Session.TargetPath(INSTALLDIR),\,/)
If ( right(strApacheDir,1)  \ ) then 
strApacheDir = strApacheDir  \
End If

If ( Session.FeatureRequestState(apacheCGI) = 3 ) Then
strDirective = strDirective  ScriptAlias /php/   strPHPPath  
  vbCrLf
strDirective = strDirective  Action application/x-httpd-php   
strPHPPath  php-cgi.exe  vbCrLf
End If

If ( Session.FeatureRequestState(apache22) = 3 ) Then
strDirective = strDirective  PHPIniDir   strPHPPath
vbCrLf
strDirective = strDirective  LoadModule php5_module   strPHPPath 
 php5apache2_2.dll  vbCrLf
End If

'If ( Session.FeatureRequestState(apache20) = 3 ) Then
'strDirective = strDirective  PHPIniDir   strPHPPath
vbCrLf
'strDirective = strDirective  LoadModule php5_module   strPHPPath 
 php5apache2.dll  vbCrLf
'End If

strDirective = strDirective   #END PHP INSTALLER EDITS - REMOVE ONLY ON 
UNINSTALL  vbCrLf

Set objFSO = CreateObject(Scripting.FileSystemObject)
strFileName = strApacheDir  httpd.conf
If objFSO.FileExists(strFileName) Then
Set objFile = objFSO.OpenTextFile( strFileName, ForReading)
Else
strFileName = strApacheDir  conf\httpd.conf
If objFSO.FileExists(strFileName) Then
Set objFile = objFSO.OpenTextFile( strFileName, ForReading)
Else
FatalError (Error trying access httpd.conf file.)
Exit Sub
End If
End If
strText = objFile.ReadAll
objFile.Close

' try and comment out old directives if they exist
strText = Replace(strText,ScriptAlias /php/,#ScriptAlias /php/)
strText = Replace(strText,Action application/x-httpd-php,#Action 
application/x-httpd-php)
strText = Replace(strText,PHPIniDir,#PHPIniDir)
strText = Replace(strText,LoadModule php5_module,#LoadModule 
php5_module)
strText  = strText  strDirective

' backup old file
strBackupFileName = strFileName  .bak
objFSO.CopyFile strFileName, strBackupFileName 

Set objFile = objFSO.OpenTextFile( strFileName, ForWriting)
objFile.WriteLine strText
objFile.Close

strFileName = strApacheDir  mime.types
If objFSO.FileExists(strFileName) Then
Set objFile = objFSO.OpenTextFile( strFileName, ForReading)
Else
strFileName = strApacheDir  conf\mime.types
If objFSO.FileExists(strFileName) Then
Set objFile = objFSO.OpenTextFile( strFileName, ForReading)
Else
FatalError (Error trying access mime.types file.)
Exit Sub
End If
End If

strText = objFile.ReadAll
objFile.Close

If ( InStr(strText,application/x-httpd-php) = 0 ) Then
strText = strText  application/x-httpd-php  vbTab  php  vbCrLf
End If

If (

[PHP-CVS] cvs: win-installer / GenExtensionsComponents.wxs.php

2009-05-19 Thread John Mertic

jmertic Tue May 19 19:02:36 2009 UTC

  Modified files:  
/win-installer  GenExtensionsComponents.wxs.php 
  Log:
  Bug 48302: Have correct name for the icu*.dll files after installation.
  
http://cvs.php.net/viewvc.cgi/win-installer/GenExtensionsComponents.wxs.php?r1=1.19r2=1.20diff_format=u
Index: win-installer/GenExtensionsComponents.wxs.php
diff -u win-installer/GenExtensionsComponents.wxs.php:1.19 
win-installer/GenExtensionsComponents.wxs.php:1.20
--- win-installer/GenExtensionsComponents.wxs.php:1.19  Fri Mar 20 20:36:58 2009
+++ win-installer/GenExtensionsComponents.wxs.php   Tue May 19 19:02:35 2009
@@ -162,6 +162,7 @@
while ( $i  $files-length ) {
if ( in_array($files-item($i)-getAttribute('Id'),$icuFileIds) 
) {

$files-item($i)-setAttribute('Source',str_replace('36',$icuVer,$files-item($i)-getAttribute('Source')));
+   
$files-item($i)-setAttribute('Name',str_replace('36',$icuVer,$files-item($i)-getAttribute('Name')));
}
$i++;
}



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

[PHP-CVS] cvs: win-installer / GenPHPInstaller.wxs.php

2009-04-01 Thread John Mertic

jmertic Wed Apr  1 19:47:32 2009 UTC

  Modified files:  
/win-installer  GenPHPInstaller.wxs.php 
  Log:
  Fix check for correct php.ini to work for 5.2 and 5.3+ install builds.
  
http://cvs.php.net/viewvc.cgi/win-installer/GenPHPInstaller.wxs.php?r1=1.12r2=1.13diff_format=u
Index: win-installer/GenPHPInstaller.wxs.php
diff -u win-installer/GenPHPInstaller.wxs.php:1.12 
win-installer/GenPHPInstaller.wxs.php:1.13
--- win-installer/GenPHPInstaller.wxs.php:1.12  Tue Mar 24 22:13:00 2009
+++ win-installer/GenPHPInstaller.wxs.php   Wed Apr  1 19:47:32 2009
@@ -44,7 +44,10 @@
 $PHPInstallerBaseWXS-save(PHPInstaller$version.wxs);
 
 // remove extension info from php.ini-production
-$infile = fopen(Files/php.ini-production,'r');
+if ( is_file(Files/php.ini-production) )
+   $infile = fopen(Files/php.ini-production,'r');
+else
+   $infile = fopen(Files/php.ini-recommended,'r');
 $outfile = fopen(Files/php.ini,'w');
 if (!$outfile || !$infile) {
echo Cannot open php.ini or php.ini-production\n;



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

[PHP-CVS] cvs: win-installer / PHPInstallerBase53.wxs PHPInstallerBase60.wxs WebServerConfig53.wxs WebServerConfig60.wxs

2009-03-20 Thread John Mertic

jmertic Sat Mar 21 01:58:34 2009 UTC

  Modified files:  
/win-installer  PHPInstallerBase53.wxs PHPInstallerBase60.wxs 
WebServerConfig53.wxs WebServerConfig60.wxs 
  Log:
  Remove php5apache_hooks.dll from being required to build the installer.
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.18r2=1.19diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.18 
win-installer/PHPInstallerBase53.wxs:1.19
--- win-installer/PHPInstallerBase53.wxs:1.18   Fri Mar 20 20:36:58 2009
+++ win-installer/PHPInstallerBase53.wxsSat Mar 21 01:58:33 2009
@@ -386,7 +386,6 @@
   Level=10
   ComponentRef Id=php5apache2DLL/
   ComponentRef Id=php5apache2_filterDLL/
-  ComponentRef Id=php5apache_hooksDLL/
   ComponentRef Id=phpwinEXE/
   ComponentRef Id=apache20registry/
 /Feature--
@@ -397,7 +396,6 @@
   Level=10
   ComponentRef Id=php5apache2_2DLL/
   ComponentRef Id=php5apache2_2_filterDLL/
-  ComponentRef Id=php5apache_hooksDLL/
   ComponentRef Id=phpwinEXE/
   ComponentRef Id=apache22registry/
 /Feature
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.32r2=1.33diff_format=u
Index: win-installer/PHPInstallerBase60.wxs
diff -u win-installer/PHPInstallerBase60.wxs:1.32 
win-installer/PHPInstallerBase60.wxs:1.33
--- win-installer/PHPInstallerBase60.wxs:1.32   Fri Mar 20 20:36:58 2009
+++ win-installer/PHPInstallerBase60.wxsSat Mar 21 01:58:33 2009
@@ -386,7 +386,6 @@
   Level=10
   ComponentRef Id=php6apache2DLL/
   ComponentRef Id=php6apache2_filterDLL/
-  ComponentRef Id=php6apache_hooksDLL/
   ComponentRef Id=phpwinEXE/
   ComponentRef Id=apache20registry/
 /Feature
@@ -397,7 +396,6 @@
   Level=10
   ComponentRef Id=php6apache2_2DLL/
   ComponentRef Id=php6apache2_2_filterDLL/
-  ComponentRef Id=php6apache_hooksDLL/
   ComponentRef Id=phpwinEXE/
   ComponentRef Id=apache22registry/
 /Feature
http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig53.wxs?r1=1.5r2=1.6diff_format=u
Index: win-installer/WebServerConfig53.wxs
diff -u win-installer/WebServerConfig53.wxs:1.5 
win-installer/WebServerConfig53.wxs:1.6
--- win-installer/WebServerConfig53.wxs:1.5 Fri Mar 20 20:36:58 2009
+++ win-installer/WebServerConfig53.wxs Sat Mar 21 01:58:33 2009
@@ -14,9 +14,6 @@
   Component Id=php5apache2_2_filterDLL DiskId=1 
Guid=828FA07E-3624-11DC-8CB8-308555D89593
 File Id=filephp5apache2_2_filterDLL Name=PHP5AP_3.DLL 
LongName=php5apache2_2_filter.dll Source=Files\php5apache2_2_filter.dll /
   /Component
-  Component Id=php5apache_hooksDLL DiskId=1 
Guid=C4DB476D-1A0A-4C46-826C-1D3FD4BA45D0
-File Id=filephp5apache_hooksDLL Name=PHP5AP_4.DLL 
LongName=php5apache_hooks.dll Source=Files\php5apache_hooks.dll /
-  /Component
   Component Id=cgiforceredirect DiskId=1 
Guid=0A2DD92F-AFCC-417B-B909-395F9D3B79F5
 IniFile Id=cgiforceredirectINI Action=addLine 
   Key=cgi.force_redirect Directory=INSTALLDIR Name=php.ini
http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig60.wxs?r1=1.7r2=1.8diff_format=u
Index: win-installer/WebServerConfig60.wxs
diff -u win-installer/WebServerConfig60.wxs:1.7 
win-installer/WebServerConfig60.wxs:1.8
--- win-installer/WebServerConfig60.wxs:1.7 Fri Mar 20 20:36:58 2009
+++ win-installer/WebServerConfig60.wxs Sat Mar 21 01:58:33 2009
@@ -14,9 +14,6 @@
   Component Id=php6apache2_2_filterDLL DiskId=1 
Guid=828FA07E-3624-11DC-8CB8-308555D89593
 File Id=filephp6apache2_2_filterDLL Name=PHP6AP_3.DLL 
LongName=php6apache2_2_filter.dll Source=Files\php6apache2_2_filter.dll /
   /Component
-  Component Id=php6apache_hooksDLL DiskId=1 
Guid=C4DB476D-1A0A-4C46-826C-1D3FD4BA45D0
-File Id=filephp6apache_hooksDLL Name=PHP6AP_4.DLL 
LongName=php6apache_hooks.dll Source=Files\php6apache_hooks.dll /
-  /Component
   Component Id=cgiforceredirect DiskId=1 
Guid=0A2DD92F-AFCC-417B-B909-395F9D3B79F5
 IniFile Id=cgiforceredirectINI Action=addLine 
   Key=cgi.force_redirect Directory=INSTALLDIR Name=php.ini



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

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs WebServerConfig52.wxs

2009-02-17 Thread John Mertic

jmertic Tue Feb 17 16:44:59 2009 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
WebServerConfig52.wxs WebServerConfig52NTS.wxs 
WebServerConfig53.wxs WebServerConfig53NTS.wxs 
WebServerConfig60.wxs WebServerConfig60NTS.wxs 
  Log:
  Applied fixed contributed from Ruslan Yakushev rusl...@microsoft.com:
  
  - Set the fastcgi.impersonate = 1 in php.ini when installing the IIS/FastCGI 
sapi.
  http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.39r2=1.40diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.39 
win-installer/PHPInstallerBase52.wxs:1.40
--- win-installer/PHPInstallerBase52.wxs:1.39   Wed Feb  4 18:43:59 2009
+++ win-installer/PHPInstallerBase52.wxsTue Feb 17 16:44:59 2009
@@ -467,6 +467,7 @@
   Level=1
   ComponentRef Id=phpcgiEXE/
   ComponentRef Id=cgiforceredirect/
+  ComponentRef Id=fastcgiimpersonate/
   ComponentRef Id=iis4FastCGIregistry/
 /Feature
 Feature AllowAdvertise=no 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.15r2=1.16diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.15 
win-installer/PHPInstallerBase52NTS.wxs:1.16
--- win-installer/PHPInstallerBase52NTS.wxs:1.15Wed Feb  4 18:43:59 2009
+++ win-installer/PHPInstallerBase52NTS.wxs Tue Feb 17 16:44:59 2009
@@ -397,6 +397,7 @@
   Level=1
   ComponentRef Id=phpcgiEXE/
   ComponentRef Id=cgiforceredirect/
+  ComponentRef Id=fastcgiimpersonate/
   ComponentRef Id=iis4FastCGIregistry/
 /Feature
 Feature AllowAdvertise=no 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.15r2=1.16diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.15 
win-installer/PHPInstallerBase53.wxs:1.16
--- win-installer/PHPInstallerBase53.wxs:1.15   Wed Feb  4 18:43:59 2009
+++ win-installer/PHPInstallerBase53.wxsTue Feb 17 16:44:59 2009
@@ -446,6 +446,7 @@
   Level=1
   ComponentRef Id=phpcgiEXE/
   ComponentRef Id=cgiforceredirect/
+  ComponentRef Id=fastcgiimpersonate/
   ComponentRef Id=iis4FastCGIregistry/
 /Feature
 Feature AllowAdvertise=no 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.14r2=1.15diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.14 
win-installer/PHPInstallerBase53NTS.wxs:1.15
--- win-installer/PHPInstallerBase53NTS.wxs:1.14Wed Feb  4 18:43:59 2009
+++ win-installer/PHPInstallerBase53NTS.wxs Tue Feb 17 16:44:59 2009
@@ -376,6 +376,7 @@
   Level=1
   ComponentRef Id=phpcgiEXE/
   ComponentRef Id=cgiforceredirect/
+  ComponentRef Id=fastcgiimpersonate/
   ComponentRef Id=iis4FastCGIregistry/
 /Feature
Feature AllowAdvertise=no 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.29r2=1.30diff_format=u
Index: win-installer/PHPInstallerBase60.wxs
diff -u win-installer/PHPInstallerBase60.wxs:1.29 
win-installer/PHPInstallerBase60.wxs:1.30
--- win-installer/PHPInstallerBase60.wxs:1.29   Wed Feb  4 18:43:59 2009
+++ win-installer/PHPInstallerBase60.wxsTue Feb 17 16:44:59 2009
@@ -446,6 +446,7 @@
   Level=1
   ComponentRef Id=phpcgiEXE/
   ComponentRef Id=cgiforceredirect/
+  ComponentRef Id=fastcgiimpersonate/
   ComponentRef Id=iis4FastCGIregistry/
 /Feature
 Feature AllowAdvertise=no 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.15r2=1.16diff_format=u
Index: win-installer/PHPInstallerBase60NTS.wxs
diff -u win-installer/PHPInstallerBase60NTS.wxs:1.15 
win-installer/PHPInstallerBase60NTS.wxs:1.16
--- win-installer/PHPInstallerBase60NTS.wxs:1.15Wed Feb  4 18:43:59 2009
+++ win-installer/PHPInstallerBase60NTS.wxs Tue Feb 17 16:44:59 2009
@@ -376,6 +376,7 @@
   Level=1
   ComponentRef Id=phpcgiEXE/
   ComponentRef Id=cgiforceredirect/
+  ComponentRef Id=fastcgiimpersonate/
   ComponentRef Id=iis4FastCGIregistry/
 /Feature
Feature AllowAdvertise=no 
http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig52.wxs?r1=1.4r2=1.5diff_format=u
Index: win-installer/WebServerConfig52.wxs
diff -u win-installer/WebServerConfig52.wxs:1.4 
win-installer/WebServerConfig52.wxs:1.5
--- win-installer/WebServerConfig52.wxs:1.4 Fri Sep 28 16:47:43 2007
+++ win-installer/WebServerConfig52.wxs Tue Feb

[PHP-CVS] cvs: win-installer / PHPInstallerScripts52.vbs PHPInstallerScripts60.vbs

2009-02-11 Thread John Mertic

jmertic Wed Feb 11 17:49:52 2009 UTC

  Modified files:  
/win-installer  PHPInstallerScripts52.vbs PHPInstallerScripts60.vbs 
  Log:
  Bugs 47024/47111: Use FormatNumber() to format the version number strings to 
match what the regional settings say it should be.
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerScripts52.vbs?r1=1.11r2=1.12diff_format=u
Index: win-installer/PHPInstallerScripts52.vbs
diff -u win-installer/PHPInstallerScripts52.vbs:1.11 
win-installer/PHPInstallerScripts52.vbs:1.12
--- win-installer/PHPInstallerScripts52.vbs:1.11Wed Feb  4 18:43:59 2009
+++ win-installer/PHPInstallerScripts52.vbs Wed Feb 11 17:49:52 2009
@@ -174,7 +174,7 @@
Exit Sub
 End If
 
-If ( GetWindowsVersion  5.2 ) Then
+If ( FormatNumber(GetWindowsVersion)  FormatNumber(5.2) ) Then
 'use short path syntax here
 Set objFSO = CreateObject(Scripting.FileSystemObject)
 Set objFile = objFSO.GetFile(PHPExecutable)
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerScripts60.vbs?r1=1.11r2=1.12diff_format=u
Index: win-installer/PHPInstallerScripts60.vbs
diff -u win-installer/PHPInstallerScripts60.vbs:1.11 
win-installer/PHPInstallerScripts60.vbs:1.12
--- win-installer/PHPInstallerScripts60.vbs:1.11Wed Feb  4 18:43:59 2009
+++ win-installer/PHPInstallerScripts60.vbs Wed Feb 11 17:49:52 2009
@@ -174,7 +174,7 @@
Exit Sub
 End If
 
-If ( GetWindowsVersion  5.2 ) Then
+If ( FormatNumber(GetWindowsVersion)  FormatNumber(5.2) ) Then
 'use short path syntax here
 Set objFSO = CreateObject(Scripting.FileSystemObject)
 Set objFile = objFSO.GetFile(PHPExecutable)



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

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs PHPInstallerScripts52.

2009-01-29 Thread John Mertic

jmertic Thu Jan 29 18:30:33 2009 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
PHPInstallerScripts52.vbs PHPInstallerScripts60.vbs 
  Log:
  Applied fixed contributed from Ruslan Yakushev rusl...@microsoft.com:
  
  - The parameters passed to custom action for creating the scripts should be 
in quotes.
  - The VBScript code to get the short path to the fastcgi executable was 
failing on XP unless a separate file object was created.
  http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.36r2=1.37diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.36 
win-installer/PHPInstallerBase52.wxs:1.37
--- win-installer/PHPInstallerBase52.wxs:1.36   Tue Jan 27 14:28:19 2009
+++ win-installer/PHPInstallerBase52.wxsThu Jan 29 18:30:32 2009
@@ -638,7 +638,7 @@
   Impersonate=no /
 CustomAction Id=fcgiconfigJSFastCGICmd
   Property=fcgiconfigJSFastCGI
-  Value=cscript quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; 
-add -section:quot;PHPquot; -extension:php 
-path:quot;[INSTALLDIR]php-cgi.exequot; /
+  Value=quot;cscriptquot; 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -add 
-section:quot;PHPquot; -extension:php 
-path:quot;[INSTALLDIR]php-cgi.exequot; /
 CustomAction Id=fcgiconfigJSFastCGI 
   BinaryKey=WixCA
   DllEntry=CAQuietExec 
@@ -647,7 +647,7 @@
   Impersonate=no /
 CustomAction Id=fcgiconfigJSFastCGISetInstanceMaxRequestsCmd
   Property=fcgiconfigJSFastCGISetInstanceMaxRequests
-  Value=cscript quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; 
-set -section:quot;PHPquot; -InstanceMaxRequests:1 /
+  Value=quot;cscriptquot; 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set 
-section:quot;PHPquot; -InstanceMaxRequests:1 /
 CustomAction Id=fcgiconfigJSFastCGISetInstanceMaxRequests 
   BinaryKey=WixCA 
   DllEntry=CAQuietExec 
@@ -656,7 +656,7 @@
   Impersonate=no /
 CustomAction Id=fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd
   Property=fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS
-  Value=cscript quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; 
-set -section:quot;PHPquot; 
-EnvironmentVars:PHP_FCGI_MAX_REQUESTS:1,PHPRC:quot;[INSTALLDIR]quot; /
+  Value=quot;cscriptquot; 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set 
-section:quot;PHPquot; 
-EnvironmentVars:PHP_FCGI_MAX_REQUESTS:1,PHPRC:quot;[INSTALLDIR]quot; /
 CustomAction Id=fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS 
   BinaryKey=WixCA 
   DllEntry=CAQuietExec 
@@ -665,7 +665,7 @@
   Impersonate=no /
 CustomAction Id=fcgiconfigJSFastCGIremoveCmd
   Property=fcgiconfigJSFastCGIremove
-  Value=cscript quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; 
-remove -section:quot;PHPquot; /
+  Value=quot;cscriptquot; 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -remove 
-section:quot;PHPquot; /
 CustomAction Id=fcgiconfigJSFastCGIremove 
   BinaryKey=WixCA 
   DllEntry=CAQuietExec 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.12r2=1.13diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.12 
win-installer/PHPInstallerBase52NTS.wxs:1.13
--- win-installer/PHPInstallerBase52NTS.wxs:1.12Tue Jan 27 14:28:19 2009
+++ win-installer/PHPInstallerBase52NTS.wxs Thu Jan 29 18:30:33 2009
@@ -507,7 +507,7 @@
   Impersonate=no /
 CustomAction Id=fcgiconfigJSFastCGICmd
   Property=fcgiconfigJSFastCGI
-  Value=cscript quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; 
-add -section:quot;PHPquot; -extension:php 
-path:quot;[INSTALLDIR]php-cgi.exequot; /
+  Value=quot;cscriptquot; 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -add 
-section:quot;PHPquot; -extension:php 
-path:quot;[INSTALLDIR]php-cgi.exequot; /
 CustomAction Id=fcgiconfigJSFastCGI 
   BinaryKey=WixCA
   DllEntry=CAQuietExec 
@@ -516,7 +516,7 @@
   Impersonate=no /
 CustomAction Id=fcgiconfigJSFastCGISetInstanceMaxRequestsCmd
   Property=fcgiconfigJSFastCGISetInstanceMaxRequests
-  Value=cscript quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; 
-set -section:quot;PHPquot; -InstanceMaxRequests:1 /
+  Value=quot;cscriptquot; 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set 
-section:quot;PHPquot; -InstanceMaxRequests:1 /
 CustomAction Id=fcgiconfigJSFastCGISetInstanceMaxRequests 
   BinaryKey=WixCA 
   DllEntry=CAQuietExec 
@@ -525,7 +525,7 @@
   Impersonate=no /
 CustomAction Id=fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd

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

2009-01-29 Thread John Mertic

jmertic Thu Jan 29 19:03:30 2009 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
  Log:
  Add Binary tag for the wixca.dll file.
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.37r2=1.38diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.37 
win-installer/PHPInstallerBase52.wxs:1.38
--- win-installer/PHPInstallerBase52.wxs:1.37   Thu Jan 29 18:30:32 2009
+++ win-installer/PHPInstallerBase52.wxsThu Jan 29 19:03:27 2009
@@ -547,7 +547,8 @@
 /Feature
 
 Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts52.vbs / 
-
+Binary Id=WixCA src=Wix\wixca.dll/
+
 CustomAction Id=netserveCGIInterpretersaddCmd
   Property=netserveCGIInterpretersadd
   Value=quot;[%ProgramFiles]NetServe Web Server\config.exe /add 
CGIInterpreters php^|[INSTALLDIR]php-cgi.exe'] /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.13r2=1.14diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.13 
win-installer/PHPInstallerBase52NTS.wxs:1.14
--- win-installer/PHPInstallerBase52NTS.wxs:1.13Thu Jan 29 18:30:33 2009
+++ win-installer/PHPInstallerBase52NTS.wxs Thu Jan 29 19:03:28 2009
@@ -443,7 +443,8 @@
 /Feature
 
 Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts52.vbs / 
-
+Binary Id=WixCA src=Wix\wixca.dll/
+
 CustomAction Id=iis700FastCGIaddCmd
   Property=iis700FastCGIadd
   Value=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET CONFIG 
-section:system.webServer/fastCGI 
/+quot;[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]quot; /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.13r2=1.14diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.13 
win-installer/PHPInstallerBase53.wxs:1.14
--- win-installer/PHPInstallerBase53.wxs:1.13   Thu Jan 29 18:30:33 2009
+++ win-installer/PHPInstallerBase53.wxsThu Jan 29 19:03:29 2009
@@ -518,7 +518,8 @@
 /Feature
 
 Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts52.vbs / 
-
+Binary Id=WixCA src=Wix\wixca.dll/
+
 CustomAction Id=netserveCGIInterpretersaddCmd
   Property=netserveCGIInterpretersadd
   Value=quot;[%ProgramFiles]NetServe Web Server\config.exe /add 
CGIInterpreters php^|[INSTALLDIR]php-cgi.exe'] /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.12r2=1.13diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.12 
win-installer/PHPInstallerBase53NTS.wxs:1.13
--- win-installer/PHPInstallerBase53NTS.wxs:1.12Thu Jan 29 18:30:33 2009
+++ win-installer/PHPInstallerBase53NTS.wxs Thu Jan 29 19:03:29 2009
@@ -412,7 +412,8 @@
 /Feature
 
 Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts52.vbs / 
-
+Binary Id=WixCA src=Wix\wixca.dll/
+
 CustomAction Id=iis700FastCGIaddCmd
   Property=iis700FastCGIadd
   Value=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET CONFIG 
-section:system.webServer/fastCGI 
/+quot;[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]quot; /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.27r2=1.28diff_format=u
Index: win-installer/PHPInstallerBase60.wxs
diff -u win-installer/PHPInstallerBase60.wxs:1.27 
win-installer/PHPInstallerBase60.wxs:1.28
--- win-installer/PHPInstallerBase60.wxs:1.27   Thu Jan 29 18:30:33 2009
+++ win-installer/PHPInstallerBase60.wxsThu Jan 29 19:03:29 2009
@@ -518,7 +518,8 @@
 /Feature
 
 Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts60.vbs / 
-
+Binary Id=WixCA src=Wix\wixca.dll/
+
 CustomAction Id=netserveCGIInterpretersaddCmd
   Property=netserveCGIInterpretersadd
   Value=quot;[%ProgramFiles]NetServe Web Server\config.exe /add 
CGIInterpreters php^|[INSTALLDIR]php-cgi.exe'] /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.13r2=1.14diff_format=u
Index: win-installer/PHPInstallerBase60NTS.wxs
diff -u win-installer/PHPInstallerBase60NTS.wxs:1.13 
win-installer/PHPInstallerBase60NTS.wxs:1.14
--- win-installer/PHPInstallerBase60NTS.wxs:1.13Thu Jan 29 18:30:33 2009
+++ win-installer/PHPInstallerBase60NTS.wxs Thu Jan 29 19:03:29 2009
@@ -412,7 +412,8 @@
 /Feature
 
 Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts52.vbs / 
-
+Binary Id=WixCA src=Wix\wixca.dll/
+
 CustomAction Id=iis700FastCGIaddCmd
   Property=iis700FastCGIadd
   Value=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET CONFIG 
-section:system.webServer/fastCGI

[PHP-CVS] cvs: win-installer / GenPHPInstaller.wxs.php policy_9_0_Microsoft_VC90_CRT_x86.msm policy_9_0_Microsoft_VC90_CRT_x86_x64.msm

2008-12-20 Thread John Mertic

jmertic Sun Dec 21 03:43:07 2008 UTC

  Added files: 
/win-installer  policy_9_0_Microsoft_VC90_CRT_x86.msm 
policy_9_0_Microsoft_VC90_CRT_x86_x64.msm 

  Modified files:  
/win-installer  GenPHPInstaller.wxs.php 
  Log:
  Add the policy msm files to the installer. Should make the VC9 runtime be 
automatically installed if not present if needed.
  http://cvs.php.net/viewvc.cgi/win-installer/GenPHPInstaller.wxs.php?r1=1.10r2=1.11diff_format=u
Index: win-installer/GenPHPInstaller.wxs.php
diff -u win-installer/GenPHPInstaller.wxs.php:1.10 
win-installer/GenPHPInstaller.wxs.php:1.11
--- win-installer/GenPHPInstaller.wxs.php:1.10  Wed Dec  3 21:18:29 2008
+++ win-installer/GenPHPInstaller.wxs.php   Sun Dec 21 03:43:07 2008
@@ -25,20 +25,20 @@

$Merge-setAttribute('SourceFile',Microsoft_VC90_CRT_{$includemsm}.msm);
$Merge-setAttribute('DiskId','1');
$Merge-setAttribute('Language','0');
-   
+   $Merge = $PHPInstallerBaseWXS-createElement('Merge');
+   $Merge = $TargetDir-appendChild($Merge);
+   $Merge-setAttribute('Id','VCRedist_policy');
+   
$Merge-setAttribute('SourceFile',policy_9_0_Microsoft_VC90_CRT_{$includemsm}.msm);
+   $Merge-setAttribute('DiskId','1');
+   $Merge-setAttribute('Language','0');
+
$MainFeature = 
$PHPInstallerBaseWXS-getElementsByTagName('Feature')-item(0);
-   $Feature = $PHPInstallerBaseWXS-createElement('Feature');
-   $Feature = $MainFeature-appendChild($Feature);
-   $Feature-setAttribute('Id','VCRedistFeature');
-   $Feature-setAttribute('Title','Visual C++ 9.0 Runtime');
-   $Feature-setAttribute('AllowAdvertise','no');
-   $Feature-setAttribute('Display','hidden');
-   $Feature-setAttribute('Level','1');
-$Feature-setAttribute('InstallDefault','source');
-   
$MergeRef = $PHPInstallerBaseWXS-createElement('MergeRef');
-   $MergeRef = $Feature-appendChild($MergeRef);
+   $MergeRef = $MainFeature-appendChild($MergeRef);
$MergeRef-setAttribute('Id','VCRedist');
+$MergeRef = $PHPInstallerBaseWXS-createElement('MergeRef');
+   $MergeRef = $MainFeature-appendChild($MergeRef);
+   $MergeRef-setAttribute('Id','VCRedist_policy');
 }
 
 $PHPInstallerBaseWXS-save(PHPInstaller$version.wxs);

http://cvs.php.net/viewvc.cgi/win-installer/policy_9_0_Microsoft_VC90_CRT_x86.msm?view=markuprev=1.1
Index: win-installer/policy_9_0_Microsoft_VC90_CRT_x86.msm
+++ win-installer/policy_9_0_Microsoft_VC90_CRT_x86.msm
ÐÏà¡±á



¥³¯ZÓ1Øfr
Ýy'¥e²SqfþÜ 
}iÊü9Ø¤W¡²ÄùgGô#J¥½ü¸|óZÑÂ´ÀºµØùeÝ53eMÅSu'º7ÕÔeì÷¾IàhÙ¨GÄ]Ôk3³I'þ(^Ît...@ö_¿ñ:çP¯¼?bê×¬}¡¨¦¦É ÁêÐÀùW¼y¢Iþx¹iùá¦fúöõ
«0ÕüÖvMÑãúª½Ñ)òåG=×ÙÄT5ZtD0Ï½Ý{ãÐÝó]HþÁë=ÇÊ+ÞÆ^¿?qá3ÿÎmR
*m{k¯ùyø;ôLÖeGß°k¦¾¯Ïbsð6½ß[èª²¿\Qæ¸ÝG°¦;ÑÝ¢±îhtíÓTÚÛÌýJË¸xÚ:üF?9-k÷®ÖÂx7LVg´¢«·ñ¡A^«ó×D}'dO
   ÌÝã}Ë=C
Ð¸s4¯ÕåsIjÅ\êöÃçØTrÉ:%³VJnØg,B.i÷ï¼¡Ãä¡ùyþ¯XâýöÚ5±è¬ çOá(òíA8b`ìð·ö?®ýiáé'JÝÂn

³©æKÊugqö7N|àPkÀÎ¬¼Tik+6=ZïÈ9x¸\gmÇÇ¢æ+¶k)l¤ðÝLyRã¾e~aRc¦yn°ÔhxþÒqvJgë¤úº÷ÃÞ4_ÂtÅ_¿G¸¥Ñ!,Y8¨Qº6
 K2¡§¬ßáðLf#ÑC^.Óí Î]b°Yu[q´¶uÞy|ù+z`ª5/ 
yØ#À81Ç©ì3I¨Z÷çÍûhÇJÉ«ZO?w3ÊäÔÅ±Ü©|¶ñ½^máÁ1OÍÄ©%A¶ÚÝT£«Ò³h:â
©8
FÅÿÂe£³¾¿þÏj¿;sÅGÐe¿VÀæ^ñ±¶þ~S/up®ñpw÷ÈÎúëós]q�...@ÿ§¬bãa·h#Àæú
kßÀb¦fGÄ§h4 
¶D2+;%ÓÕÊãR^Öeå{9_ÔÃ}Û£öã3¶G¶Ytãj0pàQ\ZÚ»ëIëë|ml01zà¥ø4p...@zbs5lÛ}Ó×¶lò®×
Õ+n9^»Æ¼â*1vÃi.{Éöó7Ømº*úÕ,N¬óä3H`þô`ò WmkÃB¼82y8!¶ßãã
7ÂOçjÎ¾ÝÚü¹Å,]åÍrs¼_²1bD0¬ú·déì[$¿¨·½Ö8Óóùvr¸}-ðR³qÍ(_Òák¿_©ØþãqùÇiè§
Ö/q³ãOAùõ'FP~³0£y¾~ F«¡1ª.
Êz%~ÌÈ~EgøñNeç?CÎ1¼¹Å%f÷uï-ÐQ9ø°])×U÷yú®Ä]YÓ;R¨êrÙ¶ÝÔ7ìê1ahRÿNÚÍÔÎÔüÆZñ(ôlîxËÈ³Lb¾Ãkßýw}}N ¶³E/tjoÍ�...@¾(]µtq:m¦ÞAªÞ6z|`x¡¹Iyì³ÚõÅeVzºÁ¦V5zñqb3Iè.Ê¾LËÚÅöLYÂ*£]ë$ÔôUj^N*aÓòuÙûbùT
 éyÑU±Ü¶Mï;lí¯ohnz£TÓdjîàh;q9N4{ºMð¦1Lþý5]`?_d 
Iv÷t¿K(,
D}såÃ(Ô÷î`À Aõô @ P¨T7F$ÐöR¡ºµ4 
Û^T£1Ä²ÈpÊ WÅcÝÑD´Q/¥²ì¢ÑHÜ#0Äï2ÍðïËêÿ¾)_Ûð3Çÿy¡ãIdÆèCÉN¢B5 
_ÇzÊ:-¨üCïA?ë6}]6ó»z¹7tUÜ¿ÿ:6öÂmC.Ç79êgÓmÈÌWÔöÉÔÚyê¥[µ*«þÿ

®Onò±{W×Ä  ¹ñ~M9~Ç8ßöäöC#n?ävêEqP

ñß[£@;  K`ä¶1ä:ä!Ô
-ý^xõ
ÕF¢Ñà:...@ø»Ýb¡!÷Ò¼)t-âÂj�...@
5H2~ÍÃÐzÙ¼þÕüÖÂ¤úOí¸Q¤õ+ü¾ËD5eosùÊòò?8ÍK6w¯¶+ã0¬éBsÏ¼|¹lgk'íîÖ¾¸~B¢ÙÄ+néf*Ûse Éi¸ù®CyÿÒîwlÉái·/j*ýúÛù ÑÀ ÝÇ ¡Sãà°!ÿyuµýê#Ä¿7F4¹¨j·qá+8ò?ìr00¹/¶õ?¿vü±½Ù9Sáo*üM¿©ð'*¸tËß©ÀºÈ÷ÄfÉõô½ú¯w3â¿
PÞka D
Ùã«cÿÈ1iPòwÇDWÚ=H{ªi3üK*TìïÞQj=¯VîUßTÿq]Ö]ã=o;LÆ¾¹ÛÒ?¿¹¥g³¯±ît§YEÄÞãÚÉÜ6·e§r^pI¯ë0YÀ§·=f¾.ý~©ÔMså0Jïj
Ãx...@Â§2³´¸ÞìÜ5_X|æÇª«ú¼kNTLlRÉTej~Ö9X¡õñVà, 7sg^/êFÜ¸/¶
À`Kf  Úâ7bB°UüA à¿ýòdß-«[#T¾áÈÉ0ó 
PÅHeÆì»x)Ü\nêA-Ïy=mÃÞÒ¸Ï-S-/[^?!ÝæÎãî´Ä·ÎÙ·6f×:RÞ
M]bÙ\©û$ö¿?PMÒ;éS£å×pYúóÐËnûÑÚÅ

[PHP-CVS] cvs: win-installer / build.bat

2008-12-20 Thread John Mertic

jmertic Sun Dec 21 03:43:46 2008 UTC

  Modified files:  
/win-installer  build.bat 
  Log:
  Clean up the order of things in the build file.
  
http://cvs.php.net/viewvc.cgi/win-installer/build.bat?r1=1.15r2=1.16diff_format=u
Index: win-installer/build.bat
diff -u win-installer/build.bat:1.15 win-installer/build.bat:1.16
--- win-installer/build.bat:1.15Fri Dec 19 20:26:13 2008
+++ win-installer/build.bat Sun Dec 21 03:43:46 2008
@@ -4,9 +4,6 @@
 set phpver=%phpver:~0,3%
 set phpver=%phpver:.=%
 
-echo Building ExtensionsFeatures.wxs
-copy ExtensionsFeatures%phpver%.wxs ExtensionsFeatures.wxs
-
 set suffix=
 set extrants=
 set extrasnaps=
@@ -43,6 +40,9 @@
 :build
 set msiname=php-%1-%extrants%win32-%buildtype%-installer%extrasnaps%.msi
 
+echo Building ExtensionsFeatures.wxs
+copy ExtensionsFeatures%phpver%.wxs ExtensionsFeatures.wxs
+
 echo Building ExtensionsComponents.wxs
 Files\php.exe -n GenExtensionsComponents.wxs.php %phpver%
 



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

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs WebServerConfig53.wxs

2008-12-20 Thread John Mertic

jmertic Sun Dec 21 04:11:21 2008 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
WebServerConfig53.wxs 
  Log:
  Add automatic setting of PHPRC, instanceMaxRequests, and 
PHP_FCGI_MAX_REQUESTS variables for IIS FastCGI.
  
  Don't disable the apache13 components; only the VC9 builds are currently 
broken.
  http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.32r2=1.33diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.32 
win-installer/PHPInstallerBase52.wxs:1.33
--- win-installer/PHPInstallerBase52.wxs:1.32   Tue Dec 16 21:12:25 2008
+++ win-installer/PHPInstallerBase52.wxsSun Dec 21 04:11:21 2008
@@ -584,6 +584,24 @@
  Execute=deferred
  Impersonate=no
   Directory=INSTALLDIR/
+CustomAction Id=iis700FastCGISetPHPRC 
+  ExeCommand=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET 
CONFIG /section:system.webServer/fastCGI 
/+quot;[fullPath='[INSTALLDIR]php-cgi.exe'].environmentVariables.[name='PHPRC',value='[INSTALLDIR]']quot;
 /commit:apphost 
+  Return=ignore 
+ Execute=deferred
+ Impersonate=no
+  Directory=INSTALLDIR/
+CustomAction Id=iis700FastCGISetInstanceMaxRequests 
+  ExeCommand=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET 
CONFIG /section:system.webServer/fastCGI 
/+quot;[fullPath='[INSTALLDIR]php-cgi.exe'].instanceMaxRequests:1 
/commit:apphost 
+  Return=ignore 
+ Execute=deferred
+ Impersonate=no
+  Directory=INSTALLDIR/
+CustomAction Id=iis700FastCGISetPHP_FCGI_MAX_REQUESTS 
+  ExeCommand=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET 
CONFIG /section:system.webServer/fastCGI 
/+quot;[fullPath='[INSTALLDIR]php-cgi.exe'].environmentVariables.[name='PHP_FCGI_MAX_REQUESTS',value='1']
 /commit:apphost 
+  Return=ignore 
+ Execute=deferred
+ Impersonate=no
+  Directory=INSTALLDIR/
 CustomAction Id=iis700ISAPI 
   ExeCommand=quot;[WindowsFolder]System32\inetsrv\APPCMD.EXEquot; SET 
CONFIG -section:handlers 
quot;-+[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'quot;
 
   Return=ignore 
@@ -656,8 +674,26 @@
   Execute=deferred
  Impersonate=no
   Directory=INSTALLDIR/
+CustomAction Id=fcgiconfigJSFastCGISetPHPRC 
+  ExeCommand=cscript 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set 
-section:quot;PHPquot; -EnvironmentVars:PHPRC:quot;[INSTALLDIR]quot;
+  Return=ignore 
+  Execute=deferred
+ Impersonate=no
+  Directory=INSTALLDIR/
+CustomAction Id=fcgiconfigJSFastCGISetInstanceMaxRequests 
+  ExeCommand=cscript 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set 
-section:quot;PHPquot; -InstanceMaxRequests:1
+  Return=ignore 
+  Execute=deferred
+ Impersonate=no
+  Directory=INSTALLDIR/
+CustomAction Id=fcgiconfigJSFastCGISetPHP_FCGI_MAX_REQUESTS 
+  ExeCommand=cscript 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set 
-section:quot;PHPquot; -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:1
+  Return=ignore 
+  Execute=deferred
+ Impersonate=no
+  Directory=INSTALLDIR/
 CustomAction Id=fcgiconfigJSFastCGIremove 
-  ExeCommand=cscript 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -remove 
-section:quot;PHPquot;Ã
+  ExeCommand=cscript 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -remove 
-section:quot;PHPquot;
   Return=ignore 
   Execute=deferred
  Impersonate=no
@@ -695,6 +731,15 @@
   Custom Action=iis700FastCGI After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
+  Custom Action=iis700FastCGISetPHPRC After=InstallInitialize
+![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
+  /Custom
+  Custom Action=iis700FastCGISetInstanceMaxRequests 
After=InstallInitialize
+![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
+  /Custom
+  Custom Action=iis700FastCGISetPHPRC After=InstallInitialize
+![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
+  /Custom
   Custom Action=iis700CGI After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4CGI = 3]]
   /Custom
@@ -734,6 +779,15 @@
   Custom Action=fcgiconfigJSFastCGI After=InstallInitialize
 ![CDATA[((VersionNT = 501 AND ServicePackLevel = 2) OR (VersionNT = 
502 AND ServicePackLevel = 2)) AND iis4FastCGI = 3]]
   /Custom
+  Custom Action=fcgiconfigJSFastCGISetPHPRC After=InstallInitialize
+![CDATA[((VersionNT = 501 AND ServicePackLevel = 2) OR (VersionNT = 
502 AND ServicePackLevel = 2)) AND iis4FastCGI

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

2008-12-20 Thread John Mertic

jmertic Sun Dec 21 04:21:13 2008 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
  Log:
  Fix typo in earlier commit.
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.33r2=1.34diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.33 
win-installer/PHPInstallerBase52.wxs:1.34
--- win-installer/PHPInstallerBase52.wxs:1.33   Sun Dec 21 04:11:21 2008
+++ win-installer/PHPInstallerBase52.wxsSun Dec 21 04:21:13 2008
@@ -737,7 +737,7 @@
   Custom Action=iis700FastCGISetInstanceMaxRequests 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
-  Custom Action=iis700FastCGISetPHPRC After=InstallInitialize
+  Custom Action=iis700FastCGISetPHP_FCGI_MAX_REQUESTS 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
   Custom Action=iis700CGI After=InstallInitialize
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.9r2=1.10diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.9 
win-installer/PHPInstallerBase52NTS.wxs:1.10
--- win-installer/PHPInstallerBase52NTS.wxs:1.9 Sun Dec 21 04:11:21 2008
+++ win-installer/PHPInstallerBase52NTS.wxs Sun Dec 21 04:21:13 2008
@@ -539,7 +539,7 @@
   Custom Action=iis700FastCGISetInstanceMaxRequests 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
-  Custom Action=iis700FastCGISetPHPRC After=InstallInitialize
+  Custom Action=iis700FastCGISetPHP_FCGI_MAX_REQUESTS 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
   Custom Action=iis700FastCGIremove After=InstallInitialize
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.9r2=1.10diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.9 
win-installer/PHPInstallerBase53.wxs:1.10
--- win-installer/PHPInstallerBase53.wxs:1.9Sun Dec 21 04:11:21 2008
+++ win-installer/PHPInstallerBase53.wxsSun Dec 21 04:21:13 2008
@@ -708,7 +708,7 @@
   Custom Action=iis700FastCGISetInstanceMaxRequests 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
-  Custom Action=iis700FastCGISetPHPRC After=InstallInitialize
+  Custom Action=iis700FastCGISetPHP_FCGI_MAX_REQUESTS 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
   Custom Action=iis700CGI After=InstallInitialize
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.8r2=1.9diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.8 
win-installer/PHPInstallerBase53NTS.wxs:1.9
--- win-installer/PHPInstallerBase53NTS.wxs:1.8 Sun Dec 21 04:11:21 2008
+++ win-installer/PHPInstallerBase53NTS.wxs Sun Dec 21 04:21:13 2008
@@ -510,7 +510,7 @@
   Custom Action=iis700FastCGISetInstanceMaxRequests 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
-  Custom Action=iis700FastCGISetPHPRC After=InstallInitialize
+  Custom Action=iis700FastCGISetPHP_FCGI_MAX_REQUESTS 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
   Custom Action=iis700FastCGIremove After=InstallInitialize
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.23r2=1.24diff_format=u
Index: win-installer/PHPInstallerBase60.wxs
diff -u win-installer/PHPInstallerBase60.wxs:1.23 
win-installer/PHPInstallerBase60.wxs:1.24
--- win-installer/PHPInstallerBase60.wxs:1.23   Sun Dec 21 04:11:21 2008
+++ win-installer/PHPInstallerBase60.wxsSun Dec 21 04:21:13 2008
@@ -708,7 +708,7 @@
   Custom Action=iis700FastCGISetInstanceMaxRequests 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
-  Custom Action=iis700FastCGISetPHPRC After=InstallInitialize
+  Custom Action=iis700FastCGISetPHP_FCGI_MAX_REQUESTS 
After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
   Custom Action=iis700CGI After=InstallInitialize
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.9r2=1.10diff_format=u
Index: win-installer/PHPInstallerBase60NTS.wxs
diff -u win-installer/PHPInstallerBase60NTS.wxs:1.9 
win-installer/PHPInstallerBase60NTS.wxs:1.10
--- win-installer/PHPInstallerBase60NTS.wxs:1.9 Sun Dec 21 04:11:21 2008
+++ win-installer/PHPInstallerBase60NTS.wxs Sun Dec 21 04:21:13 2008
@@ -510,7 +510,7 @@
   Custom Action=iis700FastCGISetInstanceMaxRequests 
After=InstallInitialize

[PHP-CVS] cvs: win-installer / ExtensionsFeatures52.wxs ExtensionsFeatures53.wxs ExtensionsFeatures60.wxs

2008-12-19 Thread John Mertic

jmertic Fri Dec 19 16:17:11 2008 UTC

  Modified files:  
/win-installer  ExtensionsFeatures52.wxs ExtensionsFeatures53.wxs 
ExtensionsFeatures60.wxs 
  Log:
  Remove ntwdblib.dll from the installer since it's no longer packaged with PHP.
  
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures52.wxs?r1=1.2r2=1.3diff_format=u
Index: win-installer/ExtensionsFeatures52.wxs
diff -u win-installer/ExtensionsFeatures52.wxs:1.2 
win-installer/ExtensionsFeatures52.wxs:1.3
--- win-installer/ExtensionsFeatures52.wxs:1.2  Mon Aug  4 15:11:38 2008
+++ win-installer/ExtensionsFeatures52.wxs  Fri Dec 19 16:17:11 2008
@@ -220,7 +220,6 @@
/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/
@@ -284,7 +283,6 @@
/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/
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures53.wxs?r1=1.8r2=1.9diff_format=u
Index: win-installer/ExtensionsFeatures53.wxs
diff -u win-installer/ExtensionsFeatures53.wxs:1.8 
win-installer/ExtensionsFeatures53.wxs:1.9
--- win-installer/ExtensionsFeatures53.wxs:1.8  Wed Sep 10 20:32:40 2008
+++ win-installer/ExtensionsFeatures53.wxs  Fri Dec 19 16:17:11 2008
@@ -227,7 +227,6 @@
/Feature
Feature AllowAdvertise=no Id=ext_php_mssql 
Title=$(loc.Featureext_php_mssqlTitle) 
Description=$(loc.Featureext_php_mssqlDescription) TypicalDefault=install 
Level=1
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) TypicalDefault=install 
Level=1
ComponentRef Id=php_mysql/
@@ -289,7 +288,6 @@
/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) 
TypicalDefault=install Level=1
ComponentRef Id=php_pdo_mysql/
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures60.wxs?r1=1.2r2=1.3diff_format=u
Index: win-installer/ExtensionsFeatures60.wxs
diff -u win-installer/ExtensionsFeatures60.wxs:1.2 
win-installer/ExtensionsFeatures60.wxs:1.3
--- win-installer/ExtensionsFeatures60.wxs:1.2  Wed Sep 10 20:33:14 2008
+++ win-installer/ExtensionsFeatures60.wxs  Fri Dec 19 16:17:11 2008
@@ -227,7 +227,6 @@
/Feature
Feature AllowAdvertise=no Id=ext_php_mssql 
Title=$(loc.Featureext_php_mssqlTitle) 
Description=$(loc.Featureext_php_mssqlDescription) TypicalDefault=install 
Level=1
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) TypicalDefault=install 
Level=1
ComponentRef Id=php_mysql/
@@ -289,7 +288,6 @@
/Feature
Feature AllowAdvertise=no 
Id=ext_php_pdo_mssql Title=$(loc.Featureext_php_pdo_mssqlTitle) 
Description=$(loc.Featureext_php_pdo_mssqlDescription) Level=10

[PHP-CVS] cvs: win-installer / build.bat

2008-12-19 Thread John Mertic

jmertic Fri Dec 19 20:26:14 2008 UTC

  Modified files:  
/win-installer  build.bat 
  Log:
  Run PHP scripts without parsing any ini file settings.
  
http://cvs.php.net/viewvc.cgi/win-installer/build.bat?r1=1.14r2=1.15diff_format=u
Index: win-installer/build.bat
diff -u win-installer/build.bat:1.14 win-installer/build.bat:1.15
--- win-installer/build.bat:1.14Wed Oct  8 14:46:15 2008
+++ win-installer/build.bat Fri Dec 19 20:26:13 2008
@@ -44,10 +44,10 @@
 set msiname=php-%1-%extrants%win32-%buildtype%-installer%extrasnaps%.msi
 
 echo Building ExtensionsComponents.wxs
-Files\php.exe GenExtensionsComponents.wxs.php %phpver%
+Files\php.exe -n GenExtensionsComponents.wxs.php %phpver%
 
 echo Building PHPInstaller%1.wxs
-Files\php.exe GenPHPInstaller.wxs.php PHPInstallerBase%phpver%%suffix%.wxs 
%1 %includevc9msm%
+Files\php.exe -n GenPHPInstaller.wxs.php 
PHPInstallerBase%phpver%%suffix%.wxs %1 %includevc9msm%
 
 echo Building WebServerConfig%1.wxs
 copy WebServerConfig%phpver%%suffix%.wxs WebServerConfig%1.wxs



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

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

2008-12-16 Thread John Mertic

jmertic Tue Dec 16 21:12:25 2008 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
  Log:
  Sync up the setttings for the CustomActions amongst the various PHP installer 
versions. Fixes Bug 46826.
  http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.31r2=1.32diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.31 
win-installer/PHPInstallerBase52.wxs:1.32
--- win-installer/PHPInstallerBase52.wxs:1.31   Fri Dec  5 12:33:13 2008
+++ win-installer/PHPInstallerBase52.wxsTue Dec 16 21:12:25 2008
@@ -118,7 +118,7 @@
 Custom Action=AssignAPACHEDIR After=CostInitializeNOT 
APACHEDIR/Custom
 Custom Action=AssignAPACHEDIR2 
After=CostInitializeAPACHEREGDIR/Custom
 /InstallUISequence
-
+
 Property Id=WEBSERVERPICKER
   RegistrySearch Id=webservertype 
 Root=HKLM 
@@ -337,7 +337,7 @@
 LongName=Programs
 Directory Id=ProgramMenuDir 
   Name=PHP5 
-  LongName=PHP 5 /
+  LongName=PHP 5/
   /Directory
   Directory Id=usrdirectory Name=usr
   Directory Id=mibsdirectory Name=mibs /
@@ -737,16 +737,16 @@
   Custom Action=fcgiconfigJSFastCGIremove After=InstallInitialize
 ![CDATA[((VersionNT = 501 AND ServicePackLevel = 2) OR (VersionNT = 
502 AND ServicePackLevel = 2)) AND iis4FastCGI = 2]]
   /Custom
-  Custom Action=unconfigIIS4 After=InstallInitialize
+  Custom Action=unconfigIIS4 After=InstallValidate
 ![CDATA[VersionNT  600 AND (iis4ISAPI = 2 OR iis4CGI = 2 OR 
iis4FastCGI = 2)]]
   /Custom
-  Custom Action=configIIS4 After=InstallInitialize
+  Custom Action=configIIS4 After=InstallFinalize
 ![CDATA[VersionNT  600 AND (iis4ISAPI = 3 OR iis4CGI = 3 OR 
iis4FastCGI = 3)]]
   /Custom
-  Custom Action=unconfigApache After=InstallInitialize
+  Custom Action=unconfigApache After=InstallValidate
 ![CDATA[apache13 = 2 OR apache20 = 2 OR apache22 = 2 OR apacheCGI 
= 2]]
   /Custom
-  Custom Action=configApache After=InstallInitialize
+  Custom Action=configApache After=InstallFinalize
 ![CDATA[apache13 = 3 OR apache20 = 3 OR apache22 = 3 OR apacheCGI 
= 3]]
   /Custom
   RemoveExistingProducts After=InstallValidate /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.7r2=1.8diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.7 
win-installer/PHPInstallerBase52NTS.wxs:1.8
--- win-installer/PHPInstallerBase52NTS.wxs:1.7 Mon Nov 10 19:13:10 2008
+++ win-installer/PHPInstallerBase52NTS.wxs Tue Dec 16 21:12:25 2008
@@ -317,7 +317,6 @@
   Name=PHP5 
   LongName=PHP 5/
   /Directory
-  
   Directory Id=usrdirectory Name=usr
   Directory Id=mibsdirectory Name=mibs /
   /Directory
@@ -497,10 +496,10 @@
   Custom Action=iis700FastCGIremove After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 2]]
   /Custom
-  Custom Action=fcgiconfigJSFastCGI After=InstallFinalize
+  Custom Action=fcgiconfigJSFastCGI After=InstallInitialize
 ![CDATA[((VersionNT = 501 AND ServicePackLevel = 2) OR (VersionNT = 
502 AND ServicePackLevel = 2)) AND iis4FastCGI = 3]]
   /Custom
-  Custom Action=fcgiconfigJSFastCGIremove After=InstallFinalize
+  Custom Action=fcgiconfigJSFastCGIremove After=InstallInitialize
 ![CDATA[((VersionNT = 501 AND ServicePackLevel = 2) OR (VersionNT = 
502 AND ServicePackLevel = 2)) AND iis4FastCGI = 2]]
   /Custom
   Custom Action=unconfigIIS4 After=InstallValidate
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.7r2=1.8diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.7 
win-installer/PHPInstallerBase53.wxs:1.8
--- win-installer/PHPInstallerBase53.wxs:1.7Fri Dec  5 12:33:13 2008
+++ win-installer/PHPInstallerBase53.wxsTue Dec 16 21:12:25 2008
@@ -118,7 +118,7 @@
 Custom Action=AssignAPACHEDIR After=CostInitializeNOT 
APACHEDIR/Custom
 Custom Action=AssignAPACHEDIR2 
After=CostInitializeAPACHEREGDIR/Custom
 /InstallUISequence
-
+
 Property Id=WEBSERVERPICKER
   RegistrySearch Id=webservertype 
 Root=HKLM 
@@ -319,7 +319,7 @@
 LongName=Programs
 Directory Id=ProgramMenuDir 
   Name=PHP5 
-  LongName=PHP 5 /
+  LongName=PHP 5/
   /Directory
 /Directory
 Feature AllowAdvertise=no 
@@ -384,10 +384,8 @@
   Title=$(loc.Featureapache13Title) 
   Description=$(loc.Featureapache13Description) 
   Level=10
-!--
   ComponentRef Id=php5apacheDLL/

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase53.wxs

2008-12-05 Thread John Mertic

jmertic Fri Dec  5 12:33:14 2008 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase53.wxs 
  Log:
  Bug 46757 - Revert changes making the VBScript custom actions deferred.
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.30r2=1.31diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.30 
win-installer/PHPInstallerBase52.wxs:1.31
--- win-installer/PHPInstallerBase52.wxs:1.30   Mon Nov 10 19:13:10 2008
+++ win-installer/PHPInstallerBase52.wxsFri Dec  5 12:33:13 2008
@@ -405,10 +405,8 @@
   Title=$(loc.Featureapache13Title) 
   Description=$(loc.Featureapache13Description) 
   Level=10
-
   ComponentRef Id=php5apacheDLL/
   ComponentRef Id=php5apache_hooksDLL/
-
   ComponentRef Id=phpwinEXE/
   ComponentRef Id=apache13registry/
 /Feature
@@ -667,26 +665,18 @@
 CustomAction Id=configIIS4 
   BinaryKey=PHPInstallerScripts 
   Return=check 
-  Execute=deferred
- Impersonate=no
   VBScriptCall=configIIS4 /
 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=unconfigApache 
   BinaryKey=PHPInstallerScripts 
   Return=check 
-  Execute=deferred
- Impersonate=no
   VBScriptCall=unconfigApache /
   
 InstallExecuteSequence
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.6r2=1.7diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.6 
win-installer/PHPInstallerBase53.wxs:1.7
--- win-installer/PHPInstallerBase53.wxs:1.6Mon Nov 10 19:13:10 2008
+++ win-installer/PHPInstallerBase53.wxsFri Dec  5 12:33:13 2008
@@ -632,32 +632,23 @@
 CustomAction Id=fcgiconfigJSFastCGIremove 
   ExeCommand=cscript 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -remove 
-section:quot;PHPquot;Ã
   Return=ignore 
-  Execute=deferred
- Impersonate=no
+  Impersonate=no
   Directory=INSTALLDIR/
 CustomAction Id=configIIS4 
   BinaryKey=PHPInstallerScripts 
   Return=check 
-  Execute=deferred
- Impersonate=no
   VBScriptCall=configIIS4 /
 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=unconfigApache 
   BinaryKey=PHPInstallerScripts 
   Return=check 
-  Execute=deferred
- Impersonate=no
   VBScriptCall=unconfigApache /
   
 InstallExecuteSequence



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

[PHP-CVS] cvs: win-installer / GenPHPInstaller.wxs.php

2008-12-03 Thread John Mertic

jmertic Wed Dec  3 21:18:30 2008 UTC

  Modified files:  
/win-installer  GenPHPInstaller.wxs.php 
  Log:
  Don't use the same id for the msm merge element and feature element.
  
http://cvs.php.net/viewvc.cgi/win-installer/GenPHPInstaller.wxs.php?r1=1.9r2=1.10diff_format=u
Index: win-installer/GenPHPInstaller.wxs.php
diff -u win-installer/GenPHPInstaller.wxs.php:1.9 
win-installer/GenPHPInstaller.wxs.php:1.10
--- win-installer/GenPHPInstaller.wxs.php:1.9   Mon Oct 20 15:01:28 2008
+++ win-installer/GenPHPInstaller.wxs.php   Wed Dec  3 21:18:29 2008
@@ -29,11 +29,12 @@
$MainFeature = 
$PHPInstallerBaseWXS-getElementsByTagName('Feature')-item(0);
$Feature = $PHPInstallerBaseWXS-createElement('Feature');
$Feature = $MainFeature-appendChild($Feature);
-   $Feature-setAttribute('Id','VCRedist');
+   $Feature-setAttribute('Id','VCRedistFeature');
$Feature-setAttribute('Title','Visual C++ 9.0 Runtime');
$Feature-setAttribute('AllowAdvertise','no');
$Feature-setAttribute('Display','hidden');
$Feature-setAttribute('Level','1');
+$Feature-setAttribute('InstallDefault','source');

$MergeRef = $PHPInstallerBaseWXS-createElement('MergeRef');
$MergeRef = $Feature-appendChild($MergeRef);



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

[PHP-CVS] cvs: win-installer / PHPInstallerCommon.wxs PHPInstallerCommonNTS.wxs

2008-11-10 Thread John Mertic

jmertic Mon Nov 10 16:05:03 2008 UTC

  Modified files:  
/win-installer  PHPInstallerCommon.wxs PHPInstallerCommonNTS.wxs 
  Log:
  Fixed message displayed when IIS FastCGI is selected but not installed on 
Windows 2003 Server.
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerCommon.wxs?r1=1.11r2=1.12diff_format=u
Index: win-installer/PHPInstallerCommon.wxs
diff -u win-installer/PHPInstallerCommon.wxs:1.11 
win-installer/PHPInstallerCommon.wxs:1.12
--- win-installer/PHPInstallerCommon.wxs:1.11   Wed Sep 10 20:49:17 2008
+++ win-installer/PHPInstallerCommon.wxsMon Nov 10 16:05:03 2008
@@ -278,11 +278,11 @@
Default=yes Cancel=yes Text=$(loc.WixUIOK)
Publish Event=EndDialog Value=Return1/Publish
/Control
-   Control Id=iis6Text Type=Text X=48 Y=15 Width=194 
Height=30 TabSkip=no Text=$(loc.FastCGINotInstalledIIS6)
-  Condition Action=showVersionNT = 502/Condition
+   Control Id=iis6Text Type=Text X=48 Y=15 Width=194 
Height=30 TabSkip=no Hidden=yes Text=$(loc.FastCGINotInstalledIIS6)
+  Condition Action=show![CDATA[VersionNT  600]]/Condition
/Control
-   Control Id=iis7Text Type=Text X=48 Y=15 Width=194 
Height=30 TabSkip=no Text=$(loc.FastCGINotInstalledIIS7)
-  Condition Action=showVersionNT = 600/Condition
+   Control Id=iis7Text Type=Text X=48 Y=15 Width=194 
Height=30 TabSkip=no Hidden=yes Text=$(loc.FastCGINotInstalledIIS7)
+  Condition Action=show![CDATA[VersionNT = 600]]/Condition
/Control
   /Dialog
 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerCommonNTS.wxs?r1=1.3r2=1.4diff_format=u
Index: win-installer/PHPInstallerCommonNTS.wxs
diff -u win-installer/PHPInstallerCommonNTS.wxs:1.3 
win-installer/PHPInstallerCommonNTS.wxs:1.4
--- win-installer/PHPInstallerCommonNTS.wxs:1.3 Thu Sep 11 19:14:57 2008
+++ win-installer/PHPInstallerCommonNTS.wxs Mon Nov 10 16:05:03 2008
@@ -228,11 +228,11 @@
Default=yes Cancel=yes Text=$(loc.WixUIOK)
Publish Event=EndDialog Value=Return1/Publish
/Control
-   Control Id=iis6Text Type=Text X=48 Y=15 Width=194 
Height=30 TabSkip=no Text=$(loc.FastCGINotInstalledIIS6)
-  Condition Action=showVersionNT = 502/Condition
+   Control Id=iis6Text Type=Text X=48 Y=15 Width=194 
Height=30 TabSkip=no Hidden=yes Text=$(loc.FastCGINotInstalledIIS6)
+  Condition Action=show![CDATA[VersionNT  600]]/Condition
/Control
-   Control Id=iis7Text Type=Text X=48 Y=15 Width=194 
Height=30 TabSkip=no Text=$(loc.FastCGINotInstalledIIS7)
-  Condition Action=showVersionNT = 600/Condition
+   Control Id=iis7Text Type=Text X=48 Y=15 Width=194 
Height=30 TabSkip=no Hidden=yes Text=$(loc.FastCGINotInstalledIIS7)
+  Condition Action=show![CDATA[VersionNT = 600]]/Condition
/Control
   /Dialog
 



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

[PHP-CVS] cvs: win-installer / WixUI_en-us.wxl

2008-11-10 Thread John Mertic

jmertic Mon Nov 10 16:46:25 2008 UTC

  Modified files:  
/win-installer  WixUI_en-us.wxl 
  Log:
  Update error message strings when IIS FastCGI is not installed, but chosen in 
the installer.
  
http://cvs.php.net/viewvc.cgi/win-installer/WixUI_en-us.wxl?r1=1.28r2=1.29diff_format=u
Index: win-installer/WixUI_en-us.wxl
diff -u win-installer/WixUI_en-us.wxl:1.28 win-installer/WixUI_en-us.wxl:1.29
--- win-installer/WixUI_en-us.wxl:1.28  Thu Oct 30 18:16:26 2008
+++ win-installer/WixUI_en-us.wxl   Mon Nov 10 16:46:24 2008
@@ -81,8 +81,8 @@
   String Id=FatalErrorDescription1[ProductName] Setup Wizard ended 
prematurely because of an error. Your system has not been modified. To install 
this program at a later time, run Setup Wizard again./String
   String Id=FatalErrorDescription2Click the Finish button to exit the 
Setup Wizard./String
   
-  String Id=FastCGINotInstalledIIS6FastCGI is not installed in the current 
version of IIS. You can download it at 
www.iis.net/1521/ItemPermalink.ashx/String
-  String Id=FastCGINotInstalledIIS7FastCGI is not installed in the current 
version of IIS. To enable FastCGI support on IIS7.0, go to Server Manager - 
Roles - Add Role Services./String
+  String Id=FastCGINotInstalledIIS6FastCGI is not installed on the current 
version of IIS. You can download it at 
http://www.iis.net/1521/ItemPermalink.ashx/String
+  String Id=FastCGINotInstalledIIS7FastCGI is not installed on the current 
version of IIS. To enable FastCGI support go to Server Manager - Roles - Add 
Role Services - CGI./String
 
   String Id=FilesInUse_Title[ProductName] Setup/String
   String Id=FilesInUseExitEamp;xit/String



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

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

2008-11-10 Thread John Mertic

jmertic Mon Nov 10 19:13:10 2008 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
  Log:
  Set the Win64 attribute when doing RegistrySearches.
  http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.29r2=1.30diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.29 
win-installer/PHPInstallerBase52.wxs:1.30
--- win-installer/PHPInstallerBase52.wxs:1.29   Mon Nov 10 16:44:10 2008
+++ win-installer/PHPInstallerBase52.wxsMon Nov 10 19:13:10 2008
@@ -58,7 +58,8 @@
 Root=HKLM 
 Key=Software\iMatrix\Installed Components\Xitami 
 Type=raw 
-Name=Directory/
+Name=Directory
+Win64=yes/
 /Property
 
 Property Id=SAMBARDIR
@@ -66,7 +67,8 @@
 Root=HKLM 
 Key=SOFTWARE\Sambar Technologies\Sambar Server 
 Type=directory 
-Name=Installation Dir
+Name=Installation Dir
+Win64=yes
 DirectorySearch Id=sambarConfigDir 
   Path=config/
   /RegistrySearch
@@ -78,7 +80,8 @@
 Root=HKLM 
 
Key=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}
 
 Type=raw
-Name=Version/
+Name=Version
+Win64=yes/
/Property
Property Id=FASTCGI70MODULEINSTALLED
  RegistrySearch 
@@ -105,7 +108,8 @@
 Root=HKLM 
 Key=Software\PHP 
 Type=raw 
-Name=ApacheDir/
+Name=ApacheDir
+Win64=yes/
 /Property
 
 CustomAction Id='AssignAPACHEDIR' Property='APACHEDIR' 
Value='[%ProgramFiles]' /
@@ -120,7 +124,8 @@
 Root=HKLM 
 Key=Software\PHP 
 Type=raw 
-Name=WebServerType/
+Name=WebServerType
+Win64=yes/
 /Property
 
 Directory Id=TARGETDIR Name=SourceDir
@@ -548,14 +553,20 @@
 CustomAction Id=netserveCGIInterpretersadd 
   ExeCommand=quot;[%ProgramFiles]NetServe Web Server\config.exe /add 
CGIInterpreters php^|[INSTALLDIR]php-cgi.exe'] 
   Return=ignore 
+  Execute=deferred
+ Impersonate=no
   Directory=INSTALLDIR/
 CustomAction Id=netserveCustomCGIVariablesadd 
   ExeCommand=quot;[%ProgramFiles]NetServe Web Server\config.exe /add 
CustomCGIVariables REDIRECT_STATUS^|200'] 
   Return=ignore 
+  Execute=deferred
+ Impersonate=no
   Directory=INSTALLDIR/
 CustomAction Id=netserveCGIInterpretersremove 
   ExeCommand=quot;[%ProgramFiles]NetServe Web Server\config.exe /del 
CGIInterpreters php^|[INSTALLDIR]php-cgi.exe'] 
   Return=ignore 
+  Execute=deferred
+ Impersonate=no
   Directory=INSTALLDIR/
 CustomAction Id=iis700FastCGIadd 
   ExeCommand=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET 
CONFIG -section:system.webServer/fastCGI 
/+quot;[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]quot; 
@@ -566,6 +577,8 @@
 CustomAction Id=iis700CGI 
   ExeCommand=quot;[WindowsFolder]System32\inetsrv\APPCMD.EXEquot; SET 
CONFIG -section:handlers 
quot;-+[name='PHP-CGI',path='*.php',verb='GET,HEAD,POST',modules='CgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe'quot;
 
   Return=ignore 
+  Execute=deferred
+ Impersonate=no
   Directory=INSTALLDIR/
 CustomAction Id=iis700FastCGI 
   ExeCommand=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET 
CONFIG /section:system.webServer/handlers 
/+quot;[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]quot;
 
@@ -576,18 +589,26 @@
 CustomAction Id=iis700ISAPI 
   ExeCommand=quot;[WindowsFolder]System32\inetsrv\APPCMD.EXEquot; SET 
CONFIG -section:handlers 
quot;-+[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'quot;
 
   Return=ignore 
+  Execute=deferred
+ Impersonate=no
   Directory=INSTALLDIR/
 CustomAction Id=iis700RCGI 
   ExeCommand=quot;[WindowsFolder]System32\inetsrv\APPCMD.EXEquot; SET 
CONFIG -section:isapiCgiRestriction 
quot;-+[path='[INSTALLDIR]php-cgi.exe',allowed='true',groupId='PHP',description='PHP']quot;
 
   Return=ignore 
+  Execute=deferred
+ Impersonate=no
   Directory=INSTALLDIR/
 CustomAction Id=iis700RISAPI 
   ExeCommand=quot;[WindowsFolder]System32\inetsrv\APPCMD.EXEquot; SET 
CONFIG -section:isapiCgiRestriction 
quot;-+[path='[INSTALLDIR]php5isapi.dll',allowed='true',groupId='PHP',description='PHP']quot;
 
   Return=ignore 
+  Execute=deferred
+ Impersonate=no
   Directory=INSTALLDIR/
 CustomAction Id=iis700CGIremove 
   ExeCommand=quot;[WindowsFolder]System32\inetsrv\APPCMD.EXEquot; SET

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

2008-11-10 Thread John Mertic

jmertic Mon Nov 10 16:44:10 2008 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
  Log:
  Fixed problems with detecting IIS FastCGI being available on Windows 2003 
Server and Windows Server 2008 x64.
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.28r2=1.29diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.28 
win-installer/PHPInstallerBase52.wxs:1.29
--- win-installer/PHPInstallerBase52.wxs:1.28   Mon Oct 20 15:01:28 2008
+++ win-installer/PHPInstallerBase52.wxsMon Nov 10 16:44:10 2008
@@ -76,9 +76,9 @@
  RegistrySearch 
 Id=fastcgi60Registry 
 Root=HKLM 
-Key=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall 
+
Key=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}
 
 Type=raw
-Name={E136BB09-1BB2-49A0-9FF3-5C25564D3819}/
+Name=Version/
/Property
Property Id=FASTCGI70MODULEINSTALLED
  RegistrySearch 
@@ -86,7 +86,8 @@
 Root=HKLM 
 Key=SOFTWARE\Microsoft\InetStp\Components 
 Type=raw
-Name=FastCgi/
+Name=FastCgi
+Win64=yes/
/Property
CustomAction Id='CheckFASTCGIINSTALLED' Property='FASTCGIINSTALLED' 
Value='1' /
CustomAction Id='CheckFASTCGINOTINSTALLED' Property='FASTCGIINSTALLED' 
Value='0' /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.5r2=1.6diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.5 
win-installer/PHPInstallerBase52NTS.wxs:1.6
--- win-installer/PHPInstallerBase52NTS.wxs:1.5 Fri Sep 12 16:03:32 2008
+++ win-installer/PHPInstallerBase52NTS.wxs Mon Nov 10 16:44:10 2008
@@ -56,9 +56,9 @@
  RegistrySearch 
 Id=fastcgi60Registry 
 Root=HKLM 
-Key=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall 
+
Key=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}
 
 Type=raw
-Name={E136BB09-1BB2-49A0-9FF3-5C25564D3819}/
+Name=Version/
/Property
Property Id=FASTCGI70MODULEINSTALLED
  RegistrySearch 
@@ -66,7 +66,8 @@
 Root=HKLM 
 Key=SOFTWARE\Microsoft\InetStp\Components 
 Type=raw
-Name=FastCgi/
+Name=FastCgi
+Win64=yes/
/Property
CustomAction Id='CheckFASTCGIINSTALLED' Property='FASTCGIINSTALLED' 
Value='1' /
CustomAction Id='CheckFASTCGINOTINSTALLED' Property='FASTCGIINSTALLED' 
Value='0' /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.4r2=1.5diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.4 
win-installer/PHPInstallerBase53.wxs:1.5
--- win-installer/PHPInstallerBase53.wxs:1.4Mon Oct 13 09:57:01 2008
+++ win-installer/PHPInstallerBase53.wxsMon Nov 10 16:44:10 2008
@@ -76,9 +76,9 @@
  RegistrySearch 
 Id=fastcgi60Registry 
 Root=HKLM 
-Key=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall 
+
Key=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}
 
 Type=raw
-Name={E136BB09-1BB2-49A0-9FF3-5C25564D3819}/
+Name=Version/
/Property
Property Id=FASTCGI70MODULEINSTALLED
  RegistrySearch 
@@ -86,7 +86,8 @@
 Root=HKLM 
 Key=SOFTWARE\Microsoft\InetStp\Components 
 Type=raw
-Name=FastCgi/
+Name=FastCgi
+Win64=yes/
/Property
CustomAction Id='CheckFASTCGIINSTALLED' Property='FASTCGIINSTALLED' 
Value='1' /
CustomAction Id='CheckFASTCGINOTINSTALLED' Property='FASTCGIINSTALLED' 
Value='0' /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.4r2=1.5diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.4 
win-installer/PHPInstallerBase53NTS.wxs:1.5
--- win-installer/PHPInstallerBase53NTS.wxs:1.4 Fri Sep 12 16:03:32 2008
+++ win-installer/PHPInstallerBase53NTS.wxs Mon Nov 10 16:44:10 2008
@@ -56,9 +56,9 @@
  RegistrySearch 
 Id=fastcgi60Registry 
 Root=HKLM 
-Key=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall 
+
Key=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}
 
 Type=raw
-Name={E136BB09-1BB2-49A0-9FF3-5C25564D3819}/
+Name=Version/
/Property
Property Id=FASTCGI70MODULEINSTALLED
  RegistrySearch 
@@ -66,7 +66,8 @@
 Root=HKLM 
 Key=SOFTWARE\Microsoft\InetStp\Components 
 Type=raw
-

[PHP-CVS] cvs: win-installer / WixUI_en-us.wxl

2008-10-30 Thread John Mertic

jmertic Thu Oct 30 18:16:26 2008 UTC

  Modified files:  
/win-installer  WixUI_en-us.wxl 
  Log:
  Updated message for PDO OCI driver.
  
http://cvs.php.net/viewvc.cgi/win-installer/WixUI_en-us.wxl?r1=1.27r2=1.28diff_format=u
Index: win-installer/WixUI_en-us.wxl
diff -u win-installer/WixUI_en-us.wxl:1.27 win-installer/WixUI_en-us.wxl:1.28
--- win-installer/WixUI_en-us.wxl:1.27  Wed Sep 10 20:32:05 2008
+++ win-installer/WixUI_en-us.wxl   Thu Oct 30 18:16:26 2008
@@ -758,9 +758,9 @@
   String Id=Featureext_php_pdo_mysqlTitleMySQL/String
   String Id=Featureext_php_pdo_mysqlDescriptionPDO Driver for 
MySQL/String
   String Id=Featureext_php_pdo_ociTitleOracle10g Client and above/String
-  String Id=Featureext_php_pdo_ociDescriptionPDO Driver for Oracle10g 
Client and above NOTE: CHOOSE EITHER THIS EXTENSION OR THE PDO DRIVER FOR 
ORACLE8I/ORACLE9I CLIENT, BUT NOT BOTH/String
+  String Id=Featureext_php_pdo_ociDescriptionPDO Driver for Oracle 10g 
Client and above - Requires Oracle 10g or greater libraries to be 
installed/String
   String Id=Featureext_php_pdo_oci8TitleOracle8i/Oracle9i Client/String
-  String Id=Featureext_php_pdo_oci8DescriptionPDO Driver for 
Oracle8i/Oracle9i Client NOTE: CHOOSE EITHER THIS EXTENSION OR THE PDO DRIVER 
FOR ORACLE10G CLIENT, BUT NOT BOTH/String
+  String Id=Featureext_php_pdo_oci8DescriptionPDO Driver for Oracle 
8i/Oracle 9i Client/String
   String Id=Featureext_php_pdo_odbcTitleODBC v3 (IBM DB2, unixODBC and 
win32 ODBC)/String
   String Id=Featureext_php_pdo_odbcDescriptionPDO Driver for ODBC v3 (IBM 
DB2, unixODBC and win32 ODBC)/String
   String Id=Featureext_php_pdo_pgsqlTitlePostgreSQL/String



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

[PHP-CVS] cvs: win-installer / build.bat

2008-10-08 Thread John Mertic

jmertic Wed Oct  8 14:46:15 2008 UTC

  Modified files:  
/win-installer  build.bat 
  Log:
  Updated pattern used for msi filename.
  
http://cvs.php.net/viewvc.cgi/win-installer/build.bat?r1=1.13r2=1.14diff_format=u
Index: win-installer/build.bat
diff -u win-installer/build.bat:1.13 win-installer/build.bat:1.14
--- win-installer/build.bat:1.13Thu Sep 11 19:16:37 2008
+++ win-installer/build.bat Wed Oct  8 14:46:15 2008
@@ -9,27 +9,39 @@
 
 set suffix=
 set extrants=
-set extrabuildtype=
+set extrasnaps=
+set buildtype=VC6-x86
 set includevc9msm=
 
 if (%2)==() goto build
 if %2==nts set extrants=nts-
 if %2==nts set suffix=NTS
-if %2==vc9 set extrabuildtype=vc9-
+if %2==vc9 set buildtype=VC9-x86
 if %2==vc9 set includevc9msm=x86
-if %2==x64 set extrabuildtype=vc9-x64-
+if %2==x64 set buildtype=VC9-x64
 if %2==x64 set includevc9msm=x86_x64
+if %2==snapshot set extrasnaps=-latest
 
 if (%3)==() goto build
 if %3==nts set extrants=nts-
 if %3==nts set suffix=NTS
-if %3==vc9 set extrabuildtype=vc9-
+if %3==vc9 set buildtype=VC9-x86
 if %3==vc9 set includevc9msm=x86
-if %3==x64 set extrabuildtype=vc9-x64-
+if %3==x64 set buildtype=VC9-x64
 if %3==x64 set includevc9msm=x86_x64
+if %3==snapshot set extrasnaps=-latest
+
+if (%4)==() goto build
+if %4==nts set extrants=nts-
+if %4==nts set suffix=NTS
+if %4==vc9 set buildtype=VC9-x86
+if %4==vc9 set includevc9msm=x86
+if %4==x64 set buildtype=VC9-x64
+if %4==x64 set includevc9msm=x86_x64
+if %4==snapshot set extrasnaps=-latest
 
 :build
-set msiname=php-%1-%extrants%win32-%extrabuildtype%installer.msi
+set msiname=php-%1-%extrants%win32-%buildtype%-installer%extrasnaps%.msi
 
 echo Building ExtensionsComponents.wxs
 Files\php.exe GenExtensionsComponents.wxs.php %phpver%



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

[PHP-CVS] cvs: win-installer / PHPInstallerBase52NTS.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60NTS.wxs PHPInstallerCommonNTS.wxs WebServerConfig52NTS.wxs WebServerConfig53NTS.wxs WebServerConfig

2008-09-11 Thread John Mertic

jmertic Thu Sep 11 19:14:57 2008 UTC

  Modified files:  
/win-installer  PHPInstallerBase52NTS.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60NTS.wxs PHPInstallerCommonNTS.wxs 
WebServerConfig52NTS.wxs WebServerConfig53NTS.wxs 
WebServerConfig60NTS.wxs 
  Log:
  Added option to install just the CGI binary for the NTS builds ( no auto 
config )
  http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.3r2=1.4diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.3 
win-installer/PHPInstallerBase52NTS.wxs:1.4
--- win-installer/PHPInstallerBase52NTS.wxs:1.3 Wed Sep 10 20:32:05 2008
+++ win-installer/PHPInstallerBase52NTS.wxs Thu Sep 11 19:14:57 2008
@@ -396,6 +396,14 @@
   ComponentRef Id=cgiforceredirect/
   ComponentRef Id=iis4FastCGIregistry/
 /Feature
+   Feature AllowAdvertise=no 
+  Id=cgi 
+  Title=$(loc.FeaturecgiTitle) 
+  Description=$(loc.FeaturecgiDescription) 
+  Level=1
+  ComponentRef Id=phpcgiEXE/
+  ComponentRef Id=cgiregistry/
+/Feature
 Feature AllowAdvertise=no 
   Id=noconfig 
   Title=$(loc.FeaturecgiTitle) 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.2r2=1.3diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.2 
win-installer/PHPInstallerBase53NTS.wxs:1.3
--- win-installer/PHPInstallerBase53NTS.wxs:1.2 Wed Sep 10 20:32:05 2008
+++ win-installer/PHPInstallerBase53NTS.wxs Thu Sep 11 19:14:57 2008
@@ -374,6 +374,14 @@
   ComponentRef Id=cgiforceredirect/
   ComponentRef Id=iis4FastCGIregistry/
 /Feature
+   Feature AllowAdvertise=no 
+  Id=cgi 
+  Title=$(loc.FeaturecgiTitle) 
+  Description=$(loc.FeaturecgiDescription) 
+  Level=1
+  ComponentRef Id=phpcgiEXE/
+  ComponentRef Id=cgiregistry/
+/Feature
 Feature AllowAdvertise=no 
   Id=noconfig 
   Title=$(loc.FeaturecgiTitle) 
@@ -404,14 +412,17 @@
 CustomAction Id=iis700FastCGIadd 
   ExeCommand=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET 
CONFIG /section:system.webServer/fastCGI 
/+[fullPath='[INSTALLDIR]php-cgi.exe'] 
   Return=ignore 
+ Execute=deferred
   Directory=INSTALLDIR/
 CustomAction Id=iis700FastCGI 
   ExeCommand=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET 
CONFIG /section:system.webServer/handlers 
/+[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either']
  
   Return=ignore 
+ Execute=deferred
   Directory=INSTALLDIR/
 CustomAction Id=iis700FastCGIremove 
   ExeCommand=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET 
CONFIG /section:system.webServer/handlers 
/-[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either']
  
   Return=ignore 
+ Execute=deferred
   Directory=INSTALLDIR/
 CustomAction Id=fcgiconfigJSFastCGI 
   ExeCommand=cscript 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -add 
-section:quot;PHPquot; -extension:php 
-path:quot;[INSTALLDIR]php-cgi.exequot;
@@ -431,13 +442,13 @@
   VBScriptCall=unconfigIIS4 /
   
 InstallExecuteSequence
-  Custom Action=iis700FastCGIadd After=InstallFinalize
+  Custom Action=iis700FastCGIadd After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
-  Custom Action=iis700FastCGI After=InstallFinalize
+  Custom Action=iis700FastCGI After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 3]]
   /Custom
-  Custom Action=iis700FastCGIremove After=InstallFinalize
+  Custom Action=iis700FastCGIremove After=InstallInitialize
 ![CDATA[VersionNT = 600 AND iis4FastCGI = 2]]
   /Custom
   Custom Action=fcgiconfigJSFastCGI After=InstallFinalize
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.3r2=1.4diff_format=u
Index: win-installer/PHPInstallerBase60NTS.wxs
diff -u win-installer/PHPInstallerBase60NTS.wxs:1.3 
win-installer/PHPInstallerBase60NTS.wxs:1.4
--- win-installer/PHPInstallerBase60NTS.wxs:1.3 Wed Sep 10 20:33:14 2008
+++ win-installer/PHPInstallerBase60NTS.wxs Thu Sep 11 19:14:57 2008
@@ -374,6 +374,14 @@
   ComponentRef Id=cgiforceredirect/
   ComponentRef Id=iis4FastCGIregistry/
 /Feature
+   Feature AllowAdvertise=no 
+  Id=cgi 
+  Title=$(loc.FeaturecgiTitle) 
+  Description=$(loc.FeaturecgiDescription) 
+  Level=1
+  ComponentRef Id=phpcgiEXE/
+  ComponentRef Id=cgiregistry/
+/Feature

[PHP-CVS] cvs: win-installer / GenPHPInstaller.wxs.php build.bat

2008-09-11 Thread John Mertic

jmertic Thu Sep 11 19:16:37 2008 UTC

  Modified files:  
/win-installer  GenPHPInstaller.wxs.php build.bat 
  Log:
  Enable installer for VC9 x64 PHP builds.
  
http://cvs.php.net/viewvc.cgi/win-installer/GenPHPInstaller.wxs.php?r1=1.6r2=1.7diff_format=u
Index: win-installer/GenPHPInstaller.wxs.php
diff -u win-installer/GenPHPInstaller.wxs.php:1.6 
win-installer/GenPHPInstaller.wxs.php:1.7
--- win-installer/GenPHPInstaller.wxs.php:1.6   Thu Sep 11 18:54:56 2008
+++ win-installer/GenPHPInstaller.wxs.php   Thu Sep 11 19:16:37 2008
@@ -22,7 +22,7 @@
$Merge = $PHPInstallerBaseWXS-createElement('Merge');
$Merge = $TargetDir-appendChild($Merge);
$Merge-setAttribute('Id','VCRedist');
-   $Merge-setAttribute('SourceFile','Microsoft_VC90_CRT_x86.msm');
+   
$Merge-setAttribute('SourceFile',Microsoft_VC90_CRT_{$includemsm}.msm);
$Merge-setAttribute('DiskId','1');
$Merge-setAttribute('Language','0');

http://cvs.php.net/viewvc.cgi/win-installer/build.bat?r1=1.12r2=1.13diff_format=u
Index: win-installer/build.bat
diff -u win-installer/build.bat:1.12 win-installer/build.bat:1.13
--- win-installer/build.bat:1.12Thu Sep 11 18:54:56 2008
+++ win-installer/build.bat Thu Sep 11 19:16:37 2008
@@ -17,12 +17,16 @@
 if %2==nts set suffix=NTS
 if %2==vc9 set extrabuildtype=vc9-
 if %2==vc9 set includevc9msm=x86
+if %2==x64 set extrabuildtype=vc9-x64-
+if %2==x64 set includevc9msm=x86_x64
 
 if (%3)==() goto build
 if %3==nts set extrants=nts-
 if %3==nts set suffix=NTS
 if %3==vc9 set extrabuildtype=vc9-
 if %3==vc9 set includevc9msm=x86
+if %3==x64 set extrabuildtype=vc9-x64-
+if %3==x64 set includevc9msm=x86_x64
 
 :build
 set msiname=php-%1-%extrants%win32-%extrabuildtype%installer.msi



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

[PHP-CVS] cvs: win-installer / ExtensionsFeatures53.wxs

2008-09-10 Thread John Mertic

jmertic Wed Sep 10 20:32:40 2008 UTC

  Modified files:  
/win-installer  ExtensionsFeatures53.wxs 
  Log:
  Enable php_oci8 extension, since it's still being built.
  
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures53.wxs?r1=1.7r2=1.8diff_format=u
Index: win-installer/ExtensionsFeatures53.wxs
diff -u win-installer/ExtensionsFeatures53.wxs:1.7 
win-installer/ExtensionsFeatures53.wxs:1.8
--- win-installer/ExtensionsFeatures53.wxs:1.7  Fri Aug 22 18:50:01 2008
+++ win-installer/ExtensionsFeatures53.wxs  Wed Sep 10 20:32:40 2008
@@ -255,6 +255,9 @@
Feature AllowAdvertise=no Id=ext_php_oci 
Title=$(loc.Featureext_php_ociTitle) 
Description=$(loc.Featureext_php_ociDescription) Level=10
ComponentRef Id=php_oci/
/Feature
+   Feature AllowAdvertise=no Id=ext_php_oci8 
Title=$(loc.Featureext_php_oci8Title) 
Description=$(loc.Featureext_php_oci8Description) Level=10
+   ComponentRef Id=php_oci8/
+   /Feature
Feature AllowAdvertise=no Id=ext_php_oci8_11g 
Title=$(loc.Featureext_php_oci8_11gTitle) 
Description=$(loc.Featureext_php_oci8_11gDescription) Level=10
ComponentRef Id=php_oci8_11g/
/Feature



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

[PHP-CVS] cvs: win-installer / ExtensionsFeatures60.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

2008-09-10 Thread John Mertic

jmertic Wed Sep 10 20:33:14 2008 UTC

  Modified files:  
/win-installer  ExtensionsFeatures60.wxs PHPInstallerBase60.wxs 
PHPInstallerBase60NTS.wxs 
  Log:
  Sync build changes in 5.3 to 6.0
  http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures60.wxs?r1=1.1r2=1.2diff_format=u
Index: win-installer/ExtensionsFeatures60.wxs
diff -u win-installer/ExtensionsFeatures60.wxs:1.1 
win-installer/ExtensionsFeatures60.wxs:1.2
--- win-installer/ExtensionsFeatures60.wxs:1.1  Mon Aug  4 15:01:41 2008
+++ win-installer/ExtensionsFeatures60.wxs  Wed Sep 10 20:33:14 2008
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=windows-1252?
 Wix xmlns=http://schemas.microsoft.com/wix/2003/01/wi;
Fragment Id=FragmentExtensionsFeatures
-   Feature AllowAdvertise=no Id=Extensions 
Title=$(loc.FeatureExtensionsTitle) 
Description=$(loc.FeatureExtensionsDescription) Level=10
+   Feature AllowAdvertise=no Id=Extensions 
Title=$(loc.FeatureExtensionsTitle) 
Description=$(loc.FeatureExtensionsDescription) TypicalDefault=install 
Level=1
ComponentRef Id=extdir/
Feature AllowAdvertise=no Id=pecl_php5activescript 
Title=$(loc.Featurepecl_phpactivescriptTitle) 
Description=$(loc.Featurepecl_phpactivescriptDescription) Level=10
ComponentRef Id=php5activescript/
@@ -30,7 +30,7 @@
Feature AllowAdvertise=no Id=ext_php_blenc 
Title=$(loc.Featureext_php_blencTitle) 
Description=$(loc.Featureext_php_blencDescription) Level=10
ComponentRef Id=php_blenc/
/Feature
-   Feature AllowAdvertise=no Id=ext_php_bz2 
Title=$(loc.Featureext_php_bz2Title) 
Description=$(loc.Featureext_php_bz2Description) Level=10
+   Feature AllowAdvertise=no Id=ext_php_bz2 
Title=$(loc.Featureext_php_bz2Title) 
Description=$(loc.Featureext_php_bz2Description) TypicalDefault=install 
Level=1
ComponentRef Id=php_bz2/
/Feature
Feature AllowAdvertise=no Id=ext_php_bz2_filter 
Title=$(loc.Featureext_php_bz2_filterTitle) 
Description=$(loc.Featureext_php_bz2_filterDescription) Level=10
@@ -48,7 +48,7 @@
Feature AllowAdvertise=no Id=ext_php_cvsclient 
Title=$(loc.Featureext_php_cvsclientTitle) 
Description=$(loc.Featureext_php_cvsclientDescription) Level=10
ComponentRef Id=php_cvsclient/
/Feature
-   Feature AllowAdvertise=no Id=ext_php_curl 
Title=$(loc.Featureext_php_curlTitle) 
Description=$(loc.Featureext_php_curlDescription) Level=10
+   Feature AllowAdvertise=no Id=ext_php_curl 
Title=$(loc.Featureext_php_curlTitle) 
Description=$(loc.Featureext_php_curlDescription) TypicalDefault=install 
Level=1
ComponentRef Id=php_curl/
ComponentRef Id=libeay32DLL/
ComponentRef Id=ssleay32DLL/
@@ -80,7 +80,7 @@
Feature AllowAdvertise=no Id=ext_php_event 
Title=$(loc.Featureext_php_eventTitle) 
Description=$(loc.Featureext_php_eventDescription) Level=10
ComponentRef Id=php_event/
/Feature
-   Feature AllowAdvertise=no Id=ext_php_exif 
Title=$(loc.Featureext_php_exifTitle) 
Description=$(loc.Featureext_php_exifDescription) Level=10
+   Feature AllowAdvertise=no Id=ext_php_exif 
Title=$(loc.Featureext_php_exifTitle) 
Description=$(loc.Featureext_php_exifDescription) TypicalDefault=install 
Level=1
ComponentRef Id=php_mbstring/
ComponentRef Id=php_exif/
/Feature
@@ -89,6 +89,9 @@
ComponentRef Id=fdftkDLL/
ComponentRef Id=PDFSupport/
/Feature
+   Feature AllowAdvertise=no Id=ext_php_ffi 
Title=$(loc.Featureext_php_ffiTitle) 
Description=$(loc.Featureext_php_ffiDescription) Level=10
+   ComponentRef Id=php_ffi/
+   /Feature
Feature AllowAdvertise=no Id=ext_php_fileinfo 
Title=$(loc.Featureext_php_fileinfoTitle) 
Description=$(loc.Featureext_php_fileinfoDescription) Level=10
ComponentRef Id=php_fileinfo/
/Feature
@@ -99,13 +102,13 @@
ComponentRef Id=php_fribidi/
ComponentRef Id=fribidiDLL/
/Feature
-   Feature AllowAdvertise=no Id=ext_php_gd2 
Title=$(loc.Featureext_php_gd2Title) 
Description=$(loc.Featureext_php_gd2Description) Level=10
+   Feature

[PHP-CVS] cvs: win-installer / ExtensionsFragment60.wxs WebServerConfig60.wxs

2008-09-10 Thread John Mertic

jmertic Wed Sep 10 20:37:27 2008 UTC

  Modified files:  
/win-installer  ExtensionsFragment60.wxs WebServerConfig60.wxs 
  Log:
  Sync build changes in 5.3 to 6.0
  http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFragment60.wxs?r1=1.1r2=1.2diff_format=u
Index: win-installer/ExtensionsFragment60.wxs
diff -u win-installer/ExtensionsFragment60.wxs:1.1 
win-installer/ExtensionsFragment60.wxs:1.2
--- win-installer/ExtensionsFragment60.wxs:1.1  Fri Aug 22 18:51:40 2008
+++ win-installer/ExtensionsFragment60.wxs  Wed Sep 10 20:37:27 2008
@@ -14,9 +14,6 @@
Component Id=libmcryptDLL DiskId=1 
Guid=34402BFF-5D45-4A07-89EF-C71F4DF3D9BF
File Id=filelibmcryptDLL Name=LIBMCR_1.DLL 
LongName=libmcrypt.dll Source=Files\libmcrypt.dll /
/Component
-   Component Id=libmhashDLL DiskId=1 
Guid=D19BD1F8-8041-4D0A-809C-57BB69619683
-   File Id=filelibmhashDLL Name=libmhash.dll 
Source=Files\libmhash.dll /
-   /Component
Component Id=libmysqlDLL DiskId=1 
Guid=4726DE50-BC55-46AC-9622-DEA04AE46E46
File Id=filelibmysqlDLL Name=libmysql.dll 
Source=Files\libmysql.dll /
/Component
@@ -41,6 +38,27 @@
Component Id=fribidiDLL DiskId=1 
Guid=D08A7C40-924B-45B2-8053-C6A5117846B2
File Id=filefribidiDLL Name=fribidi.dll 
Source=Files\fribidi.dll /
/Component
+   Component Id=icudt36DLL DiskId=1 
Guid=6370818E-7072-11DD-A88E-285D55D89593
+   File Id=fileicudt36DLL Name=icudt36.dll 
Source=Files\icudt36.dll /
+   /Component
+   Component Id=icuin36DLL DiskId=1 
Guid=6A57F7AC-7072-11DD-86B2-645D55D89593
+   File Id=fileicuin36DLL Name=icuin36.dll 
Source=Files\icuin36.dll /
+   /Component
+   Component Id=icuio36DLL DiskId=1 
Guid=705AA974-7072-11DD-AC26-CE5D55D89593
+   File Id=fileicuio36DLL Name=icuio36.dll 
Source=Files\icuio36.dll /
+   /Component
+   Component Id=icule36DLL DiskId=1 
Guid=7729BDA8-7072-11DD-ADF2-165E55D89593
+   File Id=fileicule36DLL Name=icule36.dll 
Source=Files\icule36.dll /
+   /Component
+   Component Id=iculx36DLL DiskId=1 
Guid=7E7C2D16-7072-11DD-B66F-5F5E55D89593
+   File Id=fileiculx36DLL Name=iculx36.dll 
Source=Files\iculx36.dll /
+   /Component
+   Component Id=icutu36DLL DiskId=1 
Guid=83707DAE-7072-11DD-8A63-B75E55D89593
+   File Id=fileicutu36DLL Name=icutu36.dll 
Source=Files\icutu36.dll /
+   /Component
+   Component Id=icuuc36DLL DiskId=1 
Guid=93D0C0BE-7072-11DD-B624-6F5F55D89593
+   File Id=fileicuuc36DLL Name=icuuc36.dll 
Source=Files\icuuc36.dll /
+   /Component
Directory Id=extdirectory Name=ext
Component Id=extdir DiskId=1 
Guid=3AB11270-4135-4C8C-9578-B034CEF2659F
IniFile Id=extdirINI 
Action=addLine 
@@ -49,127 +67,7 @@
/Component
/Directory
 Directory Id=extrasdirectory Name=extras
-   Component Id=magicMIME DiskId=1 
Guid=C29559A6-DE77-4951-A8F8-6266B790DE20
-   File Id=filemagicMIME 
Name=MAGIC_1.MIM LongName=magic.mime Source=Files\extras\magic.mime /
-   /Component
-   Directory Id=openssldirectory Name=openssl
-   Component Id=opensslCNF DiskId=1 
Guid=0460291A-A0BA-4662-946E-3832BAB70881
-   File Id=fileopensslCNF 
Name=openssl.cnf Source=Files\extras\openssl\openssl.cnf /
-   /Component
-   Component Id=READMESSLTXT DiskId=1 
Guid=2E97C140-AFDA-4235-BF37-5F9FD6C52F57
-   File Id=fileREADMESSLTXT 
Name=README_1.TXT LongName=README-SSL.txt 
Source=Files\extras\openssl\README-SSL.txt /
-   /Component
-   /Directory
-   Directory Id=pdfrelateddirectory 
Name=PDF-RE_1 LongName=pdf-related
-   Component Id=PDFSupport DiskId=1 
Guid=47C794BB-250C-4235-89A8-B192C994B98B
-   File Id=filePDFSupport1 
Name=COPYRI_1.TXT LongName=copyright.txt

[PHP-CVS] cvs: win-installer / PHPInstallerCommon.wxs

2008-09-10 Thread John Mertic

jmertic Wed Sep 10 20:49:17 2008 UTC

  Modified files:  
/win-installer  PHPInstallerCommon.wxs 
  Log:
  Fix Typo
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerCommon.wxs?r1=1.10r2=1.11diff_format=u
Index: win-installer/PHPInstallerCommon.wxs
diff -u win-installer/PHPInstallerCommon.wxs:1.10 
win-installer/PHPInstallerCommon.wxs:1.11
--- win-installer/PHPInstallerCommon.wxs:1.10   Wed Sep 10 20:32:05 2008
+++ win-installer/PHPInstallerCommon.wxsWed Sep 10 20:49:17 2008
@@ -605,7 +605,7 @@
 Control Id=Buttons Type=RadioButtonGroup
 X=20 Y=50 Width=330 Height=180 Property=WEBSERVERPICKER 
/
 Control Id=Next Type=PushButton X=236 Y=243 Width=56 
Height=17 Default=yes Text=$(loc.WixUINext)
-  Publish Evenst=AddLocal Value=apache13![CDATA[WEBSERVERPICKER 
= apache13]]/Publish
+  Publish Event=AddLocal Value=apache13![CDATA[WEBSERVERPICKER 
= apache13]]/Publish
   Publish Event=AddLocal Value=apache20![CDATA[WEBSERVERPICKER 
= apache20]]/Publish
   Publish Event=AddLocal Value=apache22![CDATA[WEBSERVERPICKER 
= apache22]]/Publish
   Publish Event=AddLocal Value=apacheCGI![CDATA[WEBSERVERPICKER 
= apacheCGI]]/Publish



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

[PHP-CVS] cvs: win-installer / ExtensionsFeatures53.wxs WixUI_en-us.wxl

2008-08-22 Thread John Mertic

jmertic Fri Aug 22 18:50:02 2008 UTC

  Modified files:  
/win-installer  ExtensionsFeatures53.wxs WixUI_en-us.wxl 
  Log:
  Adding php_intl extension, and removed some file references that don't exist 
anymore.
  
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures53.wxs?r1=1.6r2=1.7diff_format=u
Index: win-installer/ExtensionsFeatures53.wxs
diff -u win-installer/ExtensionsFeatures53.wxs:1.6 
win-installer/ExtensionsFeatures53.wxs:1.7
--- win-installer/ExtensionsFeatures53.wxs:1.6  Mon Aug 11 19:58:24 2008
+++ win-installer/ExtensionsFeatures53.wxs  Fri Aug 22 18:50:01 2008
@@ -157,6 +157,16 @@
ComponentRef Id=php_interbase/
ComponentRef Id=gds32DLL/
/Feature
+   Feature AllowAdvertise=no Id=ext_php_intl 
Title=$(loc.Featureext_php_intlTitle) 
Description=$(loc.Featureext_php_intlDescription) Level=10
+   ComponentRef Id=php_intl/
+   ComponentRef Id=icudt36DLL/
+   ComponentRef Id=icuin36DLL/
+   ComponentRef Id=icuio36DLL/
+   ComponentRef Id=icule36DLL/
+   ComponentRef Id=iculx36DLL/
+   ComponentRef Id=icutu36DLL/
+   ComponentRef Id=icuuc36DLL/
+   /Feature
Feature AllowAdvertise=no Id=ext_php_ixsfunc 
Title=$(loc.Featureext_php_ixsfuncTitle) 
Description=$(loc.Featureext_php_ixsfuncDescription) Level=10
ComponentRef Id=php_ixsfunc/
/Feature
@@ -204,11 +214,9 @@
/Feature
Feature AllowAdvertise=no Id=ext_php_mhash 
Title=$(loc.Featureext_php_mhashTitle) 
Description=$(loc.Featureext_php_mhashDescription) TypicalDefault=install 
Level=1
ComponentRef Id=php_mhash/
-   ComponentRef Id=libmhashDLL/
/Feature
Feature AllowAdvertise=no Id=ext_php_mime_magic 
Title=$(loc.Featureext_php_mime_magicTitle) 
Description=$(loc.Featureext_php_mime_magicDescription) Level=10
ComponentRef Id=php_mime_magic/
-   ComponentRef Id=magicMIME/
/Feature
Feature AllowAdvertise=no Id=ext_php_ming 
Title=$(loc.Featureext_php_mingTitle) 
Description=$(loc.Featureext_php_mingDescription) Level=10
ComponentRef Id=php_ming/
@@ -240,8 +248,6 @@
ComponentRef Id=php_openssl/
ComponentRef Id=ssleay32DLL/
ComponentRef Id=libeay32DLL/
-   ComponentRef Id=opensslCNF/
-   ComponentRef Id=READMESSLTXT/
/Feature
Feature AllowAdvertise=no Id=ext_php_operator 
Title=$(loc.Featureext_php_operatorTitle) 
Description=$(loc.Featureext_php_operatorDescription) Level=10
ComponentRef Id=php_operator/
@@ -348,7 +354,6 @@
/Feature
Feature AllowAdvertise=no Id=ext_php_snmp 
Title=$(loc.Featureext_php_snmpTitle) 
Description=$(loc.Featureext_php_snmpDescription) Level=10
ComponentRef Id=php_snmp/
-   ComponentRef Id=mibsdir /
/Feature
Feature AllowAdvertise=no Id=ext_php_soap 
Title=$(loc.Featureext_php_soapTitle) 
Description=$(loc.Featureext_php_soapDescription) TypicalDefault=install 
Level=1
ComponentRef Id=php_soap/
http://cvs.php.net/viewvc.cgi/win-installer/WixUI_en-us.wxl?r1=1.25r2=1.26diff_format=u
Index: win-installer/WixUI_en-us.wxl
diff -u win-installer/WixUI_en-us.wxl:1.25 win-installer/WixUI_en-us.wxl:1.26
--- win-installer/WixUI_en-us.wxl:1.25  Thu Aug  7 17:34:55 2008
+++ win-installer/WixUI_en-us.wxl   Fri Aug 22 18:50:01 2008
@@ -678,6 +678,8 @@
   String Id=Featureext_php_imapDescriptionIMAP POP3 and NNTP 
functions/String
   String Id=Featureext_php_interbaseTitleInterbase/String
   String Id=Featureext_php_interbaseDescriptionInterBase functions/String
+  String Id=Featureext_php_intlTitleInternationalization (intl)/String
+  String Id=Featureext_php_intlDescriptionInternationalization extension 
(further is referred as Intl) is a wrapper for ICU library, enabling PHP 
programmers to perform UCA-conformant collation and date/time/number/currency 
formatting in their scripts./String
   String Id=Featureext_php_javaTitleJava/String
   String Id=Featureext_php_javaDescriptionPHP / Java Integration/String
   String Id=Featureext_php_jsonTitlejson/String



-- 
PHP

[PHP-CVS] cvs: win-installer / ExtensionsGUID.xml

2008-08-22 Thread John Mertic

jmertic Fri Aug 22 19:01:08 2008 UTC

  Modified files:  
/win-installer  ExtensionsGUID.xml 
  Log:
  Added guids for php_intl and php_oci8_11g
  
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsGUID.xml?r1=1.9r2=1.10diff_format=u
Index: win-installer/ExtensionsGUID.xml
diff -u win-installer/ExtensionsGUID.xml:1.9 
win-installer/ExtensionsGUID.xml:1.10
--- win-installer/ExtensionsGUID.xml:1.9Mon Aug  4 15:11:38 2008
+++ win-installer/ExtensionsGUID.xmlFri Aug 22 19:01:07 2008
@@ -137,4 +137,6 @@
   Extension Name=php_phk Guid=18FEB773-02FA-4B96-B682-04F08BCD1B7A/
   Extension Name=php_sqlite3 Guid=47043346-952F-454A-B19A-615A32BD9EAD/
   Extension Name=php_ffi Guid=B18F94FC-4688-4C7E-87A1-8EEC8F52417D/
+  Extension Name=php_intl Guid=9048A2B4-188A-438D-8AB8-6BFE7D0910FE/
+  Extension Name=php_oci8_11g Guid=0A362A05-C876-420C-8F82-9F8AB8912A78/
 /Extensions



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

[PHP-CVS] cvs: win-installer / ExtensionsFeatures53.wxs ExtensionsFragment.wxs

2008-08-11 Thread John Mertic

jmertic Mon Aug 11 12:06:19 2008 UTC

  Modified files:  
/win-installer  ExtensionsFeatures53.wxs ExtensionsFragment.wxs 
  Log:
  Add libpq.dll to the installer.
  
  Removed references to older oci extensions.
  
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures53.wxs?r1=1.3r2=1.4diff_format=u
Index: win-installer/ExtensionsFeatures53.wxs
diff -u win-installer/ExtensionsFeatures53.wxs:1.3 
win-installer/ExtensionsFeatures53.wxs:1.4
--- win-installer/ExtensionsFeatures53.wxs:1.3  Thu Aug  7 17:34:55 2008
+++ win-installer/ExtensionsFeatures53.wxs  Mon Aug 11 12:06:19 2008
@@ -247,12 +247,6 @@
Feature AllowAdvertise=no Id=ext_php_operator 
Title=$(loc.Featureext_php_operatorTitle) 
Description=$(loc.Featureext_php_operatorDescription) Level=10
ComponentRef Id=php_operator/
/Feature
-   Feature AllowAdvertise=no Id=ext_php_oracle 
Title=$(loc.Featureext_php_oracleTitle) 
Description=$(loc.Featureext_php_oracleDescription) Level=10
-   ComponentRef Id=php_oracle/
-   /Feature
-   Feature AllowAdvertise=no Id=ext_php_oci8 
Title=$(loc.Featureext_php_oci8Title) 
Description=$(loc.Featureext_php_oci8Description) Level=10
-   ComponentRef Id=php_oci8/
-   /Feature
Feature AllowAdvertise=no Id=ext_php_oci8_11g 
Title=$(loc.Featureext_php_oci8_11gTitle) 
Description=$(loc.Featureext_php_oci8_11gDescription) Level=10
ComponentRef Id=php_oci8_11g/
/Feature
@@ -289,9 +283,6 @@
Feature AllowAdvertise=no 
Id=ext_php_pdo_mysql Title=$(loc.Featureext_php_pdo_mysqlTitle) 
Description=$(loc.Featureext_php_pdo_mysqlDescription) 
TypicalDefault=install Level=1
ComponentRef Id=php_pdo_mysql/
/Feature
-   Feature AllowAdvertise=no 
Id=ext_php_pdo_oci Title=$(loc.Featureext_php_pdo_ociTitle) 
Description=$(loc.Featureext_php_pdo_ociDescription) Level=10
-   ComponentRef Id=php_pdo_oci/
-   /Feature
Feature AllowAdvertise=no 
Id=ext_php_pdo_oci8 Title=$(loc.Featureext_php_pdo_oci8Title) 
Description=$(loc.Featureext_php_pdo_oci8Description) Level=10
ComponentRef Id=php_pdo_oci8/
/Feature
@@ -300,6 +291,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) 
TypicalDefault=install Level=1
ComponentRef Id=php_pdo_sqlite/
@@ -323,6 +315,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/
/Feature
Feature AllowAdvertise=no Id=ext_php_printer 
Title=$(loc.Featureext_php_printerTitle) 
Description=$(loc.Featureext_php_printerDescription) Level=10
ComponentRef Id=php_printer/
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFragment.wxs?r1=1.3r2=1.4diff_format=u
Index: win-installer/ExtensionsFragment.wxs
diff -u win-installer/ExtensionsFragment.wxs:1.3 
win-installer/ExtensionsFragment.wxs:1.4
--- win-installer/ExtensionsFragment.wxs:1.3Mon Aug  4 14:59:30 2008
+++ win-installer/ExtensionsFragment.wxsMon Aug 11 12:06:19 2008
@@ -26,6 +26,9 @@
Component Id=msqlDLL DiskId=1 
Guid=C37BB17E-8C9D-4FB6-AD40-100BDDFDADD5
File Id=filemsqlDLL Name=msql.dll 
Source=Files\msql.dll /
/Component
+   Component Id=libpqDLL DiskId=1 
Guid=6C109270-64B0-11DD-AD8B-0800200C9A66
+   File Id=filelibpqDLL Name=libpq.dll 
Source=Files\libpq.dll /
+   /Component
Component Id=ssleay32DLL DiskId=1 
Guid=D7E5F122-9764-4165-BDDA-922D60408C2F
File Id=filessleay32DLL Name=ssleay32.dll 
Source=Files\ssleay32.dll /

[PHP-CVS] cvs: win-installer / ExtensionsFeatures53.wxs

2008-08-11 Thread John Mertic

jmertic Mon Aug 11 12:18:37 2008 UTC

  Modified files:  
/win-installer  ExtensionsFeatures53.wxs 
  Log:
  Remove libmcrypt dependency for 5.3, since it's statically built now.
  
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures53.wxs?r1=1.4r2=1.5diff_format=u
Index: win-installer/ExtensionsFeatures53.wxs
diff -u win-installer/ExtensionsFeatures53.wxs:1.4 
win-installer/ExtensionsFeatures53.wxs:1.5
--- win-installer/ExtensionsFeatures53.wxs:1.4  Mon Aug 11 12:06:19 2008
+++ win-installer/ExtensionsFeatures53.wxs  Mon Aug 11 12:18:37 2008
@@ -195,7 +195,6 @@
/Feature
Feature AllowAdvertise=no Id=ext_php_mcrypt 
Title=$(loc.Featureext_php_mcryptTitle) 
Description=$(loc.Featureext_php_mcryptDescription) TypicalDefault=install 
Level=1
ComponentRef Id=php_mcrypt/
-   ComponentRef Id=libmcryptDLL/
/Feature
Feature AllowAdvertise=no Id=ext_php_mcve 
Title=$(loc.Featureext_php_mcveTitle) 
Description=$(loc.Featureext_php_mcveDescription) Level=10
ComponentRef Id=php_mcve/



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

[PHP-CVS] cvs: win-installer / ExtensionsFeatures53.wxs

2008-08-11 Thread John Mertic

jmertic Mon Aug 11 19:58:24 2008 UTC

  Modified files:  
/win-installer  ExtensionsFeatures53.wxs 
  Log:
  Assure that the only oracle extensions are php_oci, php_oci8_11g, and 
php_pdo_oci
  
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures53.wxs?r1=1.5r2=1.6diff_format=u
Index: win-installer/ExtensionsFeatures53.wxs
diff -u win-installer/ExtensionsFeatures53.wxs:1.5 
win-installer/ExtensionsFeatures53.wxs:1.6
--- win-installer/ExtensionsFeatures53.wxs:1.5  Mon Aug 11 12:18:37 2008
+++ win-installer/ExtensionsFeatures53.wxs  Mon Aug 11 19:58:24 2008
@@ -246,6 +246,9 @@
Feature AllowAdvertise=no Id=ext_php_operator 
Title=$(loc.Featureext_php_operatorTitle) 
Description=$(loc.Featureext_php_operatorDescription) Level=10
ComponentRef Id=php_operator/
/Feature
+   Feature AllowAdvertise=no Id=ext_php_oci 
Title=$(loc.Featureext_php_ociTitle) 
Description=$(loc.Featureext_php_ociDescription) Level=10
+   ComponentRef Id=php_oci/
+   /Feature
Feature AllowAdvertise=no Id=ext_php_oci8_11g 
Title=$(loc.Featureext_php_oci8_11gTitle) 
Description=$(loc.Featureext_php_oci8_11gDescription) Level=10
ComponentRef Id=php_oci8_11g/
/Feature
@@ -282,8 +285,8 @@
Feature AllowAdvertise=no 
Id=ext_php_pdo_mysql Title=$(loc.Featureext_php_pdo_mysqlTitle) 
Description=$(loc.Featureext_php_pdo_mysqlDescription) 
TypicalDefault=install Level=1
ComponentRef Id=php_pdo_mysql/
/Feature
-   Feature AllowAdvertise=no 
Id=ext_php_pdo_oci8 Title=$(loc.Featureext_php_pdo_oci8Title) 
Description=$(loc.Featureext_php_pdo_oci8Description) Level=10
-   ComponentRef Id=php_pdo_oci8/
+   Feature AllowAdvertise=no 
Id=ext_php_pdo_oci Title=$(loc.Featureext_php_pdo_ociTitle) 
Description=$(loc.Featureext_php_pdo_ociDescription) Level=10
+   ComponentRef Id=php_pdo_oci/
/Feature
Feature AllowAdvertise=no 
Id=ext_php_pdo_odbc Title=$(loc.Featureext_php_pdo_odbcTitle) 
Description=$(loc.Featureext_php_pdo_odbcDescription) 
TypicalDefault=install Level=1
ComponentRef Id=php_pdo_odbc/



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

[PHP-CVS] cvs: win-installer / ExtensionsFeatures53.wxs WixUI_en-us.wxl

2008-08-07 Thread John Mertic

jmertic Thu Aug  7 17:34:55 2008 UTC

  Modified files:  
/win-installer  ExtensionsFeatures53.wxs WixUI_en-us.wxl 
  Log:
  Added placeholders for oci8_11g extension.
  
  Default enable certain php extensions, such as bz2, curl, exif, gd2, gettext, 
gmp, imap, mcrypt, mhash, mysql, mysqli, mssql, openssl, pdo_mysql, pdo_odbc, 
pdo_sqlite, pgsql, pspell, soap, sockets, sqlite3, tidy, xmlrpc, and zip.
  http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures53.wxs?r1=1.2r2=1.3diff_format=u
Index: win-installer/ExtensionsFeatures53.wxs
diff -u win-installer/ExtensionsFeatures53.wxs:1.2 
win-installer/ExtensionsFeatures53.wxs:1.3
--- win-installer/ExtensionsFeatures53.wxs:1.2  Mon Aug  4 15:11:38 2008
+++ win-installer/ExtensionsFeatures53.wxs  Thu Aug  7 17:34:55 2008
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=windows-1252?
 Wix xmlns=http://schemas.microsoft.com/wix/2003/01/wi;
Fragment Id=FragmentExtensionsFeatures
-   Feature AllowAdvertise=no Id=Extensions 
Title=$(loc.FeatureExtensionsTitle) 
Description=$(loc.FeatureExtensionsDescription) Level=10
+   Feature AllowAdvertise=no Id=Extensions 
Title=$(loc.FeatureExtensionsTitle) 
Description=$(loc.FeatureExtensionsDescription) TypicalDefault=install 
Level=1
ComponentRef Id=extdir/
Feature AllowAdvertise=no Id=pecl_php5activescript 
Title=$(loc.Featurepecl_phpactivescriptTitle) 
Description=$(loc.Featurepecl_phpactivescriptDescription) Level=10
ComponentRef Id=php5activescript/
@@ -30,7 +30,7 @@
Feature AllowAdvertise=no Id=ext_php_blenc 
Title=$(loc.Featureext_php_blencTitle) 
Description=$(loc.Featureext_php_blencDescription) Level=10
ComponentRef Id=php_blenc/
/Feature
-   Feature AllowAdvertise=no Id=ext_php_bz2 
Title=$(loc.Featureext_php_bz2Title) 
Description=$(loc.Featureext_php_bz2Description) Level=10
+   Feature AllowAdvertise=no Id=ext_php_bz2 
Title=$(loc.Featureext_php_bz2Title) 
Description=$(loc.Featureext_php_bz2Description) TypicalDefault=install 
Level=1
ComponentRef Id=php_bz2/
/Feature
Feature AllowAdvertise=no Id=ext_php_bz2_filter 
Title=$(loc.Featureext_php_bz2_filterTitle) 
Description=$(loc.Featureext_php_bz2_filterDescription) Level=10
@@ -48,7 +48,7 @@
Feature AllowAdvertise=no Id=ext_php_cvsclient 
Title=$(loc.Featureext_php_cvsclientTitle) 
Description=$(loc.Featureext_php_cvsclientDescription) Level=10
ComponentRef Id=php_cvsclient/
/Feature
-   Feature AllowAdvertise=no Id=ext_php_curl 
Title=$(loc.Featureext_php_curlTitle) 
Description=$(loc.Featureext_php_curlDescription) Level=10
+   Feature AllowAdvertise=no Id=ext_php_curl 
Title=$(loc.Featureext_php_curlTitle) 
Description=$(loc.Featureext_php_curlDescription) TypicalDefault=install 
Level=1
ComponentRef Id=php_curl/
ComponentRef Id=libeay32DLL/
ComponentRef Id=ssleay32DLL/
@@ -80,7 +80,7 @@
Feature AllowAdvertise=no Id=ext_php_event 
Title=$(loc.Featureext_php_eventTitle) 
Description=$(loc.Featureext_php_eventDescription) Level=10
ComponentRef Id=php_event/
/Feature
-   Feature AllowAdvertise=no Id=ext_php_exif 
Title=$(loc.Featureext_php_exifTitle) 
Description=$(loc.Featureext_php_exifDescription) Level=10
+   Feature AllowAdvertise=no Id=ext_php_exif 
Title=$(loc.Featureext_php_exifTitle) 
Description=$(loc.Featureext_php_exifDescription) TypicalDefault=install 
Level=1
ComponentRef Id=php_mbstring/
ComponentRef Id=php_exif/
/Feature
@@ -102,13 +102,13 @@
ComponentRef Id=php_fribidi/
ComponentRef Id=fribidiDLL/
/Feature
-   Feature AllowAdvertise=no Id=ext_php_gd2 
Title=$(loc.Featureext_php_gd2Title) 
Description=$(loc.Featureext_php_gd2Description) Level=10
+   Feature AllowAdvertise=no Id=ext_php_gd2 
Title=$(loc.Featureext_php_gd2Title) 
Description=$(loc.Featureext_php_gd2Description) TypicalDefault=install 
Level=1
ComponentRef Id=php_gd2/
/Feature
-   Feature AllowAdvertise=no Id=ext_php_gettext 
Title=$(loc.Featureext_php_gettextTitle) 
Description=$(loc.Featureext_php_gettextDescription) Level=10
+   Feature AllowAdvertise=no Id=ext_php_gettext

[PHP-CVS] cvs: win-installer / ExtensionsFragment.wxs GenExtensionsComponents.wxs.php

2008-08-04 Thread John Mertic

jmertic Mon Aug  4 14:59:30 2008 UTC

  Modified files:  
/win-installer  ExtensionsFragment.wxs 
GenExtensionsComponents.wxs.php 
  Log:
  Bug #45091 - Fixed remaining issue with mibsdir during the build.
  
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFragment.wxs?r1=1.2r2=1.3diff_format=u
Index: win-installer/ExtensionsFragment.wxs
diff -u win-installer/ExtensionsFragment.wxs:1.2 
win-installer/ExtensionsFragment.wxs:1.3
--- win-installer/ExtensionsFragment.wxs:1.2Thu Jul 10 19:31:05 2008
+++ win-installer/ExtensionsFragment.wxsMon Aug  4 14:59:30 2008
@@ -132,7 +132,6 @@
 File Id=mibsfile20 Name=IPV6-U_1.TXT 
LongName=IPV6-UDP-MIB.txt Source=Files\extras\mibs\IPV6-UDP-MIB.txt /
 File Id=mibsfile21 Name=MTA-MIB.txt 
Source=Files\extras\mibs\MTA-MIB.txt /
 File Id=mibsfile22 Name=NETWOR_1.TXT 
LongName=NETWORK-SERVICES-MIB.txt 
Source=Files\extras\mibs\NETWORK-SERVICES-MIB.txt /
-File Id=mibsfile23 Name=output.txt 
Source=Files\extras\mibs\output.txt /
 File Id=mibsfile24 Name=RFC-1215.txt 
Source=Files\extras\mibs\RFC-1215.txt /
 File Id=mibsfile25 Name=RFC115_1.TXT 
LongName=RFC1155-SMI.txt Source=Files\extras\mibs\RFC1155-SMI.txt /
 File Id=mibsfile26 Name=RFC121_1.TXT 
LongName=RFC1213-MIB.txt Source=Files\extras\mibs\RFC1213-MIB.txt /
http://cvs.php.net/viewvc.cgi/win-installer/GenExtensionsComponents.wxs.php?r1=1.16r2=1.17diff_format=u
Index: win-installer/GenExtensionsComponents.wxs.php
diff -u win-installer/GenExtensionsComponents.wxs.php:1.16 
win-installer/GenExtensionsComponents.wxs.php:1.17
--- win-installer/GenExtensionsComponents.wxs.php:1.16  Wed Apr 16 21:16:55 2008
+++ win-installer/GenExtensionsComponents.wxs.php   Mon Aug  4 14:59:30 2008
@@ -137,7 +137,8 @@
 $i = 0;
 $hasSeenMbString = false;
 while ( $i  $files-length ) {
-if ( !is_file( realpath($files-item($i)-getAttribute('Source')) ) ) {
+if ( !is_file( realpath($files-item($i)-getAttribute('Source')) ) 
+ $files-item($i)-parentNode-getAttribute('Id') != 'mibsdir' ) 
{
 $nodetoremove = $files-item($i)-parentNode;
 echo Removing File  . $nodetoremove-getAttribute('Id') .  because 
 . realpath($files-item($i)-getAttribute('Source')) .  doesn't exist\n;
 $files-item($i)-parentNode-parentNode-removeChild($nodetoremove);
@@ -180,7 +181,7 @@
 $nodetoremove = $componentRefs-item($i)-parentNode;
 echo Removing Feature  . $nodetoremove-getAttribute('Id') .  because 
of missing Component $componentRefId\n;
 
$componentRefs-item($i)-parentNode-parentNode-removeChild($nodetoremove);
-if ($i0) $i--;
+$i = 0;
 }
 $ExtensionsFeaturesWXS-save('ExtensionsFeaturesBuild.wxs');
 



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

[PHP-CVS] cvs: win-installer / ExtensionsFeatures52.wxs ExtensionsFeatures53.wxs ExtensionsGUID.xml WixUI_en-us.wxl

2008-08-04 Thread John Mertic

jmertic Mon Aug  4 15:11:38 2008 UTC

  Modified files:  
/win-installer  ExtensionsFeatures52.wxs ExtensionsFeatures53.wxs 
ExtensionsGUID.xml WixUI_en-us.wxl 
  Log:
  Added FFI PECL extension.
  
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures52.wxs?r1=1.1r2=1.2diff_format=u
Index: win-installer/ExtensionsFeatures52.wxs
diff -u win-installer/ExtensionsFeatures52.wxs:1.1 
win-installer/ExtensionsFeatures52.wxs:1.2
--- win-installer/ExtensionsFeatures52.wxs:1.1  Mon Aug  4 15:01:41 2008
+++ win-installer/ExtensionsFeatures52.wxs  Mon Aug  4 15:11:38 2008
@@ -89,6 +89,9 @@
ComponentRef Id=fdftkDLL/
ComponentRef Id=PDFSupport/
/Feature
+Feature AllowAdvertise=no Id=ext_php_ffi 
Title=$(loc.Featureext_php_ffiTitle) 
Description=$(loc.Featureext_php_ffiDescription) Level=10
+   ComponentRef Id=php_ffi/
+   /Feature
Feature AllowAdvertise=no Id=ext_php_fileinfo 
Title=$(loc.Featureext_php_fileinfoTitle) 
Description=$(loc.Featureext_php_fileinfoDescription) Level=10
ComponentRef Id=php_fileinfo/
/Feature
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures53.wxs?r1=1.1r2=1.2diff_format=u
Index: win-installer/ExtensionsFeatures53.wxs
diff -u win-installer/ExtensionsFeatures53.wxs:1.1 
win-installer/ExtensionsFeatures53.wxs:1.2
--- win-installer/ExtensionsFeatures53.wxs:1.1  Mon Aug  4 15:01:41 2008
+++ win-installer/ExtensionsFeatures53.wxs  Mon Aug  4 15:11:38 2008
@@ -89,6 +89,9 @@
ComponentRef Id=fdftkDLL/
ComponentRef Id=PDFSupport/
/Feature
+   Feature AllowAdvertise=no Id=ext_php_ffi 
Title=$(loc.Featureext_php_ffiTitle) 
Description=$(loc.Featureext_php_ffiDescription) Level=10
+   ComponentRef Id=php_ffi/
+   /Feature
Feature AllowAdvertise=no Id=ext_php_fileinfo 
Title=$(loc.Featureext_php_fileinfoTitle) 
Description=$(loc.Featureext_php_fileinfoDescription) Level=10
ComponentRef Id=php_fileinfo/
/Feature
@@ -361,6 +364,9 @@
Feature AllowAdvertise=no Id=ext_php_sqlite 
Title=$(loc.Featureext_php_sqliteTitle) 
Description=$(loc.Featureext_php_sqliteDescription) Level=10
ComponentRef Id=php_sqlite/
/Feature
+Feature AllowAdvertise=no Id=ext_php_sqlite3 
Title=$(loc.Featureext_php_sqlite3Title) 
Description=$(loc.Featureext_php_sqlite3Description) Level=10
+   ComponentRef Id=php_sqlite3/
+   /Feature
Feature AllowAdvertise=no Id=ext_php_ssh2 
Title=$(loc.Featureext_php_ssh2Title) 
Description=$(loc.Featureext_php_ssh2Description) Level=10
ComponentRef Id=php_ssh2/
/Feature
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsGUID.xml?r1=1.8r2=1.9diff_format=u
Index: win-installer/ExtensionsGUID.xml
diff -u win-installer/ExtensionsGUID.xml:1.8 
win-installer/ExtensionsGUID.xml:1.9
--- win-installer/ExtensionsGUID.xml:1.8Wed Apr 30 20:40:29 2008
+++ win-installer/ExtensionsGUID.xmlMon Aug  4 15:11:38 2008
@@ -135,4 +135,6 @@
   Extension Name=php_params Guid=DE7A1EE9-DCFA-4630-A346-13EE4C95DE1C/
   Extension Name=php_pdflib Guid=6FA07E32-239E-4C27-8148-207320D5500F/
   Extension Name=php_phk Guid=18FEB773-02FA-4B96-B682-04F08BCD1B7A/
+  Extension Name=php_sqlite3 Guid=47043346-952F-454A-B19A-615A32BD9EAD/
+  Extension Name=php_ffi Guid=B18F94FC-4688-4C7E-87A1-8EEC8F52417D/
 /Extensions
http://cvs.php.net/viewvc.cgi/win-installer/WixUI_en-us.wxl?r1=1.23r2=1.24diff_format=u
Index: win-installer/WixUI_en-us.wxl
diff -u win-installer/WixUI_en-us.wxl:1.23 win-installer/WixUI_en-us.wxl:1.24
--- win-installer/WixUI_en-us.wxl:1.23  Sat May 17 20:27:56 2008
+++ win-installer/WixUI_en-us.wxl   Mon Aug  4 15:11:38 2008
@@ -632,6 +632,8 @@
   String Id=Featureext_php_exifDescriptionEXIF functions/String
   String Id=Featureext_php_fdfTitleFDF/String
   String Id=Featureext_php_fdfDescriptionFDF: Forms Data Format 
functions/String
+  String Id=Featureext_php_ffiTitleFFI/String
+  String Id=Featureext_php_ffiDescriptionFFI is a multi-platform extension 
for PHP 5 that allows you to bind to functions from arbitrary shared libraries 
and call them./String
   String Id=Featureext_php_fileinfoTitleFileinfo/String
   String Id=Featureext_php_fileinfoDescriptionlibmagic bindings/String
   String Id=Featureext_php_fileproTitlefilePro/String
@@ -800,6 +802,8 @@
   String Id=Featureext_php_spl_typesDescriptionSPL Types is a collection 
of special

[PHP-CVS] cvs: win-installer / ExtensionsFragment.wxs PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

2008-07-10 Thread John Mertic

jmertic Thu Jul 10 19:31:05 2008 UTC

  Modified files:  
/win-installer  ExtensionsFragment.wxs PHPInstallerBase52.wxs 
PHPInstallerBase52NTS.wxs PHPInstallerBase60.wxs 
PHPInstallerBase60NTS.wxs 
  Log:
  Bug #45091 - Make sure that the SMNP support files get installed in the 
usr/mibs directory in the root directory.
  http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFragment.wxs?r1=1.1r2=1.2diff_format=u
Index: win-installer/ExtensionsFragment.wxs
diff -u win-installer/ExtensionsFragment.wxs:1.1 
win-installer/ExtensionsFragment.wxs:1.2
--- win-installer/ExtensionsFragment.wxs:1.1Sat Oct 13 19:10:53 2007
+++ win-installer/ExtensionsFragment.wxsThu Jul 10 19:31:05 2008
@@ -45,17 +45,7 @@
Section=PHP 
Value=quot;[INSTALLDIR]extquot; /
/Component
/Directory
-Directory Id=mibsdirectory Name=mibs
-   Component Id=mibsdir DiskId=1 
Guid=21B96C70-3A1E-11DC-8314-0800200C9A66
-   Environment Id=MIBDIRS 
-  Name=MIBDIRS 
-  Action=create 
-  System=yes 
-  Part=all 
-  Value=[!INSTALLDIR]\mibs/
-   /Component
-   /Directory
-   Directory Id=extrasdirectory Name=extras
+Directory Id=extrasdirectory Name=extras
Component Id=magicMIME DiskId=1 
Guid=C29559A6-DE77-4951-A8F8-6266B790DE20
File Id=filemagicMIME 
Name=MAGIC_1.MIM LongName=magic.mime Source=Files\extras\magic.mime /
/Component
@@ -118,5 +108,66 @@
/Directory
/Directory
/DirectoryRef
+DirectoryRef Id=mibsdirectory
+Component Id=mibsdir DiskId=1 
Guid=21B96C70-3A1E-11DC-8314-0800200C9A66
+File Id=mibsfile1 Name=AGENTX_1.TXT 
LongName=AGENTX-MIB.txt Source=Files\extras\mibs\AGENTX-MIB.txt /
+File Id=mibsfile2 Name=DISMAN_1.TXT 
LongName=DISMAN-SCHEDULE-MIB.txt 
Source=Files\extras\mibs\DISMAN-SCHEDULE-MIB.txt /
+File Id=mibsfile3 Name=DISMAN_2.TXT 
LongName=DISMAN-SCRIPT-MIB.txt 
Source=Files\extras\mibs\DISMAN-SCRIPT-MIB.txt /
+File Id=mibsfile4 Name=ETHERL_1.TXT 
LongName=EtherLike-MIB.txt Source=Files\extras\mibs\EtherLike-MIB.txt /
+File Id=mibsfile5 Name=HCNUM-TC.txt 
Source=Files\extras\mibs\HCNUM-TC.txt /
+File Id=mibsfile6 Name=HOST-R_1.TXT 
LongName=HOST-RESOURCES-MIB.txt 
Source=Files\extras\mibs\HOST-RESOURCES-MIB.txt /
+File Id=mibsfile7 Name=HOST-R_2.TXT 
LongName=HOST-RESOURCES-TYPES.txt 
Source=Files\extras\mibs\HOST-RESOURCES-TYPES.txt /
+File Id=mibsfile8 Name=IANA-A_1.TXT 
LongName=IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt 
Source=Files\extras\mibs\IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt /
+File Id=mibsfile9 Name=IANA-L_1.TXT 
LongName=IANA-LANGUAGE-MIB.txt 
Source=Files\extras\mibs\IANA-LANGUAGE-MIB.txt /
+File Id=mibsfile10 Name=IANAIF_1.TXT 
LongName=IANAifType-MIB.txt Source=Files\extras\mibs\IANAifType-MIB.txt /
+File Id=mibsfile11 Name=IF-INV_1.TXT 
LongName=IF-INVERTED-STACK-MIB.txt 
Source=Files\extras\mibs\IF-INVERTED-STACK-MIB.txt /
+File Id=mibsfile12 Name=IF-MIB.txt 
Source=Files\extras\mibs\IF-MIB.txt /
+File Id=mibsfile13 Name=INET-A_1.TXT 
LongName=INET-ADDRESS-MIB.txt Source=Files\extras\mibs\INET-ADDRESS-MIB.txt 
/
+File Id=mibsfile14 Name=IP-FOR_1.TXT 
LongName=IP-FORWARD-MIB.txt Source=Files\extras\mibs\IP-FORWARD-MIB.txt /
+File Id=mibsfile15 Name=IP-MIB.txt 
Source=Files\extras\mibs\IP-MIB.txt /
+File Id=mibsfile16 Name=IPV6-I_1.TXT 
LongName=IPV6-ICMP-MIB.txt Source=Files\extras\mibs\IPV6-ICMP-MIB.txt /
+File Id=mibsfile17 Name=IPV6-MIB.txt 
Source=Files\extras\mibs\IPV6-MIB.txt /
+File Id=mibsfile18 Name=IPV6-TC.txt 
Source=Files\extras\mibs\IPV6-TC.txt /
+File Id=mibsfile19 Name=IPV6-T_1.TXT 
LongName=IPV6-TCP-MIB.txt Source=Files\extras\mibs\IPV6-TCP-MIB.txt /
+File Id=mibsfile20 Name=IPV6-U_1.TXT 
LongName=IPV6-UDP-MIB.txt Source=Files\extras\mibs\IPV6-UDP-MIB.txt /
+File Id=mibsfile21 Name=MTA-MIB.txt 
Source=Files\extras\mibs\MTA-MIB.txt /
+File Id=mibsfile22 Name=NETWOR_1.TXT 
LongName=NETWORK-SERVICES-MIB.txt 
Source=Files\extras\mibs\NETWORK-SERVICES-MIB.txt /
+File Id=mibsfile23 Name=output.txt 
Source=Files\extras\mibs\output.txt /
+File Id=mibsfile24 Name=RFC-1215.txt

[PHP-CVS] cvs: win-installer / ExtensionsFeatures.wxs WixUI_en-us.wxl

2008-05-17 Thread John Mertic

jmertic Sat May 17 20:27:56 2008 UTC

  Modified files:  
/win-installer  ExtensionsFeatures.wxs WixUI_en-us.wxl 
  Log:
  Added feature descriptions for params and phk extensions, and updated the one 
for pdflib
  
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures.wxs?r1=1.17r2=1.18diff_format=u
Index: win-installer/ExtensionsFeatures.wxs
diff -u win-installer/ExtensionsFeatures.wxs:1.17 
win-installer/ExtensionsFeatures.wxs:1.18
--- win-installer/ExtensionsFeatures.wxs:1.17   Wed Apr 16 21:16:55 2008
+++ win-installer/ExtensionsFeatures.wxsSat May 17 20:27:56 2008
@@ -258,6 +258,15 @@
Feature AllowAdvertise=no Id=ext_php_pdf 
Title=$(loc.Featureext_php_pdfTitle) 
Description=$(loc.Featureext_php_pdfDescription) Level=10
ComponentRef Id=php_pdf/
/Feature
+   Feature AllowAdvertise=no Id=ext_php_pdflib 
Title=$(loc.Featureext_php_pdflibTitle) 
Description=$(loc.Featureext_php_pdflibDescription) Level=10
+   ComponentRef Id=php_pdflib/
+   /Feature
+   Feature AllowAdvertise=no Id=ext_php_params 
Title=$(loc.Featureext_php_paramsTitle) 
Description=$(loc.Featureext_php_paramsDescription) Level=10
+   ComponentRef Id=php_params/
+   /Feature
+   Feature AllowAdvertise=no Id=ext_php_phk 
Title=$(loc.Featureext_php_phkTitle) 
Description=$(loc.Featureext_php_phkDescription) Level=10
+   ComponentRef Id=php_phk/
+   /Feature
Feature AllowAdvertise=no Id=ext_php_pdo 
Title=$(loc.Featureext_php_pdoTitle) 
Description=$(loc.Featureext_php_pdoDescription) Level=10
ComponentRef Id=php_pdo/
Feature AllowAdvertise=no 
Id=ext_php_pdo_firebird Title=$(loc.Featureext_php_pdo_firebirdTitle) 
Description=$(loc.Featureext_php_pdo_firebirdDescription) Level=10
http://cvs.php.net/viewvc.cgi/win-installer/WixUI_en-us.wxl?r1=1.22r2=1.23diff_format=u
Index: win-installer/WixUI_en-us.wxl
diff -u win-installer/WixUI_en-us.wxl:1.22 win-installer/WixUI_en-us.wxl:1.23
--- win-installer/WixUI_en-us.wxl:1.22  Wed Apr 16 21:16:55 2008
+++ win-installer/WixUI_en-us.wxl   Sat May 17 20:27:56 2008
@@ -730,6 +730,12 @@
   String Id=Featureext_php_parsekitDescriptionPHP Opcode Analyser/String
   String Id=Featureext_php_pdfTitlePDFlib/String
   String Id=Featureext_php_pdfDescriptionCreating PDF on the fly with the 
PDFlib library/String
+  String Id=Featureext_php_pdflibTitlePDFlib/String
+  String Id=Featureext_php_pdflibDescriptionCreating PDF on the fly with 
the PDFlib library/String
+  String Id=Featureext_php_phkTitlePHK Accelerator/String
+  String Id=Featureext_php_phkDescriptionPHK is a PHP-oriented 
package/archive system. Basically, it can be considered as a PHP-oriented 
equivalent of the Java jar format. As jar, PHK allows to distribute and run a 
library or an application as a single file. The PHK accelerator transparently 
makes PHK runtime faster./String
+  String Id=Featureext_php_paramsTitleParameter Parsing Utility/String
+  String Id=Featureext_php_paramsDescriptionParameter Parsing 
Utility/String
   String Id=Featureext_php_pdoTitlePDO/String
   String Id=Featureext_php_pdoDescriptionPHP Data Objects support. Enable 
the driver you want to use below/String
   String Id=Featureext_php_pdo_firebirdTitleFirebird/Interbase 6/String



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

[PHP-CVS] cvs: win-installer / build.bat

2008-05-12 Thread John Mertic

jmertic Mon May 12 19:59:09 2008 UTC

  Modified files:  
/win-installer  build.bat 
  Log:
  Removed extra set command at the end of the script.
  
http://cvs.php.net/viewvc.cgi/win-installer/build.bat?r1=1.6r2=1.7diff_format=u
Index: win-installer/build.bat
diff -u win-installer/build.bat:1.6 win-installer/build.bat:1.7
--- win-installer/build.bat:1.6 Wed Apr 30 20:41:19 2008
+++ win-installer/build.bat Mon May 12 19:59:09 2008
@@ -30,5 +30,4 @@
 Wix\candle.exe ExtensionsComponents.wxs ExtensionsFeaturesBuild.wxs 
WebServerConfig%1.wxs PHPInstaller%1.wxs 
 
 echo Linking Installer
-Wix\light.exe -out %msiname% ExtensionsComponents.wixobj 
ExtensionsFeaturesBuild.wixobj WebServerConfig%1.wixobj PHPInstaller%1.wixobj 
PHPInstallerCommon.wixlib -loc WixUI_en-us.wxl
-set phpver=
+Wix\light.exe -out %msiname% ExtensionsComponents.wixobj 
ExtensionsFeaturesBuild.wixobj WebServerConfig%1.wixobj PHPInstaller%1.wixobj 
PHPInstallerCommon.wixlib -loc WixUI_en-us.wxls



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

[PHP-CVS] cvs: win-installer / build.bat

2008-05-12 Thread John Mertic

jmertic Tue May 13 00:50:43 2008 UTC

  Modified files:  
/win-installer  build.bat 
  Log:
  Fix error in script
  
http://cvs.php.net/viewvc.cgi/win-installer/build.bat?r1=1.7r2=1.8diff_format=u
Index: win-installer/build.bat
diff -u win-installer/build.bat:1.7 win-installer/build.bat:1.8
--- win-installer/build.bat:1.7 Mon May 12 19:59:09 2008
+++ win-installer/build.bat Tue May 13 00:50:43 2008
@@ -6,11 +6,13 @@
 if %phpver%==53 set phpver=52
 
 set msiname=php-%1-win32-installer.msi
-if %2==nts set msiname=php-%1-nts-win32-installer.msi
-
 set suffix=
+
+if (%2)==() goto build
+if %2==nts set msiname=php-%1-nts-win32-installer.msi
 if %2==nts set suffix=NTS
 
+:build
 echo Building ExtensionsComponents.wxs
 Files\php.exe GenExtensionsComponents.wxs.php
 



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

[PHP-CVS] cvs: win-installer / ExtensionsGUID.xml

2008-04-30 Thread John Mertic

jmertic Wed Apr 30 20:40:29 2008 UTC

  Modified files:  
/win-installer  ExtensionsGUID.xml 
  Log:
  Added GUIDs for params, pdflibm, phk
  
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsGUID.xml?r1=1.7r2=1.8diff_format=u
Index: win-installer/ExtensionsGUID.xml
diff -u win-installer/ExtensionsGUID.xml:1.7 
win-installer/ExtensionsGUID.xml:1.8
--- win-installer/ExtensionsGUID.xml:1.7Wed Nov 14 15:43:06 2007
+++ win-installer/ExtensionsGUID.xmlWed Apr 30 20:40:29 2008
@@ -132,4 +132,7 @@
   Extension Name=php_pdo_user Guid=9651A261-5563-48F0-AA9C-E0B2EBF55260/
   Extension Name=php_spl_types Guid=F3E64531-1866-42DE-B2ED-909E9A74972A/
   Extension Name=php_yami Guid=277280B9-32E0-4304-9236-D742A06BF52C/
+  Extension Name=php_params Guid=DE7A1EE9-DCFA-4630-A346-13EE4C95DE1C/
+  Extension Name=php_pdflib Guid=6FA07E32-239E-4C27-8148-207320D5500F/
+  Extension Name=php_phk Guid=18FEB773-02FA-4B96-B682-04F08BCD1B7A/
 /Extensions



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

[PHP-CVS] cvs: win-installer / build.bat

2008-04-30 Thread John Mertic

jmertic Wed Apr 30 20:41:19 2008 UTC

  Modified files:  
/win-installer  build.bat 
  Log:
  Fixed problem with building nts builds
  
http://cvs.php.net/viewvc.cgi/win-installer/build.bat?r1=1.5r2=1.6diff_format=u
Index: win-installer/build.bat
diff -u win-installer/build.bat:1.5 win-installer/build.bat:1.6
--- win-installer/build.bat:1.5 Sat Apr 12 19:24:30 2008
+++ win-installer/build.bat Wed Apr 30 20:41:19 2008
@@ -6,10 +6,10 @@
 if %phpver%==53 set phpver=52
 
 set msiname=php-%1-win32-installer.msi
-if %2==nts set msiname=php-%1-nts-win32-installer.msi
+if %2==nts set msiname=php-%1-nts-win32-installer.msi
 
-set suffix=
-if %2==nts set suffix=NTS
+set suffix=
+if %2==nts set suffix=NTS
 
 echo Building ExtensionsComponents.wxs
 Files\php.exe GenExtensionsComponents.wxs.php



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

73 matches

Mail list logo