Re: cvs: php-src /win32/build template.rc

Thanks Matt :) That was next on my list, so my day just got shorter. ----- Original Message ----- From: "Matt Wilmas" <mattwil@php.net> To: <php-cvs@lists.php.net> Sent: Wednesday, May 14, 2008 12:18 PM Subject: [PHP-CVS] cvs: php-src /win32/build template.rc

mattwil Wed May 14 11:18:08 2008 UTC Modified files: /php-src/win32/build template.rc Log: MFB: Steph's changes; to fix build failure after confutils.js changes (PRODUCT_NAME being undefined) http://cvs.php.net/viewvc.cgi/php-src/win32/build/template.rc?r1=1.10&r2=1.11&diff_format=u Index: php-src/win32/build/template.rc diff -u php-src/win32/build/template.rc:1.10 php-src/win32/build/template.rc:1.11 --- php-src/win32/build/template.rc:1.10 Mon Jan 29 04:40:46 2007 +++ php-src/win32/build/template.rc Wed May 14 11:18:08 2008 @@ -1,5 +1,5 @@ /* This is a template RC file. - * $Id: template.rc,v 1.10 2007/01/29 04:40:46 iliaa Exp $ + * $Id: template.rc,v 1.11 2008/05/14 11:18:08 mattwil Exp $ * Do not edit with MSVC */ #ifdef APSTUDIO_INVOKED # error dont edit with MSVC @@ -19,18 +19,32 @@ 0 ICON win32\build\php.ico #endif -#define XSTRVER4(maj, min, rel, build) #maj "." #min "." #rel "." #build -#define XSTRVER3(maj, min, rel) #maj "." #min "." #rel -#define STRVER4(maj, min, rel, build) XSTRVER4(maj, min, rel, build) -#define STRVER3(maj, min, rel) XSTRVER3(maj, min, rel) +#ifndef INTERNAL_NAME /* e.g. 'PHAR extension', 'CGI SAPI' */ +# ifdef FILE_DESCRIPTION +#define INTERNAL_NAME FILE_DESCRIPTION /* e.g. 'PHP Script Interpreter', 'GD imaging' */ +# else +#define INTERNAL_NAME FILE_NAME /* e.g. 'php5ts.dll', 'php_bz2.dll' */ +# endif +#endif + +#ifndef URL +#define URL "http://www.php.net" +#endif + +#ifndef EXT_VERSION +#define EXT_VERSION PHP_VERSION +#endif + +#ifndef EXT_FILE_VERSION +#define EXT_FILE_VERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION +#endif -//Version VS_VERSION_INFO VERSIONINFO - FILEVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,PHP_RELEASE_VERSION - PRODUCTVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,0 + FILEVERSION EXT_FILE_VERSION + PRODUCTVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION FILEFLAGSMASK 0x3fL #ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG + FILEFLAGS (VS_FF_DEBUG|VS_FF_SPECIALBUILD) #else FILEFLAGS 0x0L #endif @@ -42,19 +56,24 @@

    BEGIN
        BLOCK "040904b0"
        BEGIN
-            VALUE "Comments", THANKS_GUYS "\0"
-            VALUE "CompanyName", "The PHP Group\0"
-            VALUE "FileDescription", FILE_DESCRIPTION "\0"
-            VALUE "FileVersion", STRVER4(PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION, PHP_RELEASE_VERSION)
-            VALUE "InternalName", FILE_NAME "\0"
-            VALUE "LegalCopyright", "Copyright © 1997-2007 The PHP Group\0"
-            VALUE "LegalTrademarks", "PHP\0"
-            VALUE "OriginalFilename", FILE_NAME "\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", PRODUCT_NAME "\0"
-            VALUE "ProductVersion", STRVER3(PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION)
-            VALUE "SpecialBuild", PHP_EXTRA_VERSION "\0"

- VALUE "URL", "http://www.php.net"

+            VALUE "Comments", THANKS_GUYS
+            VALUE "CompanyName", "The PHP Group"

+#ifdef _DEBUG

+            VALUE "FileDescription", FILE_DESCRIPTION " (DEBUG)"

+#else

+            VALUE "FileDescription", FILE_DESCRIPTION

+#endif

+            VALUE "FileVersion", EXT_VERSION
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", "Copyright © 1997-2008 The PHP Group"
+            VALUE "LegalTrademarks", "PHP"
+            VALUE "OriginalFilename", FILE_NAME
+            VALUE "ProductName", "PHP"
+            VALUE "ProductVersion", PHP_VERSION

+#ifdef _DEBUG

+            VALUE "SpecialBuild", "Debug build"

+#endif

+            VALUE "URL", URL
        END
    END
    BLOCK "VarFileInfo"

@@ -66,4 +85,3 @@ #ifdef MC_INCLUDE #include MC_INCLUDE #endif - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php