- Workarounds are no longer needed - thanks PECLers!

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index e2abde8df7f8c4fc0fb20e16d9a6dc3ce14fa17f..b47bc66aca1440d3c7a4892e10ff69a11ab679c0 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -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 @@ function generate_version_info_resource(makefiletarget, basename, creditspath, s
        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 @@ function generate_version_info_resource(makefiletarget, basename, creditspath, s
        }
 
        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 @@ function generate_version_info_resource(makefiletarget, basename, creditspath, s
         */
        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;
        }