cvs: win-installer / ExtensionsFragment.wxs ExtensionsFragment52.wxs ExtensionsFragment53.wxs ExtensionsFragment60.wxs GenExtensionsComponents.wxs.php
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs WebServerConfig53.wxs WebServerConfig53NTS.wxs build.bat

jmertic Fri Aug 22 18:51:41 2008 UTC Added files: /win-installer ExtensionsFragment52.wxs ExtensionsFragment53.wxs ExtensionsFragment60.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs WebServerConfig53.wxs WebServerConfig53NTS.wxs Removed files: /win-installer ExtensionsFragment.wxs Modified files: /win-installer GenExtensionsComponents.wxs.php build.bat Log: Split out ExtensionsFragment into seperate phpver versions, and add new versions for PHPInstallerBase and WebServerConfig. Updated build.bat and GenExtensionsComponents.wxs.php to reflect these changes.

http://cvs.php.net/viewvc.cgi/win-installer/GenExtensionsComponents.wxs.php?r1=1.17&r2=1.18&diff_format=u Index: win-installer/GenExtensionsComponents.wxs.php diff -u win-installer/GenExtensionsComponents.wxs.php:1.17 win-installer/GenExtensionsComponents.wxs.php:1.18 --- win-installer/GenExtensionsComponents.wxs.php:1.17 Mon Aug 4 14:59:30 2008 +++ win-installer/GenExtensionsComponents.wxs.php Fri Aug 22 18:51:40 2008 @@ -1,9 +1,11 @@ <?php require_once "GenFunctions.php"; +$phpver = $argv[1]; + $ExtensionsWXS = new DOMDocument; $ExtensionsWXS->preserveWhiteSpace = false; -$ExtensionsWXS->load('ExtensionsFragment.wxs'); +$ExtensionsWXS->load("ExtensionsFragment{$phpver}.wxs"); $ExtensionsWXS->formatOutput = true; $ExtensionsGUIDXML = new DOMDocument; $ExtensionsGUIDXML->preserveWhiteSpace = false; @@ -74,61 +76,63 @@ } } -$it = new DirectoryIterator('Files\PECL'); -foreach ( $it as $filename ) { - if ( $filename->isDot() || $filename == "CVS" ) continue; - if ( is_file("Files\\ext\\$filename") ) continue; - list($basename,$ext) = explode('.',$filename); - $cid = $basename . ( $ext != 'dll' ? strtoupper($ext) : ""); - $Component = $ExtensionsWXS->createElement('Component'); - $Component = $Directory_extdirectory->appendChild($Component); - $Component->setAttribute('Id',$cid); - $Component->setIdAttribute('Id',true); - $Component->setAttribute('DiskId',"1"); - - $xp2 = new DomXPath($ExtensionsGUIDXML); - $res2 = $xp2->query("//Extension[@Name = '$cid']"); - if ( $res2->item(0) != null ) { - $guid = $res2->item(0)->getAttribute('Guid'); - } - else { - $xp4 = new DomXPath($ExtensionsGUIDXML); - $res4 = $xp4->query("//Extensions"); - $Extensions = $res4->item(0); - $guid = genGUID(); - $Extension = $ExtensionsGUIDXML->createElement('Extension'); - $Extension = $Extensions->appendChild($Extension); - $Extension->setAttribute('Name',$cid); - $Extension->setAttribute('Guid',$guid); - $ExtensionsGUIDXML->save('extensionsGUID.xml'); - } - $Component->setAttribute('Guid',$guid); - - $File = $ExtensionsWXS->createElement('File'); - $File = $Component->appendChild($File); - $File->setAttribute('Id',"file{$basename}" . strtoupper($ext)); - if ( strlen($basename) > 8 ) { - $File->setAttribute('Name',getshortname("Files\\PECL\\$filename")); - $File->setAttribute('LongName',$filename); - } - else { - $File->setAttribute('Name',$filename); - } - $File->setAttribute('Source',"Files\PECL\\{$filename}"); - - if ($ext == 'dll' && stristr($basename,'php_') !== FALSE ) { - $IniFile = $ExtensionsWXS->createElement('IniFile'); - $IniFile = $Component->appendChild($IniFile); - $IniFile->setAttribute('Id',"{$basename}INI"); - $IniFile->setAttribute('Action',"createLine"); - if ( strtoupper($basename) == 'PHP_XDEBUG.DLL') - $IniFile->setAttribute('Key',"zend_extension_ts"); - else - $IniFile->setAttribute('Key',"extension"); - $IniFile->setAttribute('Directory',"INSTALLDIR"); - $IniFile->setAttribute('Name',"php.ini"); - $IniFile->setAttribute('Section',strtoupper($basename)); - $IniFile->setAttribute('Value',$filename); +if ( is_dir('Files\PECL') ) { + $it = new DirectoryIterator('Files\PECL'); + foreach ( $it as $filename ) { + if ( $filename->isDot() || $filename == "CVS" ) continue; + if ( is_file("Files\\ext\\$filename") ) continue; + list($basename,$ext) = explode('.',$filename); + $cid = $basename . ( $ext != 'dll' ? strtoupper($ext) : ""); + $Component = $ExtensionsWXS->createElement('Component'); + $Component = $Directory_extdirectory->appendChild($Component); + $Component->setAttribute('Id',$cid); + $Component->setIdAttribute('Id',true); + $Component->setAttribute('DiskId',"1"); + + $xp2 = new DomXPath($ExtensionsGUIDXML); + $res2 = $xp2->query("//Extension[@Name = '$cid']"); + if ( $res2->item(0) != null ) { + $guid = $res2->item(0)->getAttribute('Guid'); + } + else { + $xp4 = new DomXPath($ExtensionsGUIDXML); + $res4 = $xp4->query("//Extensions"); + $Extensions = $res4->item(0); + $guid = genGUID(); + $Extension = $ExtensionsGUIDXML->createElement('Extension'); + $Extension = $Extensions->appendChild($Extension); + $Extension->setAttribute('Name',$cid); + $Extension->setAttribute('Guid',$guid); + $ExtensionsGUIDXML->save('extensionsGUID.xml'); + } + $Component->setAttribute('Guid',$guid); + + $File = $ExtensionsWXS->createElement('File'); + $File = $Component->appendChild($File); + $File->setAttribute('Id',"file{$basename}" . strtoupper($ext)); + if ( strlen($basename) > 8 ) { + $File->setAttribute('Name',getshortname("Files\\PECL\\$filename")); + $File->setAttribute('LongName',$filename); + } + else { + $File->setAttribute('Name',$filename); + } + $File->setAttribute('Source',"Files\PECL\\{$filename}"); + + if ($ext == 'dll' && stristr($basename,'php_') !== FALSE ) { + $IniFile = $ExtensionsWXS->createElement('IniFile'); + $IniFile = $Component->appendChild($IniFile); + $IniFile->setAttribute('Id',"{$basename}INI"); + $IniFile->setAttribute('Action',"createLine"); + if ( strtoupper($basename) == 'PHP_XDEBUG.DLL') + $IniFile->setAttribute('Key',"zend_extension_ts"); + else + $IniFile->setAttribute('Key',"extension"); + $IniFile->setAttribute('Directory',"INSTALLDIR"); + $IniFile->setAttribute('Name',"php.ini"); + $IniFile->setAttribute('Section',strtoupper($basename)); + $IniFile->setAttribute('Value',$filename); + } } } http://cvs.php.net/viewvc.cgi/win-installer/build.bat?r1=1.10&r2=1.11&diff_format=u Index: win-installer/build.bat diff -u win-installer/build.bat:1.10 win-installer/build.bat:1.11 --- win-installer/build.bat:1.10 Mon Aug 4 15:01:41 2008 +++ win-installer/build.bat Fri Aug 22 18:51:40 2008 @@ -7,8 +7,6 @@ echo Building ExtensionsFeatures.wxs copy ExtensionsFeatures%phpver%.wxs ExtensionsFeatures.wxs -if %phpver%==53 set phpver=52 - set msiname="php-%1-win32-installer.msi" set suffix= @@ -18,7 +16,7 @@ :build echo Building ExtensionsComponents.wxs -Files\php.exe GenExtensionsComponents.wxs.php +Files\php.exe GenExtensionsComponents.wxs.php "%phpver%" echo Building PHPInstaller%1.wxs Files\php.exe GenPHPInstaller.wxs.php "PHPInstallerBase%phpver%%suffix%.wxs" "%1" http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFragment52.wxs?view=markup&rev=1.1 Index: win-installer/ExtensionsFragment52.wxs +++ win-installer/ExtensionsFragment52.wxs <?xml version='1.0' encoding='iso-8859-1'?> <Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'> <Fragment Id='FragmentExtensions'> <DirectoryRef Id='INSTALLDIR'> <Component Id="fdftkDLL" DiskId="1" Guid="C54716D6-F1C6-4366-AD1E-8C2DB1686801"> <File Id="filefdftkDLL" Name="fdftk.dll" Source="Files\fdftk.dll" /> </Component> <Component Id="gds32DLL" DiskId="1" Guid="D70180EF-1AE2-45FF-B79F-DF16056F972D"> <File Id="filegds32DLL" Name="gds32.dll" Source="Files\gds32.dll" /> </Component> <Component Id="libeay32DLL" DiskId="1" Guid="1BF3C9B6-6495-476E-85B8-2843B5F5458D"> <File Id="filelibeay32DLL" Name="libeay32.dll" Source="Files\libeay32.dll" /> </Component> <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> <Component Id="ntwdblibDLL" DiskId="1" Guid="7FA2C1EB-5166-4D16-AD36-DEF92A491D8B"> <File Id="filentwdblibDLL" Name="ntwdblib.dll" Source="Files\ntwdblib.dll" /> </Component> <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" /> </Component> <Component Id="yazDLL" DiskId="1" Guid="4C0CE69A-DBE4-4294-88CC-F6E82A3CFCD1"> <File Id="fileyazSLL" Name="yaz.dll" Source="Files\yaz.dll" /> </Component> <Component Id="libswisheDLL" DiskId="1" Guid="4F1FD404-B722-4A1E-997A-474B6F001420"> <File Id="filelibswisheDLL" Name="LIBSWI_1.DLL" LongName="libswish-e.dll" Source="Files\libswish-e.dll" /> </Component> <Component Id="fribidiDLL" DiskId="1" Guid="D08A7C40-924B-45B2-8053-C6A5117846B2"> <File Id="filefribidiDLL" Name="fribidi.dll" Source="Files\fribidi.dll" /> </Component> <Directory Id="extdirectory" Name="ext"> <Component Id="extdir" DiskId="1" Guid="3AB11270-4135-4C8C-9578-B034CEF2659F"> <IniFile Id="extdirINI" Action="addLine" Key="extension_dir" Directory="INSTALLDIR" Name="php.ini" Section="PHP" Value="&quot;[INSTALLDIR]ext&quot;" /> </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" Source="Files\extras\pdf-related\copyright.txt" /> <File Id="filePDFSupport2" Name="COURIE_1.AFM" LongName="Courier-Bold.afm" Source="Files\extras\pdf-related\Courier-Bold.afm" /> <File Id="filePDFSupport3" Name="COURIE_2.AFM" LongName="Courier-BoldOblique.afm" Source="Files\extras\pdf-related\Courier-BoldOblique.afm" /> <File Id="filePDFSupport4" Name="COURIE_3.AFM" LongName="Courier-Oblique.afm" Source="Files\extras\pdf-related\Courier-Oblique.afm" /> <File Id="filePDFSupport5" Name="Courier.afm" Source="Files\extras\pdf-related\Courier.afm" /> <File Id="filePDFSupport6" Name="cp1250.cpg" Source="Files\extras\pdf-related\cp1250.cpg" /> <File Id="filePDFSupport7" Name="cp1250.enc" Source="Files\extras\pdf-related\cp1250.enc" /> <File Id="filePDFSupport8" Name="cp1251.cpg" Source="Files\extras\pdf-related\cp1251.cpg" /> <File Id="filePDFSupport9" Name="cp1252.cpg" Source="Files\extras\pdf-related\cp1252.cpg" /> <File Id="filePDFSupport10" Name="cp1253.cpg" Source="Files\extras\pdf-related\cp1253.cpg" /> <File Id="filePDFSupport11" Name="cp1254.cpg" Source="Files\extras\pdf-related\cp1254.cpg" /> <File Id="filePDFSupport12" Name="cp1255.cpg" Source="Files\extras\pdf-related\cp1255.cpg" /> <File Id="filePDFSupport13" Name="cp1256.cpg" Source="Files\extras\pdf-related\cp1256.cpg" /> <File Id="filePDFSupport14" Name="cp1257.cpg" Source="Files\extras\pdf-related\cp1257.cpg" /> <File Id="filePDFSupport15" Name="cp1258.cpg" Source="Files\extras\pdf-related\cp1258.cpg" /> <File Id="filePDFSupport16" Name="HELVET_1.AFM" LongName="Helvetica-Bold.afm" Source="Files\extras\pdf-related\Helvetica-Bold.afm" /> <File Id="filePDFSupport17" Name="HELVET_2.AFM" LongName="Helvetica-BoldOblique.afm" Source="Files\extras\pdf-related\Helvetica-BoldOblique.afm" /> <File Id="filePDFSupport18" Name="HELVET_3.AFM" LongName="Helvetica-Oblique.afm" Source="Files\extras\pdf-related\Helvetica-Oblique.afm" /> <File Id="filePDFSupport19" Name="HELVET_4.AFM" LongName="Helvetica.afm" Source="Files\extras\pdf-related\Helvetica.afm" /> <File Id="filePDFSupport20" Name="ISO885_1.CPG" LongName="iso8859-10.cpg" Source="Files\extras\pdf-related\iso8859-10.cpg" /> <File Id="filePDFSupport21" Name="ISO885_2.CPG" LongName="iso8859-13.cpg" Source="Files\extras\pdf-related\iso8859-13.cpg" /> <File Id="filePDFSupport22" Name="ISO885_3.CPG" LongName="iso8859-14.cpg" Source="Files\extras\pdf-related\iso8859-14.cpg" /> <File Id="filePDFSupport23" Name="ISO885_4.CPG" LongName="iso8859-15.cpg" Source="Files\extras\pdf-related\iso8859-15.cpg" /> <File Id="filePDFSupport24" Name="ISO885_1.ENC" LongName="iso8859-15.enc" Source="Files\extras\pdf-related\iso8859-15.enc" /> <File Id="filePDFSupport25" Name="ISEA77_1.CPG" LongName="iso8859-16.cpg" Source="Files\extras\pdf-related\iso8859-16.cpg" /> <File Id="filePDFSupport26" Name="ISB090_1.CPG" LongName="iso8859-2.cpg" Source="Files\extras\pdf-related\iso8859-2.cpg" /> <File Id="filePDFSupport27" Name="ISO885_2.ENC" LongName="iso8859-2.enc" Source="Files\extras\pdf-related\iso8859-2.enc" /> <File Id="filePDFSupport28" Name="ISB490_1.CPG" LongName="iso8859-3.cpg" Source="Files\extras\pdf-related\iso8859-3.cpg" /> <File Id="filePDFSupport29" Name="ISB890_1.CPG" LongName="iso8859-4.cpg" Source="Files\extras\pdf-related\iso8859-4.cpg" /> <File Id="filePDFSupport30" Name="ISBC90_1.CPG" LongName="iso8859-5.cpg" Source="Files\extras\pdf-related\iso8859-5.cpg" /> <File Id="filePDFSupport31" Name="ISB0A0_1.CPG" LongName="iso8859-6.cpg" Source="Files\extras\pdf-related\iso8859-6.cpg" /> <File Id="filePDFSupport32" Name="ISB4A0_1.CPG" LongName="iso8859-7.cpg" Source="Files\extras\pdf-related\iso8859-7.cpg" /> <File Id="filePDFSupport33" Name="ISB8A0_1.CPG" LongName="iso8859-8.cpg" Source="Files\extras\pdf-related\iso8859-8.cpg" /> <File Id="filePDFSupport34" Name="ISBCA0_1.CPG" LongName="iso8859-9.cpg" Source="Files\extras\pdf-related\iso8859-9.cpg" /> <File Id="filePDFSupport35" Name="ISO885_3.ENC" LongName="iso8859-9.enc" Source="Files\extras\pdf-related\iso8859-9.enc" /> <File Id="filePDFSupport36" Name="lcdxsr.afm" Source="Files\extras\pdf-related\lcdxsr.afm" /> <File Id="filePDFSupport37" Name="lcdxsr.pfa" Source="Files\extras\pdf-related\lcdxsr.pfa" /> <File Id="filePDFSupport38" Name="pdflib.upr" Source="Files\extras\pdf-related\pdflib.upr" /> <File Id="filePDFSupport39" Name="PRINT__1.PS" LongName="print_glyphs.ps" Source="Files\extras\pdf-related\print_glyphs.ps" /> <File Id="filePDFSupport40" Name="Symbol.afm" Source="Files\extras\pdf-related\Symbol.afm" /> <File Id="filePDFSupport41" Name="TIMES-_1.AFM" LongName="Times-Bold.afm" Source="Files\extras\pdf-related\Times-Bold.afm" /> <File Id="filePDFSupport42" Name="TIMES-_2.AFM" LongName="Times-BoldItalic.afm" Source="Files\extras\pdf-related\Times-BoldItalic.afm" /> <File Id="filePDFSupport43" Name="TIMES-_3.AFM" LongName="Times-Italic.afm" Source="Files\extras\pdf-related\Times-Italic.afm" /> <File Id="filePDFSupport44" Name="TIMES-_4.AFM" LongName="Times-Roman.afm" Source="Files\extras\pdf-related\Times-Roman.afm" /> <File Id="filePDFSupport45" Name="ZAPFDI_1.AFM" LongName="ZapfDingbats.afm" Source="Files\extras\pdf-related\ZapfDingbats.afm" /> </Component> </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="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" /> <File Id="mibsfile27" Name="RMON-MIB.txt" Source="Files\extras\mibs\RMON-MIB.txt" /> <File Id="mibsfile28" Name="SMUX-MIB.txt" Source="Files\extras\mibs\SMUX-MIB.txt" /> <File Id="mibsfile29" Name="SNMP-C_1.TXT" LongName="SNMP-COMMUNITY-MIB.txt" Source="Files\extras\mibs\SNMP-COMMUNITY-MIB.txt" /> <File Id="mibsfile30" Name="SNMP-F_1.TXT" LongName="SNMP-FRAMEWORK-MIB.txt" Source="Files\extras\mibs\SNMP-FRAMEWORK-MIB.txt" /> <File Id="mibsfile31" Name="SNMP-M_1.TXT" LongName="SNMP-MPD-MIB.txt" Source="Files\extras\mibs\SNMP-MPD-MIB.txt" /> <File Id="mibsfile32" Name="SNMP-N_1.TXT" LongName="SNMP-NOTIFICATION-MIB.txt" Source="Files\extras\mibs\SNMP-NOTIFICATION-MIB.txt" /> <File Id="mibsfile33" Name="SNMP-P_1.TXT" LongName="SNMP-PROXY-MIB.txt" Source="Files\extras\mibs\SNMP-PROXY-MIB.txt" /> <File Id="mibsfile34" Name="SNMP-T_1.TXT" LongName="SNMP-TARGET-MIB.txt" Source="Files\extras\mibs\SNMP-TARGET-MIB.txt" /> <File Id="mibsfile35" Name="SNMP-U_1.TXT" LongName="SNMP-USER-BASED-SM-MIB.txt" Source="Files\extras\mibs\SNMP-USER-BASED-SM-MIB.txt" /> <File Id="mibsfile36" Name="SNMP-V_1.TXT" LongName="SNMP-VIEW-BASED-ACM-MIB.txt" Source="Files\extras\mibs\SNMP-VIEW-BASED-ACM-MIB.txt" /> <File Id="mibsfile37" Name="SNMPV2_1.TXT" LongName="SNMPv2-CONF.txt" Source="Files\extras\mibs\SNMPv2-CONF.txt" /> <File Id="mibsfile38" Name="SNMPV2_2.TXT" LongName="SNMPv2-MIB.txt" Source="Files\extras\mibs\SNMPv2-MIB.txt" /> <File Id="mibsfile39" Name="SNMPV2_3.TXT" LongName="SNMPv2-SMI.txt" Source="Files\extras\mibs\SNMPv2-SMI.txt" /> <File Id="mibsfile40" Name="SNMPV2_4.TXT" LongName="SNMPv2-TC.txt" Source="Files\extras\mibs\SNMPv2-TC.txt" /> <File Id="mibsfile41" Name="SNC4A1_1.TXT" LongName="SNMPv2-TM.txt" Source="Files\extras\mibs\SNMPv2-TM.txt" /> <File Id="mibsfile42" Name="TCP-MIB.txt" Source="Files\extras\mibs\TCP-MIB.txt" /> <File Id="mibsfile43" Name="TUNNEL_1.TXT" LongName="TUNNEL-MIB.txt" Source="Files\extras\mibs\TUNNEL-MIB.txt" /> <File Id="mibsfile44" Name="UCD-DE_1.INC" LongName="UCD-DEMO-MIB.inc" Source="Files\extras\mibs\UCD-DEMO-MIB.inc" /> <File Id="mibsfile45" Name="UCD-DE_1.TXT" LongName="UCD-DEMO-MIB.txt" Source="Files\extras\mibs\UCD-DEMO-MIB.txt" /> <File Id="mibsfile46" Name="UCD-DI_1.INC" LongName="UCD-DISKIO-MIB.inc" Source="Files\extras\mibs\UCD-DISKIO-MIB.inc" /> <File Id="mibsfile47" Name="UCD-DI_1.TXT" LongName="UCD-DISKIO-MIB.txt" Source="Files\extras\mibs\UCD-DISKIO-MIB.txt" /> <File Id="mibsfile48" Name="UCD-DL_1.INC" LongName="UCD-DLMOD-MIB.inc" Source="Files\extras\mibs\UCD-DLMOD-MIB.inc" /> <File Id="mibsfile49" Name="UCD-DL_1.TXT" LongName="UCD-DLMOD-MIB.txt" Source="Files\extras\mibs\UCD-DLMOD-MIB.txt" /> <File Id="mibsfile50" Name="UCD-IP_1.INC" LongName="UCD-IPFILTER-MIB.inc" Source="Files\extras\mibs\UCD-IPFILTER-MIB.inc" /> <File Id="mibsfile51" Name="UCD-IP_1.TXT" LongName="UCD-IPFILTER-MIB.txt" Source="Files\extras\mibs\UCD-IPFILTER-MIB.txt" /> <File Id="mibsfile52" Name="UCD-IP_2.INC" LongName="UCD-IPFWACC-MIB.inc" Source="Files\extras\mibs\UCD-IPFWACC-MIB.inc" /> <File Id="mibsfile53" Name="UCD-IP_2.TXT" LongName="UCD-IPFWACC-MIB.txt" Source="Files\extras\mibs\UCD-IPFWACC-MIB.txt" /> <File Id="mibsfile54" Name="UCD-SN_1.TXT" LongName="UCD-SNMP-MIB-OLD.txt" Source="Files\extras\mibs\UCD-SNMP-MIB-OLD.txt" /> <File Id="mibsfile55" Name="UCD-SN_1.INC" LongName="UCD-SNMP-MIB.inc" Source="Files\extras\mibs\UCD-SNMP-MIB.inc" /> <File Id="mibsfile56" Name="UCD-SN_2.TXT" LongName="UCD-SNMP-MIB.txt" Source="Files\extras\mibs\UCD-SNMP-MIB.txt" /> <File Id="mibsfile57" Name="UDP-MIB.txt" Source="Files\extras\mibs\UDP-MIB.txt" /> </Component> </DirectoryRef> </Fragment> </Wix> http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFragment53.wxs?view=markup&rev=1.1 Index: win-installer/ExtensionsFragment53.wxs +++ win-installer/ExtensionsFragment53.wxs <?xml version='1.0' encoding='iso-8859-1'?> <Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'> <Fragment Id='FragmentExtensions'> <DirectoryRef Id='INSTALLDIR'> <Component Id="fdftkDLL" DiskId="1" Guid="C54716D6-F1C6-4366-AD1E-8C2DB1686801"> <File Id="filefdftkDLL" Name="fdftk.dll" Source="Files\fdftk.dll" /> </Component> <Component Id="gds32DLL" DiskId="1" Guid="D70180EF-1AE2-45FF-B79F-DF16056F972D"> <File Id="filegds32DLL" Name="gds32.dll" Source="Files\gds32.dll" /> </Component> <Component Id="libeay32DLL" DiskId="1" Guid="1BF3C9B6-6495-476E-85B8-2843B5F5458D"> <File Id="filelibeay32DLL" Name="libeay32.dll" Source="Files\libeay32.dll" /> </Component> <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="libmysqlDLL" DiskId="1" Guid="4726DE50-BC55-46AC-9622-DEA04AE46E46"> <File Id="filelibmysqlDLL" Name="libmysql.dll" Source="Files\libmysql.dll" /> </Component> <Component Id="ntwdblibDLL" DiskId="1" Guid="7FA2C1EB-5166-4D16-AD36-DEF92A491D8B"> <File Id="filentwdblibDLL" Name="ntwdblib.dll" Source="Files\ntwdblib.dll" /> </Component> <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" /> </Component> <Component Id="yazDLL" DiskId="1" Guid="4C0CE69A-DBE4-4294-88CC-F6E82A3CFCD1"> <File Id="fileyazSLL" Name="yaz.dll" Source="Files\yaz.dll" /> </Component> <Component Id="libswisheDLL" DiskId="1" Guid="4F1FD404-B722-4A1E-997A-474B6F001420"> <File Id="filelibswisheDLL" Name="LIBSWI_1.DLL" LongName="libswish-e.dll" Source="Files\libswish-e.dll" /> </Component> <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" Key="extension_dir" Directory="INSTALLDIR" Name="php.ini" Section="PHP" Value="&quot;[INSTALLDIR]ext&quot;" /> </Component> </Directory> <Directory Id="extrasdirectory" Name="extras"> </Directory> </DirectoryRef> </Fragment> </Wix> http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFragment60.wxs?view=markup&rev=1.1 Index: win-installer/ExtensionsFragment60.wxs +++ win-installer/ExtensionsFragment60.wxs <?xml version='1.0' encoding='iso-8859-1'?> <Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'> <Fragment Id='FragmentExtensions'> <DirectoryRef Id='INSTALLDIR'> <Component Id="fdftkDLL" DiskId="1" Guid="C54716D6-F1C6-4366-AD1E-8C2DB1686801"> <File Id="filefdftkDLL" Name="fdftk.dll" Source="Files\fdftk.dll" /> </Component> <Component Id="gds32DLL" DiskId="1" Guid="D70180EF-1AE2-45FF-B79F-DF16056F972D"> <File Id="filegds32DLL" Name="gds32.dll" Source="Files\gds32.dll" /> </Component> <Component Id="libeay32DLL" DiskId="1" Guid="1BF3C9B6-6495-476E-85B8-2843B5F5458D"> <File Id="filelibeay32DLL" Name="libeay32.dll" Source="Files\libeay32.dll" /> </Component> <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> <Component Id="ntwdblibDLL" DiskId="1" Guid="7FA2C1EB-5166-4D16-AD36-DEF92A491D8B"> <File Id="filentwdblibDLL" Name="ntwdblib.dll" Source="Files\ntwdblib.dll" /> </Component> <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" /> </Component> <Component Id="yazDLL" DiskId="1" Guid="4C0CE69A-DBE4-4294-88CC-F6E82A3CFCD1"> <File Id="fileyazSLL" Name="yaz.dll" Source="Files\yaz.dll" /> </Component> <Component Id="libswisheDLL" DiskId="1" Guid="4F1FD404-B722-4A1E-997A-474B6F001420"> <File Id="filelibswisheDLL" Name="LIBSWI_1.DLL" LongName="libswish-e.dll" Source="Files\libswish-e.dll" /> </Component> <Component Id="fribidiDLL" DiskId="1" Guid="D08A7C40-924B-45B2-8053-C6A5117846B2"> <File Id="filefribidiDLL" Name="fribidi.dll" Source="Files\fribidi.dll" /> </Component> <Directory Id="extdirectory" Name="ext"> <Component Id="extdir" DiskId="1" Guid="3AB11270-4135-4C8C-9578-B034CEF2659F"> <IniFile Id="extdirINI" Action="addLine" Key="extension_dir" Directory="INSTALLDIR" Name="php.ini" Section="PHP" Value="&quot;[INSTALLDIR]ext&quot;" /> </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" Source="Files\extras\pdf-related\copyright.txt" /> <File Id="filePDFSupport2" Name="COURIE_1.AFM" LongName="Courier-Bold.afm" Source="Files\extras\pdf-related\Courier-Bold.afm" /> <File Id="filePDFSupport3" Name="COURIE_2.AFM" LongName="Courier-BoldOblique.afm" Source="Files\extras\pdf-related\Courier-BoldOblique.afm" /> <File Id="filePDFSupport4" Name="COURIE_3.AFM" LongName="Courier-Oblique.afm" Source="Files\extras\pdf-related\Courier-Oblique.afm" /> <File Id="filePDFSupport5" Name="Courier.afm" Source="Files\extras\pdf-related\Courier.afm" /> <File Id="filePDFSupport6" Name="cp1250.cpg" Source="Files\extras\pdf-related\cp1250.cpg" /> <File Id="filePDFSupport7" Name="cp1250.enc" Source="Files\extras\pdf-related\cp1250.enc" /> <File Id="filePDFSupport8" Name="cp1251.cpg" Source="Files\extras\pdf-related\cp1251.cpg" /> <File Id="filePDFSupport9" Name="cp1252.cpg" Source="Files\extras\pdf-related\cp1252.cpg" /> <File Id="filePDFSupport10" Name="cp1253.cpg" Source="Files\extras\pdf-related\cp1253.cpg" /> <File Id="filePDFSupport11" Name="cp1254.cpg" Source="Files\extras\pdf-related\cp1254.cpg" /> <File Id="filePDFSupport12" Name="cp1255.cpg" Source="Files\extras\pdf-related\cp1255.cpg" /> <File Id="filePDFSupport13" Name="cp1256.cpg" Source="Files\extras\pdf-related\cp1256.cpg" /> <File Id="filePDFSupport14" Name="cp1257.cpg" Source="Files\extras\pdf-related\cp1257.cpg" /> <File Id="filePDFSupport15" Name="cp1258.cpg" Source="Files\extras\pdf-related\cp1258.cpg" /> <File Id="filePDFSupport16" Name="HELVET_1.AFM" LongName="Helvetica-Bold.afm" Source="Files\extras\pdf-related\Helvetica-Bold.afm" /> <File Id="filePDFSupport17" Name="HELVET_2.AFM" LongName="Helvetica-BoldOblique.afm" Source="Files\extras\pdf-related\Helvetica-BoldOblique.afm" /> <File Id="filePDFSupport18" Name="HELVET_3.AFM" LongName="Helvetica-Oblique.afm" Source="Files\extras\pdf-related\Helvetica-Oblique.afm" /> <File Id="filePDFSupport19" Name="HELVET_4.AFM" LongName="Helvetica.afm" Source="Files\extras\pdf-related\Helvetica.afm" /> <File Id="filePDFSupport20" Name="ISO885_1.CPG" LongName="iso8859-10.cpg" Source="Files\extras\pdf-related\iso8859-10.cpg" /> <File Id="filePDFSupport21" Name="ISO885_2.CPG" LongName="iso8859-13.cpg" Source="Files\extras\pdf-related\iso8859-13.cpg" /> <File Id="filePDFSupport22" Name="ISO885_3.CPG" LongName="iso8859-14.cpg" Source="Files\extras\pdf-related\iso8859-14.cpg" /> <File Id="filePDFSupport23" Name="ISO885_4.CPG" LongName="iso8859-15.cpg" Source="Files\extras\pdf-related\iso8859-15.cpg" /> <File Id="filePDFSupport24" Name="ISO885_1.ENC" LongName="iso8859-15.enc" Source="Files\extras\pdf-related\iso8859-15.enc" /> <File Id="filePDFSupport25" Name="ISEA77_1.CPG" LongName="iso8859-16.cpg" Source="Files\extras\pdf-related\iso8859-16.cpg" /> <File Id="filePDFSupport26" Name="ISB090_1.CPG" LongName="iso8859-2.cpg" Source="Files\extras\pdf-related\iso8859-2.cpg" /> <File Id="filePDFSupport27" Name="ISO885_2.ENC" LongName="iso8859-2.enc" Source="Files\extras\pdf-related\iso8859-2.enc" /> <File Id="filePDFSupport28" Name="ISB490_1.CPG" LongName="iso8859-3.cpg" Source="Files\extras\pdf-related\iso8859-3.cpg" /> <File Id="filePDFSupport29" Name="ISB890_1.CPG" LongName="iso8859-4.cpg" Source="Files\extras\pdf-related\iso8859-4.cpg" /> <File Id="filePDFSupport30" Name="ISBC90_1.CPG" LongName="iso8859-5.cpg" Source="Files\extras\pdf-related\iso8859-5.cpg" /> <File Id="filePDFSupport31" Name="ISB0A0_1.CPG" LongName="iso8859-6.cpg" Source="Files\extras\pdf-related\iso8859-6.cpg" /> <File Id="filePDFSupport32" Name="ISB4A0_1.CPG" LongName="iso8859-7.cpg" Source="Files\extras\pdf-related\iso8859-7.cpg" /> <File Id="filePDFSupport33" Name="ISB8A0_1.CPG" LongName="iso8859-8.cpg" Source="Files\extras\pdf-related\iso8859-8.cpg" /> <File Id="filePDFSupport34" Name="ISBCA0_1.CPG" LongName="iso8859-9.cpg" Source="Files\extras\pdf-related\iso8859-9.cpg" /> <File Id="filePDFSupport35" Name="ISO885_3.ENC" LongName="iso8859-9.enc" Source="Files\extras\pdf-related\iso8859-9.enc" /> <File Id="filePDFSupport36" Name="lcdxsr.afm" Source="Files\extras\pdf-related\lcdxsr.afm" /> <File Id="filePDFSupport37" Name="lcdxsr.pfa" Source="Files\extras\pdf-related\lcdxsr.pfa" /> <File Id="filePDFSupport38" Name="pdflib.upr" Source="Files\extras\pdf-related\pdflib.upr" /> <File Id="filePDFSupport39" Name="PRINT__1.PS" LongName="print_glyphs.ps" Source="Files\extras\pdf-related\print_glyphs.ps" /> <File Id="filePDFSupport40" Name="Symbol.afm" Source="Files\extras\pdf-related\Symbol.afm" /> <File Id="filePDFSupport41" Name="TIMES-_1.AFM" LongName="Times-Bold.afm" Source="Files\extras\pdf-related\Times-Bold.afm" /> <File Id="filePDFSupport42" Name="TIMES-_2.AFM" LongName="Times-BoldItalic.afm" Source="Files\extras\pdf-related\Times-BoldItalic.afm" /> <File Id="filePDFSupport43" Name="TIMES-_3.AFM" LongName="Times-Italic.afm" Source="Files\extras\pdf-related\Times-Italic.afm" /> <File Id="filePDFSupport44" Name="TIMES-_4.AFM" LongName="Times-Roman.afm" Source="Files\extras\pdf-related\Times-Roman.afm" /> <File Id="filePDFSupport45" Name="ZAPFDI_1.AFM" LongName="ZapfDingbats.afm" Source="Files\extras\pdf-related\ZapfDingbats.afm" /> </Component> </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="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" /> <File Id="mibsfile27" Name="RMON-MIB.txt" Source="Files\extras\mibs\RMON-MIB.txt" /> <File Id="mibsfile28" Name="SMUX-MIB.txt" Source="Files\extras\mibs\SMUX-MIB.txt" /> <File Id="mibsfile29" Name="SNMP-C_1.TXT" LongName="SNMP-COMMUNITY-MIB.txt" Source="Files\extras\mibs\SNMP-COMMUNITY-MIB.txt" /> <File Id="mibsfile30" Name="SNMP-F_1.TXT" LongName="SNMP-FRAMEWORK-MIB.txt" Source="Files\extras\mibs\SNMP-FRAMEWORK-MIB.txt" /> <File Id="mibsfile31" Name="SNMP-M_1.TXT" LongName="SNMP-MPD-MIB.txt" Source="Files\extras\mibs\SNMP-MPD-MIB.txt" /> <File Id="mibsfile32" Name="SNMP-N_1.TXT" LongName="SNMP-NOTIFICATION-MIB.txt" Source="Files\extras\mibs\SNMP-NOTIFICATION-MIB.txt" /> <File Id="mibsfile33" Name="SNMP-P_1.TXT" LongName="SNMP-PROXY-MIB.txt" Source="Files\extras\mibs\SNMP-PROXY-MIB.txt" /> <File Id="mibsfile34" Name="SNMP-T_1.TXT" LongName="SNMP-TARGET-MIB.txt" Source="Files\extras\mibs\SNMP-TARGET-MIB.txt" /> <File Id="mibsfile35" Name="SNMP-U_1.TXT" LongName="SNMP-USER-BASED-SM-MIB.txt" Source="Files\extras\mibs\SNMP-USER-BASED-SM-MIB.txt" /> <File Id="mibsfile36" Name="SNMP-V_1.TXT" LongName="SNMP-VIEW-BASED-ACM-MIB.txt" Source="Files\extras\mibs\SNMP-VIEW-BASED-ACM-MIB.txt" /> <File Id="mibsfile37" Name="SNMPV2_1.TXT" LongName="SNMPv2-CONF.txt" Source="Files\extras\mibs\SNMPv2-CONF.txt" /> <File Id="mibsfile38" Name="SNMPV2_2.TXT" LongName="SNMPv2-MIB.txt" Source="Files\extras\mibs\SNMPv2-MIB.txt" /> <File Id="mibsfile39" Name="SNMPV2_3.TXT" LongName="SNMPv2-SMI.txt" Source="Files\extras\mibs\SNMPv2-SMI.txt" /> <File Id="mibsfile40" Name="SNMPV2_4.TXT" LongName="SNMPv2-TC.txt" Source="Files\extras\mibs\SNMPv2-TC.txt" /> <File Id="mibsfile41" Name="SNC4A1_1.TXT" LongName="SNMPv2-TM.txt" Source="Files\extras\mibs\SNMPv2-TM.txt" /> <File Id="mibsfile42" Name="TCP-MIB.txt" Source="Files\extras\mibs\TCP-MIB.txt" /> <File Id="mibsfile43" Name="TUNNEL_1.TXT" LongName="TUNNEL-MIB.txt" Source="Files\extras\mibs\TUNNEL-MIB.txt" /> <File Id="mibsfile44" Name="UCD-DE_1.INC" LongName="UCD-DEMO-MIB.inc" Source="Files\extras\mibs\UCD-DEMO-MIB.inc" /> <File Id="mibsfile45" Name="UCD-DE_1.TXT" LongName="UCD-DEMO-MIB.txt" Source="Files\extras\mibs\UCD-DEMO-MIB.txt" /> <File Id="mibsfile46" Name="UCD-DI_1.INC" LongName="UCD-DISKIO-MIB.inc" Source="Files\extras\mibs\UCD-DISKIO-MIB.inc" /> <File Id="mibsfile47" Name="UCD-DI_1.TXT" LongName="UCD-DISKIO-MIB.txt" Source="Files\extras\mibs\UCD-DISKIO-MIB.txt" /> <File Id="mibsfile48" Name="UCD-DL_1.INC" LongName="UCD-DLMOD-MIB.inc" Source="Files\extras\mibs\UCD-DLMOD-MIB.inc" /> <File Id="mibsfile49" Name="UCD-DL_1.TXT" LongName="UCD-DLMOD-MIB.txt" Source="Files\extras\mibs\UCD-DLMOD-MIB.txt" /> <File Id="mibsfile50" Name="UCD-IP_1.INC" LongName="UCD-IPFILTER-MIB.inc" Source="Files\extras\mibs\UCD-IPFILTER-MIB.inc" /> <File Id="mibsfile51" Name="UCD-IP_1.TXT" LongName="UCD-IPFILTER-MIB.txt" Source="Files\extras\mibs\UCD-IPFILTER-MIB.txt" /> <File Id="mibsfile52" Name="UCD-IP_2.INC" LongName="UCD-IPFWACC-MIB.inc" Source="Files\extras\mibs\UCD-IPFWACC-MIB.inc" /> <File Id="mibsfile53" Name="UCD-IP_2.TXT" LongName="UCD-IPFWACC-MIB.txt" Source="Files\extras\mibs\UCD-IPFWACC-MIB.txt" /> <File Id="mibsfile54" Name="UCD-SN_1.TXT" LongName="UCD-SNMP-MIB-OLD.txt" Source="Files\extras\mibs\UCD-SNMP-MIB-OLD.txt" /> <File Id="mibsfile55" Name="UCD-SN_1.INC" LongName="UCD-SNMP-MIB.inc" Source="Files\extras\mibs\UCD-SNMP-MIB.inc" /> <File Id="mibsfile56" Name="UCD-SN_2.TXT" LongName="UCD-SNMP-MIB.txt" Source="Files\extras\mibs\UCD-SNMP-MIB.txt" /> <File Id="mibsfile57" Name="UDP-MIB.txt" Source="Files\extras\mibs\UDP-MIB.txt" /> </Component> </DirectoryRef> </Fragment> </Wix> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?view=markup&rev=1.1 Index: win-installer/PHPInstallerBase53.wxs +++ win-installer/PHPInstallerBase53.wxs <?xml version="1.0" encoding="utf-8"?> <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Product Name="PHP 5.2.0" Id="A062A356-1B4E-4367-8E5B-26363021051B" UpgradeCode="91C7AD14-5A1B-4EB5-98B6-C0A9E4918CA9" Language="1033" Codepage="1252" Version="5.2.0" Manufacturer="The PHP Group"> <Package Id="????????-????-????-????-????????????" Keywords="Installer" Description="PHP Installer" Comments="PHP" Manufacturer="The PHP Group" InstallerVersion="100" Languages="1033" Compressed="yes" SummaryCodepage="1252" InstallPrivileges="elevated" /> <Upgrade Id="91C7AD14-5A1B-4EB5-98B6-C0A9E4918CA9"> <UpgradeVersion Property='OLDVERSION' MigrateFeatures="yes" IncludeMinimum='yes' Minimum='5.2.0' /> </Upgrade> <Condition Message="You need to be an administrator to install PHP using this installer."> Privileged </Condition> <Condition Message="PHP requires Windows NT/2000/XP/2003 or later to install"> <![CDATA[( VersionNT < 400 ) OR ( Version9x <> 0 )]]> </Condition> <Media Id="1" Cabinet="PHP.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1"/> <Property Id="DiskPrompt" Value="PHP Installer"/> <Property Id="ALLUSERS">1</Property> <Property Id="PHPINIEXISTS"> <DirectorySearch Id="CheckFileDir" Path="[INSTALLDIR]" Depth="0"> <FileSearch Id="CheckFile" Name="php.ini"/> </DirectorySearch> </Property> <Property Id="XITAMIDIR"> <RegistrySearch Id="xitamiRegistry" Root="HKLM" Key="Software\iMatrix\Installed Components\Xitami" Type="raw" Name="Directory"/> </Property> <Property Id="SAMBARDIR"> <RegistrySearch Id="sambarRegistry" Root="HKLM" Key="SOFTWARE\Sambar Technologies\Sambar Server" Type="directory" Name="Installation Dir"> <DirectorySearch Id="sambarConfigDir" Path="config"/> </RegistrySearch> </Property> <Property Id="APACHEREGDIR"> <RegistrySearch Id="apacheRegistry" Root="HKLM" Key="Software\PHP" Type="raw" Name="ApacheDir"/> </Property> <CustomAction Id='AssignAPACHEDIR' Property='APACHEDIR' Value='[%ProgramFiles]' /> <CustomAction Id='AssignAPACHEDIR2' Property='APACHEDIR' Value='[APACHEREGDIR]' /> <InstallUISequence> <Custom Action="AssignAPACHEDIR" After="CostInitialize">NOT APACHEDIR</Custom> <Custom Action="AssignAPACHEDIR2" After="CostInitialize">APACHEREGDIR</Custom> </InstallUISequence> <Property Id="WEBSERVERPICKER"> <RegistrySearch Id="webservertype" Root="HKLM" Key="Software\PHP" Type="raw" Name="WebServerType"/> </Property> <Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="ProgramFilesFolder" Name="PFiles"> <Directory Id="INSTALLDIR" Name="PHP"> <Component Id="installTXT" DiskId="1" Guid="D1055308-60DA-4C10-A29B-E582D0A3D675"> <File Id="file3" Name="install.txt" Source="Files\install.txt"/> </Component> <Component Id="licenseTXT" DiskId="1" Guid="9D6E2B5F-F334-4874-B57F-1D4B5A28D17C"> <File Id="file8" Name="license.txt" Source="Files\license.txt"> <Shortcut Id="startmenuManual" Directory="ProgramMenuDir" Name="License" LongName="License"/> </File> </Component> <Component Id="newsTXT" DiskId="1" Guid="459AFF29-F8F5-4F0F-BC43-0DD4AA3D71F0"> <File Id="file10" Name="news.txt" Source="Files\news.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"> <File Id="file13" Name="php-win.exe" Source="Files\php-win.exe"/> </Component> <Component Id="RegisterPHPFilesREG" DiskId="1" Guid="77825049-82F0-4394-A246-A7D2F07BC5BC"> <ProgId Id="PHPFile" Description="PHP Script"> <Extension Id="php" ContentType="application/php"> <Verb Id="open" Sequence="10" Command="Run" Target="[!file13]" Argument="&quot;%1&quot;"/> </Extension> </ProgId> </Component> <Component Id="PHPRegistry" DiskId="1" Guid="1BFEB5D8-B6C0-49E4-918C-A9D52479EC84"> <Registry Id='PHPRegistryInstallDir' Root='HKLM' Key='Software\PHP' Name='InstallDir' Action='write' Type='string' Value='[INSTALLDIR]' /> </Component> <Component Id="phpEXE" DiskId="1" Guid="65C8E630-59D4-41FC-99C5-54E99C74968F"> <File Id="file14" Name="php.exe" Source="Files\php.exe"/> <Environment Id="phpEXEAddToPath" Name="PATH" Action="create" System="yes" Part="first" Value="[INSTALLDIR]"/> <Environment Id="PHPRC" Name="PHPRC" Action="create" System="yes" Part="all" Value="[INSTALLDIR]"/> </Component> <Component Id="phpGIF" DiskId="1" Guid="962C10B2-FD98-4D90-8607-68DE0932A814"> <File Id="file15" Name="php.gif" Source="Files\php.gif"/> </Component> <Component Id="phprecommendedINI" DiskId="1" Guid="B32D6227-3160-4D57-9724-0B35DC128519" Permanent="yes"> <File Id="file17" Name="PHP_2.INI" LongName="php.ini" Source="Files\php.ini" > <Shortcut Id="startmenuPHPINI" Directory="ProgramMenuDir" Name="php.ini" LongName="php.ini"/> </File> <IniFile Id="uploadtmpdirINI" Action="addLine" Key="upload_tmp_dir" Directory="INSTALLDIR" Name="php.ini" Section="PHP" Value="&quot;[%windir]\Temp&quot;"/> <IniFile Id="sessionsavepathINI" Action="addLine" Key="session.save_path" Directory="INSTALLDIR" Name="php.ini" Section="PHP" Value="&quot;[%windir]\Temp&quot;"/> <Condition>NOT PHPINIEXISTS</Condition> </Component> <Component Id="php5embedLIB" DiskId="1" Guid="8C0B065E-41DB-43DB-ABB2-716BE38988C7"> <File Id="file22" Name="PHP5EM_1.LIB" LongName="php5embed.lib" Source="Files\php5embed.lib"/> </Component> <Component Id="win2003eventlog" DiskId="1" Guid="E4C43E12-F31C-4A8C-A084-4E604274D4C9"> <Registry Id="w2k3EventMessageFile" Root="HKLM" Key="System\CurrentControlSet\Services\EventLog\Application\PHP" Action="write" Type="string" Name="EventMessageFile" Value="[!INSTALLDIR]\dev\php5ts.dll"/> <Registry Id="w2k3TypesSupported" Root="HKLM" Key="System\CurrentControlSet\Services\EventLog\Application\PHP" Action="write" Type="integer" Name="TypesSupported" Value="7"/> <Condition>VersionNT = 502</Condition> </Component> <Component Id="php5tsDLL" DiskId="1" Guid="14A95C34-564F-4BF9-BFC7-0DAA48A96BA2"> <File Id="file25" Name="php5ts.dll" Source="Files\php5ts.dll"/> </Component> <Component Id="phpCHM" DiskId="1" Guid="43C45330-3624-11DC-999C-478455D89593"> <File Id="file182" Name="PHP_MA_1.DLL" LongName="php_manual_en.chm" Source="Files\php_manual_en.chm"> <Shortcut Id="startmenuphpCMH" Directory="ProgramMenuDir" Name="Manual" LongName="PHP Manual"/> </File> </Component> <Component Id="Empty" DiskId="1" Guid="24C87A13-FDBA-489B-AE2D-F9406EBA265A"/> <Directory Id="devdirectory" Name="dev"> <Component Id="php5tsLIB" DiskId="1" Guid="52593C5C-6709-49B9-B1C0-6729C977DE65"> <File Id="file30" Name="php5ts.lib" Source="Files\dev\php5ts.lib"/> </Component> </Directory> </Directory> </Directory> <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs"> <Directory Id="ProgramMenuDir" Name="PHP5" LongName="PHP 5" /> </Directory> </Directory> <Feature AllowAdvertise="no" Id="Complete" Title="$(loc.FeatureCompleteTitle)" Description="$(loc.FeatureCompleteDescription)" TypicalDefault="install" Display="expand" ConfigurableDirectory="INSTALLDIR" Level="1"> <ComponentRef Id="licenseTXT"/> <ComponentRef Id="newsTXT"/> <ComponentRef Id="installTXT"/> <ComponentRef Id="phpGIF"/> <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> <Feature AllowAdvertise="no" Id="ScriptExecutable" Title="$(loc.FeatureScriptExecutableTitle)" Description="$(loc.FeatureScriptExecutableDescription)" Level="10"> <ComponentRef Id="phpwinEXE"/> <Feature AllowAdvertise="no" Id="RegisterPHPFiles" Title="$(loc.FeatureRegisterPHPFilesTitle)" Description="$(loc.FeatureRegisterPHPFilesDescription)" Level="10"> <ComponentRef Id="RegisterPHPFilesREG"/> </Feature> </Feature> </Feature> <FeatureRef Id="Extensions"/> <Feature AllowAdvertise="no" Id="WebServers" Title="$(loc.FeatureWebServersTitle)" Description="$(loc.FeatureWebServersDescription)" Display="hidden" Level="10"> <ComponentRef Id="Empty"/> <Feature AllowAdvertise="no" Id="apache13" Title="$(loc.Featureapache13Title)" Description="$(loc.Featureapache13Description)" Level="10"> <ComponentRef Id="php5apacheDLL"/> <ComponentRef Id="php5apache_hooksDLL"/> <ComponentRef Id="phpwinEXE"/> <ComponentRef Id="apache13registry"/> </Feature> <Feature AllowAdvertise="no" Id="apache20" Title="$(loc.Featureapache20Title)" Description="$(loc.Featureapache20Description)" Level="10"> <ComponentRef Id="php5apache2DLL"/> <ComponentRef Id="php5apache2_filterDLL"/> <ComponentRef Id="php5apache_hooksDLL"/> <ComponentRef Id="phpwinEXE"/> <ComponentRef Id="apache20registry"/> </Feature> <Feature AllowAdvertise="no" Id="apache22" Title="$(loc.Featureapache22Title)" Description="$(loc.Featureapache22Description)" Level="10"> <ComponentRef Id="php5apache2_2DLL"/> <ComponentRef Id="php5apache2_2_filterDLL"/> <ComponentRef Id="php5apache_hooksDLL"/> <ComponentRef Id="phpwinEXE"/> <ComponentRef Id="apache22registry"/> </Feature> <Feature AllowAdvertise="no" Id="apacheCGI" Title="$(loc.FeatureapacheCGITitle)" Description="$(loc.FeatureapacheCGIDescription)" Level="1"> <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="cgiforceredirect"/> <ComponentRef Id="phpwinEXE"/> <ComponentRef Id="apacheCGIregistry"/> </Feature> <Feature AllowAdvertise="no" Id="iis4ISAPI" Title="$(loc.Featureiis4ISAPITitle)" Description="$(loc.Featureiis4ISAPIDescription)" Level="10"> <ComponentRef Id="php5isapiDLL"/> <ComponentRef Id="iis4ISAPIregistry"/> </Feature> <Feature AllowAdvertise="no" Id="iis4CGI" Title="$(loc.Featureiis4CGITitle)" Description="$(loc.Featureiis4CGIDescription)" Level="1"> <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="cgiforceredirect"/> <ComponentRef Id="iis3CGI"/> <ComponentRef Id="iis4CGIregistry"/> </Feature> <Feature AllowAdvertise="no" Id="iis4FastCGI" Title="$(loc.Featureiis4FastCGITitle)" Description="$(loc.Featureiis4FastCGIDescription)" Level="1"> <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="cgiforceredirect"/> <ComponentRef Id="iis4FastCGIregistry"/> </Feature> <Feature AllowAdvertise="no" Id="nsapi" Title="$(loc.FeaturensapiTitle)" Description="$(loc.FeaturensapiDescription)" Level="10"> <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="nsapiregistry"/> </Feature> <Feature AllowAdvertise="no" Id="xitami" Title="$(loc.FeaturexitamiTitle)" Description="$(loc.FeaturexitamiDescription)" Level="1"> <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="cgiforceredirect"/> <ComponentRef Id="cgifixpathinfo"/> <ComponentRef Id="xitamiINI"/> <ComponentRef Id="xitamiregistry"/> </Feature> <Feature AllowAdvertise="no" Id="sambar" Title="$(loc.FeaturesambarTitle)" Description="$(loc.FeaturesambarDescription)" Level="1"> <ComponentRef Id="php5isapiDLL"/> <ComponentRef Id="sambarINI"/> <ComponentRef Id="sambarregistry"/> </Feature> <Feature AllowAdvertise="no" Id="netserve" Title="$(loc.FeaturenetserveTitle)" Description="$(loc.FeaturenetserveDescription)" Level="1"> <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="cgiregistry"/> </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)" Description="$(loc.FeaturecgiDescription)" Level="1"> <ComponentRef Id="noconfigregistry"/> </Feature> </Feature> <Feature AllowAdvertise="no" Id="extras" Title="$(loc.FeatureextrasTitle)" Description="$(loc.FeatureextrasDescription)" Level="10"> <ComponentRef Id="Empty"/> <Feature AllowAdvertise="no" Id="Manual" Title="$(loc.FeatureManualTitle)" Description="$(loc.FeatureManualDescription)" Level="1"> <ComponentRef Id="phpCHM"/> </Feature> </Feature> </Feature> <Binary Id="PHPInstallerScripts" SourceFile="PHPInstallerScripts52.vbs" /> <CustomAction Id="netserveCGIInterpretersadd" ExeCommand="&quot;[%ProgramFiles]NetServe Web Server\config.exe /add CGIInterpreters php^|[INSTALLDIR]php-cgi.exe']" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="netserveCustomCGIVariablesadd" ExeCommand="&quot;[%ProgramFiles]NetServe Web Server\config.exe /add CustomCGIVariables REDIRECT_STATUS^|200']" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="netserveCGIInterpretersremove" ExeCommand="&quot;[%ProgramFiles]NetServe Web Server\config.exe /del CGIInterpreters php^|[INSTALLDIR]php-cgi.exe']" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIadd" ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET CONFIG /section:system.webServer/fastCGI /+[fullPath='[INSTALLDIR]php-cgi.exe']" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700CGI" ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET CONFIG -section:handlers &quot;-+[name='PHP-CGI',path='*.php',verb='GET,HEAD,POST',modules='CgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe'&quot;" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGI" ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET CONFIG /section:system.webServer/handlers /+[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700ISAPI" ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET CONFIG -section:handlers &quot;-+[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'&quot;" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700RCGI" ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET CONFIG -section:isapiCgiRestriction &quot;-+[path='[INSTALLDIR]php-cgi.exe',allowed='true',groupId='PHP',description='PHP']&quot;" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700RISAPI" ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET CONFIG -section:isapiCgiRestriction &quot;-+[path='[INSTALLDIR]php5isapi.dll',allowed='true',groupId='PHP',description='PHP']&quot;" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700CGIremove" ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET CONFIG -section:handlers &quot;--[name='PHP-CGI',path='*.php',verb='GET,HEAD,POST',modules='CgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe'&quot;" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIremove" ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET CONFIG /section:system.webServer/handlers /-[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700ISAPIremove" ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET CONFIG -section:handlers &quot;--[name='PHP-ISAPI',path='*.php',verb='GET,HEAD,POST',modules='IsapiModule',scriptProcessor='[INSTALLDIR]php5isapi.dll'&quot;" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iisextVBSCGI" ExeCommand="cscript &quot;[WindowsFolder]system32\iisext.vbs&quot; /AddFile &quot;[INSTALLDIR]php-cgi.exe&quot; 1 PHP 1 &quot;PHP: Hypertext Processor&quot;" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iisextVBSISAPI" ExeCommand="cscript &quot;[WindowsFolder]system32\iisext.vbs&quot; /AddFile &quot;[INSTALLDIR]php5isapi.dll&quot; 1 PHP 1 &quot;PHP: Hypertext Processor&quot;" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iisextVBSCGIremove" ExeCommand="cscript &quot;[WindowsFolder]system32\iisext.vbs&quot; /rmfile &quot;[INSTALLDIR]php-cgi.exe&quot;" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iisextVBSISAPIremove" ExeCommand="cscript &quot;[WindowsFolder]system32\iisext.vbs&quot; /rmfile &quot;[INSTALLDIR]php5isapi.dll&quot;" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="fcgiconfigJSFastCGI" ExeCommand="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -add -section:&quot;PHP&quot; -extension:php -path:&quot;[INSTALLDIR]php-cgi.exe&quot;" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="fcgiconfigJSFastCGIremove" ExeCommand="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove -section:&quot;PHP&quot;ß" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="configIIS4" BinaryKey="PHPInstallerScripts" Return="check" VBScriptCall="configIIS4" /> <CustomAction Id="unconfigIIS4" BinaryKey="PHPInstallerScripts" Return="check" VBScriptCall="unconfigIIS4" /> <CustomAction Id="configApache" BinaryKey="PHPInstallerScripts" Return="check" VBScriptCall="configApache" /> <CustomAction Id="unconfigApache" BinaryKey="PHPInstallerScripts" Return="check" VBScriptCall="unconfigApache" /> <InstallExecuteSequence> <Custom Action="netserveCGIInterpretersadd" After="InstallFinalize"> <![CDATA[&netserve = 3]]> </Custom> <Custom Action="netserveCustomCGIVariablesadd" After="InstallFinalize"> <![CDATA[&netserve = 3]]> </Custom> <Custom Action="netserveCGIInterpretersremove" After="InstallFinalize"> <![CDATA[&netserve = 2]]> </Custom> <Custom Action="iis700FastCGIadd" After="InstallFinalize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700FastCGI" After="InstallFinalize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700CGI" After="InstallFinalize"> <![CDATA[VersionNT >= 600 AND &iis4CGI = 3]]> </Custom> <Custom Action="iis700ISAPI" After="InstallFinalize"> <![CDATA[VersionNT >= 600 AND &iis4ISAPI = 3]]> </Custom> <Custom Action="iis700RCGI" After="InstallFinalize"> <![CDATA[VersionNT >= 600 AND &iis4CGI = 3]]> </Custom> <Custom Action="iis700RISAPI" After="InstallFinalize"> <![CDATA[VersionNT >= 600 AND &iis4ISAPI = 3]]> </Custom> <Custom Action="iis700CGIremove" After="InstallFinalize"> <![CDATA[VersionNT >= 600 AND &iis4CGI = 2]]> </Custom> <Custom Action="iis700FastCGIremove" After="InstallFinalize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="iis700ISAPIremove" After="InstallFinalize"> <![CDATA[VersionNT >= 600 AND &iis4ISAPI = 2]]> </Custom> <Custom Action="iisextVBSCGI" After="InstallFinalize"> <![CDATA[VersionNT = 502 AND &iis4CGI = 3]]> </Custom> <Custom Action="iisextVBSISAPI" After="InstallFinalize"> <![CDATA[VersionNT = 502 AND &iis4ISAPI = 3]]> </Custom> <Custom Action="iisextVBSCGIremove" After="InstallFinalize"> <![CDATA[VersionNT = 502 AND &iis4CGI = 2]]> </Custom> <Custom Action="iisextVBSISAPIremove" After="InstallFinalize"> <![CDATA[VersionNT = 502 AND &iis4ISAPI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGI" After="InstallFinalize"> <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremove" After="InstallFinalize"> <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> </Custom> <Custom Action="unconfigIIS4" After="InstallValidate"> <![CDATA[VersionNT < 600 AND (&iis4ISAPI = 2 OR &iis4CGI = 2 OR &iis4FastCGI = 2)]]> </Custom> <Custom Action="configIIS4" After="InstallFinalize"> <![CDATA[VersionNT < 600 AND (&iis4ISAPI = 3 OR &iis4CGI = 3 OR &iis4FastCGI = 3)]]> </Custom> <Custom Action="unconfigApache" After="InstallValidate"> <![CDATA[&apache13 = 2 OR &apache20 = 2 OR &apache22 = 2 OR &apacheCGI = 2]]> </Custom> <Custom Action="configApache" After="InstallFinalize"> <![CDATA[&apache13 = 3 OR &apache20 = 3 OR &apache22 = 3 OR &apacheCGI = 3]]> </Custom> <RemoveExistingProducts After="InstallValidate" /> </InstallExecuteSequence> <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/> <Property Id="WIXUI_APACHEDIR" Value="APACHEDIR"/> <UIRef Id="WixUI_FeatureTreePHP"/> </Product> </Wix> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?view=markup&rev=1.1 Index: win-installer/PHPInstallerBase53NTS.wxs +++ win-installer/PHPInstallerBase53NTS.wxs <?xml version="1.0" encoding="utf-8"?> <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Product Name="PHP 5.2.0" Id="A062A356-1B4E-4367-8E5B-26363021051B" UpgradeCode="91C7AD14-5A1B-4EB5-98B6-C0A9E4918CA9" Language="1033" Codepage="1252" Version="5.2.0" Manufacturer="The PHP Group"> <Package Id="????????-????-????-????-????????????" Keywords="Installer" Description="PHP Installer" Comments="PHP" Manufacturer="The PHP Group" InstallerVersion="100" Languages="1033" Compressed="yes" SummaryCodepage="1252" InstallPrivileges="elevated" /> <Upgrade Id="91C7AD14-5A1B-4EB5-98B6-C0A9E4918CA9"> <UpgradeVersion Property='OLDVERSION' MigrateFeatures="yes" IncludeMinimum='yes' Minimum='5.2.0' /> </Upgrade> <Condition Message="You need to be an administrator to install PHP using this installer."> Privileged </Condition> <Condition Message="PHP requires Windows NT/2000/XP/2003 or later to install"> <![CDATA[( VersionNT < 400 ) OR ( Version9x <> 0 )]]> </Condition> <Media Id="1" Cabinet="PHP.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1"/> <Property Id="DiskPrompt" Value="PHP Installer"/> <Property Id="ALLUSERS">1</Property> <Property Id="PHPINIEXISTS"> <DirectorySearch Id="CheckFileDir" Path="[INSTALLDIR]" Depth="0"> <FileSearch Id="CheckFile" Name="php.ini"/> </DirectorySearch> </Property> <Property Id="APACHEREGDIR"> <RegistrySearch Id="apacheRegistry" Root="HKLM" Key="Software\PHP" Type="raw" Name="ApacheDir"/> </Property> <CustomAction Id='AssignAPACHEDIR' Property='APACHEDIR' Value='[%ProgramFiles]' /> <CustomAction Id='AssignAPACHEDIR2' Property='APACHEDIR' Value='[APACHEREGDIR]' /> <InstallUISequence> <Custom Action="AssignAPACHEDIR" After="CostInitialize">NOT APACHEDIR</Custom> <Custom Action="AssignAPACHEDIR2" After="CostInitialize">APACHEREGDIR</Custom> </InstallUISequence> <Property Id="WEBSERVERPICKER"> <RegistrySearch Id="webservertype" Root="HKLM" Key="Software\PHP" Type="raw" Name="WebServerType"/> </Property> <Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="ProgramFilesFolder" Name="PFiles"> <Directory Id="INSTALLDIR" Name="PHP"> <Component Id="installTXT" DiskId="1" Guid="D1055308-60DA-4C10-A29B-E582D0A3D675"> <File Id="file3" Name="install.txt" Source="Files\install.txt"/> </Component> <Component Id="licenseTXT" DiskId="1" Guid="9D6E2B5F-F334-4874-B57F-1D4B5A28D17C"> <File Id="file8" Name="license.txt" Source="Files\license.txt"> <Shortcut Id="startmenuManual" Directory="ProgramMenuDir" Name="License" LongName="License"/> </File> </Component> <Component Id="newsTXT" DiskId="1" Guid="459AFF29-F8F5-4F0F-BC43-0DD4AA3D71F0"> <File Id="file10" Name="news.txt" Source="Files\news.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"> <File Id="file13" Name="php-win.exe" Source="Files\php-win.exe"/> </Component> <Component Id="RegisterPHPFilesREG" DiskId="1" Guid="77825049-82F0-4394-A246-A7D2F07BC5BC"> <ProgId Id="PHPFile" Description="PHP Script"> <Extension Id="php" ContentType="application/php"> <Verb Id="open" Sequence="10" Command="Run" Target="[!file13]" Argument="&quot;%1&quot;"/> </Extension> </ProgId> </Component> <Component Id="PHPRegistry" DiskId="1" Guid="1BFEB5D8-B6C0-49E4-918C-A9D52479EC84"> <Registry Id='PHPRegistryInstallDir' Root='HKLM' Key='Software\PHP' Name='InstallDir' Action='write' Type='string' Value='[INSTALLDIR]' /> </Component> <Component Id="phpEXE" DiskId="1" Guid="65C8E630-59D4-41FC-99C5-54E99C74968F"> <File Id="file14" Name="php.exe" Source="Files\php.exe"/> <Environment Id="phpEXEAddToPath" Name="PATH" Action="create" System="yes" Part="first" Value="[INSTALLDIR]"/> <Environment Id="PHPRC" Name="PHPRC" Action="create" System="yes" Part="all" Value="[INSTALLDIR]"/> </Component> <Component Id="phpGIF" DiskId="1" Guid="962C10B2-FD98-4D90-8607-68DE0932A814"> <File Id="file15" Name="php.gif" Source="Files\php.gif"/> </Component> <Component Id="phprecommendedINI" DiskId="1" Guid="B32D6227-3160-4D57-9724-0B35DC128519" Permanent="yes"> <File Id="file17" Name="PHP_2.INI" LongName="php.ini" Source="Files\php.ini" > <Shortcut Id="startmenuPHPINI" Directory="ProgramMenuDir" Name="php.ini" LongName="php.ini"/> </File> <IniFile Id="uploadtmpdirINI" Action="addLine" Key="upload_tmp_dir" Directory="INSTALLDIR" Name="php.ini" Section="PHP" Value="&quot;[%windir]\Temp&quot;"/> <IniFile Id="sessionsavepathINI" Action="addLine" Key="session.save_path" Directory="INSTALLDIR" Name="php.ini" Section="PHP" Value="&quot;[%windir]\Temp&quot;"/> <Condition>NOT PHPINIEXISTS</Condition> </Component> <Component Id="php5embedLIB" DiskId="1" Guid="8C0B065E-41DB-43DB-ABB2-716BE38988C7"> <File Id="file22" Name="PHP5EM_1.LIB" LongName="php5embed.lib" Source="Files\php5embed.lib"/> </Component> <Component Id="win2003eventlog" DiskId="1" Guid="E4C43E12-F31C-4A8C-A084-4E604274D4C9"> <Registry Id="w2k3EventMessageFile" Root="HKLM" Key="System\CurrentControlSet\Services\EventLog\Application\PHP" Action="write" Type="string" Name="EventMessageFile" Value="[!INSTALLDIR]\dev\php5ts.dll"/> <Registry Id="w2k3TypesSupported" Root="HKLM" Key="System\CurrentControlSet\Services\EventLog\Application\PHP" Action="write" Type="integer" Name="TypesSupported" Value="7"/> <Condition>VersionNT = 502</Condition> </Component> <Component Id="php5DLL" DiskId="1" Guid="14A95C34-564F-4BF9-BFC7-0DAA48A96BA2"> <File Id="file25" Name="php5.dll" Source="Files\php5.dll"/> </Component> <Component Id="phpCHM" DiskId="1" Guid="43C45330-3624-11DC-999C-478455D89593"> <File Id="file182" Name="PHP_MA_1.DLL" LongName="php_manual_en.chm" Source="Files\php_manual_en.chm"> <Shortcut Id="startmenuphpCMH" Directory="ProgramMenuDir" Name="Manual" LongName="PHP Manual"/> </File> </Component> <Component Id="Empty" DiskId="1" Guid="24C87A13-FDBA-489B-AE2D-F9406EBA265A"/> <Directory Id="devdirectory" Name="dev"> <Component Id="php5LIB" DiskId="1" Guid="52593C5C-6709-49B9-B1C0-6729C977DE65"> <File Id="file30" Name="php5.lib" Source="Files\dev\php5.lib"/> </Component> </Directory> </Directory> </Directory> <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs"> <Directory Id="ProgramMenuDir" Name="PHP5" LongName="PHP 5"/> </Directory> </Directory> <Feature AllowAdvertise="no" Id="Complete" Title="$(loc.FeatureCompleteTitle)" Description="$(loc.FeatureCompleteDescription)" TypicalDefault="install" Display="expand" ConfigurableDirectory="INSTALLDIR" Level="1"> <ComponentRef Id="licenseTXT"/> <ComponentRef Id="newsTXT"/> <ComponentRef Id="installTXT"/> <ComponentRef Id="phpGIF"/> <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> <Feature AllowAdvertise="no" Id="ScriptExecutable" Title="$(loc.FeatureScriptExecutableTitle)" Description="$(loc.FeatureScriptExecutableDescription)" Level="10"> <ComponentRef Id="phpwinEXE"/> <Feature AllowAdvertise="no" Id="RegisterPHPFiles" Title="$(loc.FeatureRegisterPHPFilesTitle)" Description="$(loc.FeatureRegisterPHPFilesDescription)" Level="10"> <ComponentRef Id="RegisterPHPFilesREG"/> </Feature> </Feature> </Feature> <FeatureRef Id="Extensions"/> <Feature AllowAdvertise="no" Id="WebServers" Title="$(loc.FeatureWebServersTitle)" Description="$(loc.FeatureWebServersDescription)" Display="hidden" 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)" Level="1"> </Feature> <Feature AllowAdvertise="no" Id="iis4FastCGI" Title="$(loc.Featureiis4FastCGITitle)" Description="$(loc.Featureiis4FastCGIDescription)" Level="1"> <ComponentRef Id="phpcgiEXE"/> <ComponentRef Id="cgiforceredirect"/> <ComponentRef Id="iis4FastCGIregistry"/> </Feature> <Feature AllowAdvertise="no" Id="noconfig" Title="$(loc.FeaturecgiTitle)" Description="$(loc.FeaturecgiDescription)" Level="1"> <ComponentRef Id="noconfigregistry"/> </Feature> </Feature> <Feature AllowAdvertise="no" Id="extras" Title="$(loc.FeatureextrasTitle)" Description="$(loc.FeatureextrasDescription)" Level="10"> <ComponentRef Id="Empty"/> <Feature AllowAdvertise="no" Id="Manual" Title="$(loc.FeatureManualTitle)" Description="$(loc.FeatureManualDescription)" Level="1"> <ComponentRef Id="phpCHM"/> </Feature> </Feature> </Feature> <Binary Id="PHPInstallerScripts" SourceFile="PHPInstallerScripts52.vbs" /> <CustomAction Id="iis700FastCGIadd" ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET CONFIG /section:system.webServer/fastCGI /+[fullPath='[INSTALLDIR]php-cgi.exe']" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGI" ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET CONFIG /section:system.webServer/handlers /+[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="iis700FastCGIremove" ExeCommand="&quot;[WindowsFolder]System32\inetsrv\APPCMD.EXE&quot; SET CONFIG /section:system.webServer/handlers /-[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'] " Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="fcgiconfigJSFastCGI" ExeCommand="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -add -section:&quot;PHP&quot; -extension:php -path:&quot;[INSTALLDIR]php-cgi.exe&quot;" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="fcgiconfigJSFastCGIremove" ExeCommand="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove -section:&quot;PHP&quot;ß" Return="ignore" Directory="INSTALLDIR"/> <CustomAction Id="configIIS4" BinaryKey="PHPInstallerScripts" Return="check" VBScriptCall="configIIS4" /> <CustomAction Id="unconfigIIS4" BinaryKey="PHPInstallerScripts" Return="check" VBScriptCall="unconfigIIS4" /> <InstallExecuteSequence> <Custom Action="iis700FastCGIadd" After="InstallFinalize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700FastCGI" After="InstallFinalize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]> </Custom> <Custom Action="iis700FastCGIremove" After="InstallFinalize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="fcgiconfigJSFastCGI" After="InstallFinalize"> <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> </Custom> <Custom Action="fcgiconfigJSFastCGIremove" After="InstallFinalize"> <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> </Custom> <Custom Action="unconfigIIS4" After="InstallValidate"> <![CDATA[VersionNT < 600 AND &iis4FastCGI = 2]]> </Custom> <Custom Action="configIIS4" After="InstallFinalize"> <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]> </Custom> <RemoveExistingProducts After="InstallValidate" /> </InstallExecuteSequence> <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/> <UIRef Id="WixUI_FeatureTreePHP"/> </Product> </Wix> http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig53.wxs?view=markup&rev=1.1 Index: win-installer/WebServerConfig53.wxs +++ win-installer/WebServerConfig53.wxs <?xml version='1.0' encoding='windows-1252'?> <Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'> <Fragment Id='FragmentWebServerConfig'> <DirectoryRef Id='INSTALLDIR'> <Component Id="php5apacheDLL" DiskId="1" Guid="FEEF42A9-BCCA-44DD-88E5-501D39B87DA0"> <File Id="filephp5apacheDLL" Name="PHP5AP_1.DLL" LongName="php5apache.dll" Source="Files\php5apache.dll" /> </Component> <Component Id="php5apache2DLL" DiskId="1" Guid="97997967-0ED5-4695-A714-F1333A0FC1B9"> <File Id="filephp5apache2DLL" Name="PHP5AP_2.DLL" LongName="php5apache2.dll" Source="Files\php5apache2.dll" /> </Component> <Component Id="php5apache2_2DLL" DiskId="1" Guid="54216B1B-582F-49A0-86E9-AD7CF586ADA8"> <File Id="filephp5apache2_2DLL" Name="PHP5AP_3.DLL" LongName="php5apache2_2.dll" Source="Files\php5apache2_2.dll" /> </Component> <Component Id="php5apache2_filterDLL" DiskId="1" Guid="9AA534A8-3624-11DC-8218-B28555D89593"> <File Id="filephp5apache2_filterDLL" Name="PHP5AP_2.DLL" LongName="php5apache2_filter.dll" Source="Files\php5apache2_filter.dll" /> </Component> <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="php5isapiDLL" DiskId="1" Guid="5B5419B5-917A-462A-B325-CB61B82E5FF2"> <File Id="filephp5isapiDLL" Name="PHP5IS_1.DLL" LongName="php5isapi.dll" Source="Files\php5isapi.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" Section="PHP" Value="0" /> </Component> <Component Id="cgifixpathinfo" DiskId="1" Guid="E2DBFF96-1551-4928-9D2E-A62E536B2B60"> <IniFile Id="cgifixpathinfoINI" Action="addLine" Key="cgi.fix_pathinfo" Directory="INSTALLDIR" Name="php.ini" Section="PHP" Value="1" /> </Component> <Component Id="iis3CGI" DiskId="1" Guid="20842834-47E2-483C-AE09-B4E90C12E314"> <Registry Id="iis3RegScriptMap" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\w3svc\parameters\Script Map\.php" Action="write" Type="string" Name="[!INSTALLDIR]\php-cgi.exe" /> <Condition><![CDATA[VersionNT < 500]]></Condition> </Component> <Component Id="xitamiINI" DiskId="1" Guid="5C27D17C-3624-11DC-93BF-A48455D89593"> <IniFile Id="xitamuINIFilter" Action="addLine" Key=".php" Directory="XITAMIDIR" Name="defaults.cfg" Section="Filter" Value="[!INSTALLDIR]\php-cgi.exe" /> <Condition>XITAMIDIR</Condition> </Component> <Component Id="sambarINI" DiskId="1" Guid="629031D0-3624-11DC-ACF8-B08455D89593"> <IniFile Id="sambarINIMappings" Action="addLine" Key="*.php" Directory="SAMBARDIR" Name="mappings.ini" Section="ISAPI" Value="[!INSTALLDIR]\php5isapi.dll" /> <Condition>SAMBARDIR</Condition> </Component> <Component Id="apache13registry" DiskId="1" Guid="5A29CBC6-49A4-11DC-8314-0800200C9A66"> <Registry Id='apache13registryApacheDir' Root='HKLM' Key='Software\PHP' Name='ApacheDir' Action='write' Type='string' Value='[APACHEDIR]' /> <Registry Id="apache13registryWebServerType" Root="HKLM" Key="Software\PHP" Name="WebServerType" Action="write" Type="string" Value="apache13"/> </Component> <Component Id="apache20registry" DiskId="1" Guid="6B49A08E-49A4-11DC-8314-0800200C9A66"> <Registry Id='apache20registryApacheDir' Root='HKLM' Key='Software\PHP' Name='ApacheDir' Action='write' Type='string' Value='[APACHEDIR]' /> <Registry Id="apache20registryWebServerType" Root="HKLM" Key="Software\PHP" Name="WebServerType" Action="write" Type="string" Value="apache20"/> </Component> <Component Id="apache22registry" DiskId="1" Guid="6B49A08F-49A4-11DC-8314-0800200C9A66"> <Registry Id='apache22registryApacheDir' Root='HKLM' Key='Software\PHP' Name='ApacheDir' Action='write' Type='string' Value='[APACHEDIR]' /> <Registry Id="apache22registryWebServerType" Root="HKLM" Key="Software\PHP" Name="WebServerType" Action="write" Type="string" Value="apache22"/> </Component> <Component Id="apacheCGIregistry" DiskId="1" Guid="6B49A090-49A4-11DC-8314-0800200C9A66"> <Registry Id='apacheCGIregistryApacheDir' Root='HKLM' Key='Software\PHP' Name='ApacheDir' Action='write' Type='string' Value='[APACHEDIR]' /> <Registry Id="apacheCGIregistryWebServerType" Root="HKLM" Key="Software\PHP" Name="WebServerType" Action="write" Type="string" Value="apacheCGI"/> </Component> <Component Id="iis4ISAPIregistry" DiskId="1" Guid="6B49A091-49A4-11DC-8314-0800200C9A66"> <Registry Id="iis4ISAPIregistryWebServerType" Root="HKLM" Key="Software\PHP" Name="WebServerType" Action="write" Type="string" Value="iis4ISAPI"/> </Component> <Component Id="iis4CGIregistry" DiskId="1" Guid="6B49A092-49A4-11DC-8314-0800200C9A66"> <Registry Id="iis4CGIregistryWebServerType" Root="HKLM" Key="Software\PHP" Name="WebServerType" Action="write" Type="string" Value="iis4CGI"/> </Component> <Component Id="iis4FastCGIregistry" DiskId="1" Guid="36F5E036-6DDF-11DC-8314-0800200C9A66"> <Registry Id="iis4FastCGIregistryWebServerType" Root="HKLM" Key="Software\PHP" Name="WebServerType" Action="write" Type="string" Value="iis4FastCGI"/> </Component> <Component Id="nsapiregistry" DiskId="1" Guid="6B49A093-49A4-11DC-8314-0800200C9A66"> <Registry Id="nsapiregistryWebServerType" Root="HKLM" Key="Software\PHP" Name="WebServerType" Action="write" Type="string" Value="nsapi"/> </Component> <Component Id="xitamiregistry" DiskId="1" Guid="6B49A094-49A4-11DC-8314-0800200C9A66"> <Registry Id="xitamiregistryWebServerType" Root="HKLM" Key="Software\PHP" Name="WebServerType" Action="write" Type="string" Value="xitami"/> </Component> <Component Id="sambarregistry" DiskId="1" Guid="6B49A095-49A4-11DC-8314-0800200C9A66"> <Registry Id="sambarregistryWebServerType" Root="HKLM" Key="Software\PHP" Name="WebServerType" Action="write" Type="string" Value="sambar"/> </Component> <Component Id="cgiregistry" DiskId="1" Guid="6B49A096-49A4-11DC-8314-0800200C9A66"> <Registry Id="cgiregistryWebServerType" Root="HKLM" Key="Software\PHP" Name="WebServerType" Action="write" Type="string" Value="cgi"/> </Component> <Component Id="noconfigregistry" DiskId="1" Guid="6B49A097-49A4-11DC-8314-0800200C9A66"> <Registry Id="noconfigregistryWebServerType" Root="HKLM" Key="Software\PHP" Name="WebServerType" Action="write" Type="string" Value="noconfig"/> </Component> </DirectoryRef> </Fragment> </Wix> http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig53NTS.wxs?view=markup&rev=1.1 Index: win-installer/WebServerConfig53NTS.wxs +++ win-installer/WebServerConfig53NTS.wxs <?xml version='1.0' encoding='windows-1252'?> <Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'> <Fragment Id='FragmentWebServerConfig'> <DirectoryRef Id='INSTALLDIR'> <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" Section="PHP" Value="0" /> </Component> <Component Id="iis4FastCGIregistry" DiskId="1" Guid="36F5E036-6DDF-11DC-8314-0800200C9A66"> <Registry Id="iis4FastCGIregistryWebServerType" Root="HKLM" Key="Software\PHP" Name="WebServerType" Action="write" Type="string" Value="iis4FastCGI"/> </Component> <Component Id="noconfigregistry" DiskId="1" Guid="6B49A097-49A4-11DC-8314-0800200C9A66"> <Registry Id="noconfigregistryWebServerType" Root="HKLM" Key="Software\PHP" Name="WebServerType" Action="write" Type="string" Value="noconfig"/> </Component> </DirectoryRef> </Fragment> </Wix>