derick          Sat Jul 21 11:24:53 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/win32/build        confutils.js 
  Log:
  - MFH: Allow the use of a user defined template.rc file to override the
    default ones. This makes it possible to include the extension's version
    inside the version properties of the generated extension DLL instead
    of the PHP version the extension is build against.
  
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.6&r2=1.60.2.1.2.7&diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.6 
php-src/win32/build/confutils.js:1.60.2.1.2.7
--- php-src/win32/build/confutils.js:1.60.2.1.2.6       Mon Mar 19 03:15:48 2007
+++ php-src/win32/build/confutils.js    Sat Jul 21 11:24:53 2007
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.6 2007/03/19 03:15:48 edink Exp $
+// $Id: confutils.js,v 1.60.2.1.2.7 2007/07/21 11:24:53 derick Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -860,7 +860,19 @@
        if (makefiletarget.match(new RegExp("\\.exe$"))) {
                logo = " /D WANT_LOGO ";
        }
-       
+
+       /**
+        * Use user supplied template.rc if it exists
+        */
+       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');
+               return resname;
+       }
+
        MFO.WriteLine("$(BUILD_DIR)\\" + resname + ": 
win32\\build\\template.rc");
        MFO.WriteLine("\t$(RC) /fo $(BUILD_DIR)\\" + resname + logo +
                ' /d FILE_DESCRIPTION="\\"' + res_desc + '\\"" /d 
FILE_NAME="\\"' + makefiletarget +

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

Reply via email to