sfox            Mon Apr 14 17:55:02 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/win32/build        confutils.js 
  Log:
  - Workarounds are no longer needed - thanks PECLers!
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.9&r2=1.60.2.1.2.8.2.10&diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.9 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.10
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.9   Mon Mar 31 09:17:25 2008
+++ php-src/win32/build/confutils.js    Mon Apr 14 17:55:02 2008
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.9 2008/03/31 09:17:25 sfox Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.10 2008/04/14 17:55:02 sfox Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -846,7 +846,6 @@
        var debug = "";
        var project_url = "http://www.php.net";;
        var project_header = creditspath + "/php_" + basename + ".h";
-       var headerfile = "";
        var versioning = "";
 
        if (sapi) {
@@ -872,22 +871,10 @@
        }
 
        if (creditspath.match(new RegExp("pecl"))) {
-               /* PECL project url */
+               /* PECL project url - this will eventually work correctly for 
all */
                project_url = "http://pecl.php.net/"; + basename;
 
                /* keep independent versioning PECL-specific for now */
-               if (!FSO.FileExists(project_header)) { /* pick up a dozen 
renegades */
-                       if (basename == "doublemetaphone") headerfile = 
"/double_metaphone.h";
-                       if (basename == "flitetts") headerfile = "/php_flite.h";
-                       if (basename == "gopher") headerfile = 
"/gopher_fopen_wrapper.h";
-                       if (basename == "ingres") headerfile = "/php_ii.h";
-                       if (basename == "iisfunc" || basename == "ixsfunc") 
headerfile = "/setup.h";
-                       if (basename == "satellite") headerfile = 
"/php_orbit.h";
-                       if (basename == "stats") headerfile = 
"/php_statistics.h";
-                       if (!headerfile) headerfile = "/" + basename + ".h";
-                       project_header = creditspath + headerfile;
-               }
-
                if (FSO.FileExists(project_header)) {
                        if (header = FSO.OpenTextFile(project_header, 1)) {
                                contents = header.ReadAll();
@@ -918,10 +905,11 @@
         */
        if (FSO.FileExists(creditspath + '\\template.rc')) {
                MFO.WriteLine("$(BUILD_DIR)\\" + resname + ": " + creditspath + 
"\\template.rc");
-               MFO.WriteLine("\t$(RC) /fo $(BUILD_DIR)\\" + resname + logo +
-                       ' /d FILE_DESCRIPTION="\\"' + res_desc + '\\"" /d 
FILE_NAME="\\"' + makefiletarget +
-                       '\\"" /d PRODUCT_NAME="\\"' + res_prod_name + '\\"" /d 
THANKS_GUYS="\\"' +
-                       thanks + '\\"" ' + creditspath + '\\template.rc');
+               MFO.WriteLine("\t$(RC) /fo $(BUILD_DIR)\\" + resname + logo + 
debug +
+                       ' /d FILE_DESCRIPTION="\\"' + res_desc + '\\"" /d 
FILE_NAME="\\"' +
+                       makefiletarget + '\\"" /d PRODUCT_NAME="\\"' + 
res_prod_name +
+                       versioning + '\\"" /d THANKS_GUYS="\\"' + thanks + 
'\\"" ' +
+                       creditspath + '\\template.rc');
                return resname;
        }
 



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

Reply via email to