cvs: win-installer / ExtensionsFeatures53.wxs WixUI_en-us.wxl

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.2&r2=1.3&diff_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" Title="$(loc.Featureext_php_gettextTitle)" Description="$(loc.Featureext_php_gettextDescription)" TypicalDefault="install" Level="1"> <ComponentRef Id="php_gettext"/> </Feature> - <Feature AllowAdvertise="no" Id="ext_php_gmp" Title="$(loc.Featureext_php_gmpTitle)" Description="$(loc.Featureext_php_gmpDescription)" Level="10"> + <Feature AllowAdvertise="no" Id="ext_php_gmp" Title="$(loc.Featureext_php_gmpTitle)" Description="$(loc.Featureext_php_gmpDescription)" TypicalDefault="install" Level="1"> <ComponentRef Id="php_gmp"/> </Feature> <Feature AllowAdvertise="no" Id="ext_php_gopher" Title="$(loc.Featureext_php_gopherTitle)" Description="$(loc.Featureext_php_gopherDescription)" Level="10"> @@ -150,7 +150,7 @@ <Feature AllowAdvertise="no" Id="ext_php_ifx" Title="$(loc.Featureext_php_ifxTitle)" Description="$(loc.Featureext_php_ifxDescription)" Level="10"> <ComponentRef Id="php_ifx"/> </Feature> - <Feature AllowAdvertise="no" Id="ext_php_imap" Title="$(loc.Featureext_php_imapTitle)" Description="$(loc.Featureext_php_imapDescription)" Level="10"> + <Feature AllowAdvertise="no" Id="ext_php_imap" Title="$(loc.Featureext_php_imapTitle)" Description="$(loc.Featureext_php_imapDescription)" TypicalDefault="install" Level="1"> <ComponentRef Id="php_imap"/> </Feature> <Feature AllowAdvertise="no" Id="ext_php_interbase" Title="$(loc.Featureext_php_interbaseTitle)" Description="$(loc.Featureext_php_interbaseDescription)" Level="10"> @@ -193,7 +193,7 @@ <Feature AllowAdvertise="no" Id="ext_php_mbstring" Title="$(loc.Featureext_php_mbstringTitle)" Description="$(loc.Featureext_php_mbstringDescription)" Level="10"> <ComponentRef Id="php_mbstring"/> </Feature> - <Feature AllowAdvertise="no" Id="ext_php_mcrypt" Title="$(loc.Featureext_php_mcryptTitle)" Description="$(loc.Featureext_php_mcryptDescription)" Level="10"> + <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> @@ -203,7 +203,7 @@ <Feature AllowAdvertise="no" Id="ext_php_memcache" Title="$(loc.Featureext_php_memcacheTitle)" Description="$(loc.Featureext_php_memcacheDescription)" Level="10"> <ComponentRef Id="php_memcache"/> </Feature> - <Feature AllowAdvertise="no" Id="ext_php_mhash" Title="$(loc.Featureext_php_mhashTitle)" Description="$(loc.Featureext_php_mhashDescription)" Level="10"> + <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> @@ -218,14 +218,14 @@ <ComponentRef Id="php_msql"/> <ComponentRef Id="msqlDLL"/> </Feature> - <Feature AllowAdvertise="no" Id="ext_php_mssql" Title="$(loc.Featureext_php_mssqlTitle)" Description="$(loc.Featureext_php_mssqlDescription)" Level="10"> + <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)" Level="10"> + <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"/> </Feature> - <Feature AllowAdvertise="no" Id="ext_php_mysqli" Title="$(loc.Featureext_php_mysqliTitle)" Description="$(loc.Featureext_php_mysqliDescription)" Level="10"> + <Feature AllowAdvertise="no" Id="ext_php_mysqli" Title="$(loc.Featureext_php_mysqliTitle)" Description="$(loc.Featureext_php_mysqliDescription)" TypicalDefault="install" Level="1"> <ComponentRef Id="php_mysqli"/> </Feature> <Feature AllowAdvertise="no" Id="ext_php_netools" Title="$(loc.Featureext_php_netoolsTitle)" Description="$(loc.Featureext_php_netoolsDescription)" Level="10"> @@ -237,7 +237,7 @@ <Feature AllowAdvertise="no" Id="ext_php_oggvorbis" Title="$(loc.Featureext_php_oggvorbisTitle)" Description="$(loc.Featureext_php_oggvorbisDescription)" Level="10"> <ComponentRef Id="php_oggvorbis"/> </Feature> - <Feature AllowAdvertise="no" Id="ext_php_openssl" Title="$(loc.Featureext_php_opensslTitle)" Description="$(loc.Featureext_php_opensslDescription)" Level="10"> + <Feature AllowAdvertise="no" Id="ext_php_openssl" Title="$(loc.Featureext_php_opensslTitle)" Description="$(loc.Featureext_php_opensslDescription)" TypicalDefault="install" Level="1"> <ComponentRef Id="php_openssl"/> <ComponentRef Id="ssleay32DLL"/> <ComponentRef Id="libeay32DLL"/> @@ -253,6 +253,9 @@ <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> <Feature AllowAdvertise="no" Id="ext_php_parsekit" Title="$(loc.Featureext_php_parsekitTitle)" Description="$(loc.Featureext_php_parsekitDescription)" Level="10"> <ComponentRef Id="php_parsekit"/> </Feature> @@ -268,7 +271,7 @@ <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"> + <Feature AllowAdvertise="no" Id="ext_php_pdo" Title="$(loc.Featureext_php_pdoTitle)" Description="$(loc.Featureext_php_pdoDescription)" TypicalDefault="install" Level="1"> <Feature AllowAdvertise="no" Id="ext_php_pdo_firebird" Title="$(loc.Featureext_php_pdo_firebirdTitle)" Description="$(loc.Featureext_php_pdo_firebirdDescription)" Level="10"> <ComponentRef Id="php_pdo_firebird"/> <ComponentRef Id="gds32DLL"/> @@ -283,7 +286,7 @@ <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"> + <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"> @@ -292,13 +295,13 @@ <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> - <Feature AllowAdvertise="no" Id="ext_php_pdo_odbc" Title="$(loc.Featureext_php_pdo_odbcTitle)" Description="$(loc.Featureext_php_pdo_odbcDescription)" Level="10"> + <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"/> </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"/> </Feature> - <Feature AllowAdvertise="no" Id="ext_php_pdo_sqlite" Title="$(loc.Featureext_php_pdo_sqliteTitle)" Description="$(loc.Featureext_php_pdo_sqliteDescription)" Level="10"> + <Feature AllowAdvertise="no" Id="ext_php_pdo_sqlite" Title="$(loc.Featureext_php_pdo_sqliteTitle)" Description="$(loc.Featureext_php_pdo_sqliteDescription)" TypicalDefault="install" Level="1"> <ComponentRef Id="php_pdo_sqlite"/> </Feature> <Feature AllowAdvertise="no" Id="ext_php_pdo_sqlite_external" Title="$(loc.Featureext_php_pdo_sqlite_externalTitle)" Description="$(loc.Featureext_php_pdo_sqlite_externalDescription)" Level="10"> @@ -318,13 +321,13 @@ <Feature AllowAdvertise="no" Id="ext_php_pop3" Title="$(loc.Featureext_php_pop3Title)" Description="$(loc.Featureext_php_pop3Description)" Level="10"> <ComponentRef Id="php_pop3"/> </Feature> - <Feature AllowAdvertise="no" Id="ext_php_pgsql" Title="$(loc.Featureext_php_pgsqlTitle)" Description="$(loc.Featureext_php_pgsqlDescription)" Level="10"> + <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"/> </Feature> <Feature AllowAdvertise="no" Id="ext_php_printer" Title="$(loc.Featureext_php_printerTitle)" Description="$(loc.Featureext_php_printerDescription)" Level="10"> <ComponentRef Id="php_printer"/> </Feature> - <Feature AllowAdvertise="no" Id="ext_php_pspell" Title="$(loc.Featureext_php_pspellTitle)" Description="$(loc.Featureext_php_pspellDescription)" Level="10"> + <Feature AllowAdvertise="no" Id="ext_php_pspell" Title="$(loc.Featureext_php_pspellTitle)" Description="$(loc.Featureext_php_pspellDescription)" TypicalDefault="install" Level="1"> <ComponentRef Id="php_pspell"/> </Feature> <Feature AllowAdvertise="no" Id="ext_php_radius" Title="$(loc.Featureext_php_radiusTitle)" Description="$(loc.Featureext_php_radiusDescription)" Level="10"> @@ -352,10 +355,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)" Level="10"> + <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"/> </Feature> - <Feature AllowAdvertise="no" Id="ext_php_sockets" Title="$(loc.Featureext_php_socketsTitle)" Description="$(loc.Featureext_php_socketsDescription)" Level="10"> + <Feature AllowAdvertise="no" Id="ext_php_sockets" Title="$(loc.Featureext_php_socketsTitle)" Description="$(loc.Featureext_php_socketsDescription)" TypicalDefault="install" Level="1"> <ComponentRef Id="php_sockets"/> </Feature> <Feature AllowAdvertise="no" Id="ext_php_spl_types" Title="$(loc.Featureext_php_spl_typesTitle)" Description="$(loc.Featureext_php_spl_typesDescription)" Level="10"> @@ -364,7 +367,7 @@ <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"> + <Feature AllowAdvertise="no" Id="ext_php_sqlite3" Title="$(loc.Featureext_php_sqlite3Title)" Description="$(loc.Featureext_php_sqlite3Description)" TypicalDefault="install" Level="1"> <ComponentRef Id="php_sqlite3"/> </Feature> <Feature AllowAdvertise="no" Id="ext_php_ssh2" Title="$(loc.Featureext_php_ssh2Title)" Description="$(loc.Featureext_php_ssh2Description)" Level="10"> @@ -386,7 +389,7 @@ <Feature AllowAdvertise="no" Id="ext_php_sybase_ct" Title="$(loc.Featureext_php_sybase_ctTitle)" Description="$(loc.Featureext_php_sybase_ctDescription)" Level="10"> <ComponentRef Id="php_sybase_ct"/> </Feature> - <Feature AllowAdvertise="no" Id="ext_php_tidy" Title="$(loc.Featureext_php_tidyTitle)" Description="$(loc.Featureext_php_tidyDescription)" Level="10"> + <Feature AllowAdvertise="no" Id="ext_php_tidy" Title="$(loc.Featureext_php_tidyTitle)" Description="$(loc.Featureext_php_tidyDescription)" TypicalDefault="install" Level="1"> <ComponentRef Id="php_tidy"/> </Feature> <Feature AllowAdvertise="no" Id="ext_php_threads" Title="$(loc.Featureext_php_threadsTitle)" Description="$(loc.Featureext_php_threadsDescription)" Level="10"> @@ -413,7 +416,7 @@ <Feature AllowAdvertise="no" Id="ext_php_win32std" Title="$(loc.Featureext_php_win32stdTitle)" Description="$(loc.Featureext_php_win32stdDescription)" Level="10"> <ComponentRef Id="php_win32std"/> </Feature> - <Feature AllowAdvertise="no" Id="ext_php_xmlrpc" Title="$(loc.Featureext_php_xmlrpcTitle)" Description="$(loc.Featureext_php_xmlrpcDescription)" Level="10"> + <Feature AllowAdvertise="no" Id="ext_php_xmlrpc" Title="$(loc.Featureext_php_xmlrpcTitle)" Description="$(loc.Featureext_php_xmlrpcDescription)" TypicalDefault="install" Level="1"> <ComponentRef Id="php_xmlrpc"/> </Feature> <Feature AllowAdvertise="no" Id="ext_php_xsl" Title="$(loc.Featureext_php_xslTitle)" Description="$(loc.Featureext_php_xslDescription)" Level="10"> @@ -426,7 +429,7 @@ <Feature AllowAdvertise="no" Id="ext_php_yami" Title="$(loc.Featureext_php_yamiTitle)" Description="$(loc.Featureext_php_yamiDescription)" Level="10"> <ComponentRef Id="php_yami"/> </Feature> - <Feature AllowAdvertise="no" Id="ext_php_zip" Title="$(loc.Featureext_php_zipTitle)" Description="$(loc.Featureext_php_zipDescription)" Level="10"> + <Feature AllowAdvertise="no" Id="ext_php_zip" Title="$(loc.Featureext_php_zipTitle)" Description="$(loc.Featureext_php_zipDescription)" TypicalDefault="install" Level="1"> <ComponentRef Id="php_zip"/> </Feature> <Feature AllowAdvertise="no" Id="ext_php_zlib_filter" Title="$(loc.Featureext_php_zlib_filterTitle)" Description="$(loc.Featureext_php_zlib_filterDescription)" Level="10"> http://cvs.php.net/viewvc.cgi/win-installer/WixUI_en-us.wxl?r1=1.24&r2=1.25&diff_format=u Index: win-installer/WixUI_en-us.wxl diff -u win-installer/WixUI_en-us.wxl:1.24 win-installer/WixUI_en-us.wxl:1.25 --- win-installer/WixUI_en-us.wxl:1.24 Mon Aug 4 15:11:38 2008 +++ win-installer/WixUI_en-us.wxl Thu Aug 7 17:34:55 2008 @@ -726,8 +726,10 @@ <String Id="Featureext_php_operatorDescription">Operator overloading for Objects</String> <String Id="Featureext_php_oracleTitle">Oracle *DEPRECATED*</String> <String Id="Featureext_php_oracleDescription">Oracle 7 functions NOTE: DEPRECATED - USE ORACLE 8 FUNCTIONS BELOW</String> - <String Id="Featureext_php_oci8Title">Oracle 8</String> + <String Id="Featureext_php_oci8Title">Oracle (8)</String> <String Id="Featureext_php_oci8Description">Oracle 8 functions</String> + <String Id="Featureext_php_oci8_11gTitle">Oracle (11g)</String> + <String Id="Featureext_php_oci8_11gDescription">Oracle Driver for Oracle 11g</String> <String Id="Featureext_php_parsekitTitle">parsekit</String> <String Id="Featureext_php_parsekitDescription">PHP Opcode Analyser</String> <String Id="Featureext_php_pdfTitle">PDFlib</String>