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

2008-09-10 Thread John Mertic 
jmertic Wed Sep 10 20:32:40 2008 UTC

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



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

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

2008-08-22 Thread John Mertic 
jmertic Fri Aug 22 18:50:02 2008 UTC

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



-- 
PHP

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

2008-08-11 Thread John Mertic 
jmertic Mon Aug 11 12:06:19 2008 UTC

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

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

2008-08-11 Thread John Mertic 
jmertic Mon Aug 11 12:18:37 2008 UTC

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



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

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

2008-08-11 Thread John Mertic 
jmertic Mon Aug 11 19:58:24 2008 UTC

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



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

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

2008-08-07 Thread John Mertic 
jmertic Thu Aug  7 17:34:55 2008 UTC

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