Re: [PHP-CVS] cvs: php-src /win32/build template.rc

2008-11-03 Thread Steph Fox 

Hi Elizabeth,

I think you'll find that's version-specific. I have both those files, and 
they do rather different things. Can you test against both VC 6 and 9?


- Steph

- Original Message - 
From: "Elizabeth Marie Smith" <[EMAIL PROTECTED]>

To: 
Sent: Monday, November 03, 2008 7:24 PM
Subject: [PHP-CVS] cvs: php-src /win32/build template.rc



auroraeosrose Mon Nov  3 19:24:47 2008 UTC

 Modified files:
   /php-src/win32/build template.rc
 Log:
 Actual name of the file is WinResRc.h - silly to make people rename their 
header files


http://cvs.php.net/viewvc.cgi/php-src/win32/build/template.rc?r1=1.11&r2=1.12&diff_format=u
Index: php-src/win32/build/template.rc
diff -u php-src/win32/build/template.rc:1.11 
php-src/win32/build/template.rc:1.12

--- php-src/win32/build/template.rc:1.11 Wed May 14 11:18:08 2008
+++ php-src/win32/build/template.rc Mon Nov  3 19:24:47 2008
@@ -1,11 +1,11 @@
/* This is a template RC file.
- * $Id: template.rc,v 1.11 2008/05/14 11:18:08 mattwil Exp $
+ * $Id: template.rc,v 1.12 2008/11/03 19:24:47 auroraeosrose Exp $
 * Do not edit with MSVC */
#ifdef APSTUDIO_INVOKED
# error dont edit with MSVC
#endif

-#include "winres.h"
+#include "winresrc.h"
#include "main/php_version.h"

LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US



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




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

[PHP-CVS] cvs: php-src /win32/build template.rc

2008-11-03 Thread Elizabeth Marie Smith 
auroraeosrose   Mon Nov  3 19:24:47 2008 UTC

  Modified files:  
/php-src/win32/buildtemplate.rc 
  Log:
  Actual name of the file is WinResRc.h - silly to make people rename their 
header files
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/template.rc?r1=1.11&r2=1.12&diff_format=u
Index: php-src/win32/build/template.rc
diff -u php-src/win32/build/template.rc:1.11 
php-src/win32/build/template.rc:1.12
--- php-src/win32/build/template.rc:1.11Wed May 14 11:18:08 2008
+++ php-src/win32/build/template.rc Mon Nov  3 19:24:47 2008
@@ -1,11 +1,11 @@
 /* This is a template RC file.
- * $Id: template.rc,v 1.11 2008/05/14 11:18:08 mattwil Exp $
+ * $Id: template.rc,v 1.12 2008/11/03 19:24:47 auroraeosrose Exp $
  * Do not edit with MSVC */
 #ifdef APSTUDIO_INVOKED
 # error dont edit with MSVC
 #endif
 
-#include "winres.h"
+#include "winresrc.h"
 #include "main/php_version.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US



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

Re: [PHP-CVS] cvs: php-src /win32/build template.rc

2008-05-14 Thread Steph Fox 

Thanks Matt :) That was next on my list, so my day just got shorter.

- Original Message - 
From: "Matt Wilmas" <[EMAIL PROTECTED]>

To: 
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




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

[PHP-CVS] cvs: php-src /win32/build template.rc

2008-05-14 Thread Matt Wilmas 
mattwil Wed May 14 11:18:08 2008 UTC

  Modified files:  
/php-src/win32/buildtemplate.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.10Mon 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

[PHP-CVS] cvs: php-src /win32/build template.rc

2006-02-08 Thread Johannes Schl 
johannesWed Feb  8 21:07:42 2006 UTC

  Modified files:  
/php-src/win32/buildtemplate.rc 
  Log:
  - Fix charset
  
http://cvs.php.net/viewcvs.cgi/php-src/win32/build/template.rc?r1=1.8&r2=1.9&diff_format=u
Index: php-src/win32/build/template.rc
diff -u php-src/win32/build/template.rc:1.8 php-src/win32/build/template.rc:1.9
--- php-src/win32/build/template.rc:1.8 Wed Feb  8 21:03:00 2006
+++ php-src/win32/build/template.rc Wed Feb  8 21:07:41 2006
@@ -1,5 +1,5 @@
 /* This is a template RC file.
- * $Id: template.rc,v 1.8 2006/02/08 21:03:00 johannes Exp $
+ * $Id: template.rc,v 1.9 2006/02/08 21:07:41 johannes Exp $
  * Do not edit with MSVC */
 #ifdef APSTUDIO_INVOKED
 # error dont edit with MSVC
@@ -47,7 +47,7 @@
 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-2006 The PHP Group\0"
+VALUE "LegalCopyright", "Copyright © 1997-2006 The PHP Group\0"
 VALUE "LegalTrademarks", "PHP\0"
 VALUE "OriginalFilename", FILE_NAME "\0"
 VALUE "PrivateBuild", "\0"

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

[PHP-CVS] cvs: php-src /win32/build template.rc

2004-01-08 Thread Wez Furlong 
wez Thu Jan  8 05:58:27 2004 EDT

  Modified files:  
/php-src/win32/buildtemplate.rc 
  Log:
  update copyright year in win32 resource template
  
Index: php-src/win32/build/template.rc
diff -u php-src/win32/build/template.rc:1.4 php-src/win32/build/template.rc:1.5
--- php-src/win32/build/template.rc:1.4 Fri Dec  5 18:13:57 2003
+++ php-src/win32/build/template.rc Thu Jan  8 05:58:27 2004
@@ -1,5 +1,5 @@
 /* This is a template RC file.
- * $Id: template.rc,v 1.4 2003/12/05 23:13:57 wez Exp $
+ * $Id: template.rc,v 1.5 2004/01/08 10:58:27 wez Exp $
  * Do not edit with MSVC */
 #ifdef APSTUDIO_INVOKED
 # error dont edit with MSVC
@@ -47,7 +47,7 @@
 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 © 2003 The PHP Group\0"
+VALUE "LegalCopyright", "Copyright © 1997-2004 The PHP Group\0"
 VALUE "LegalTrademarks", "PHP\0"
 VALUE "OriginalFilename", FILE_NAME "\0"
 VALUE "PrivateBuild", "\0"

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

[PHP-CVS] cvs: php-src /win32/build template.rc

2003-12-05 Thread Wez Furlong 
wez Fri Dec  5 18:14:00 2003 EDT

  Modified files:  
/php-src/win32/buildtemplate.rc 
  Log:
  2003, not 2002.
  
Index: php-src/win32/build/template.rc
diff -u php-src/win32/build/template.rc:1.3 php-src/win32/build/template.rc:1.4
--- php-src/win32/build/template.rc:1.3 Thu Dec  4 08:38:47 2003
+++ php-src/win32/build/template.rc Fri Dec  5 18:13:57 2003
@@ -1,5 +1,5 @@
 /* This is a template RC file.
- * $Id: template.rc,v 1.3 2003/12/04 13:38:47 wez Exp $
+ * $Id: template.rc,v 1.4 2003/12/05 23:13:57 wez Exp $
  * Do not edit with MSVC */
 #ifdef APSTUDIO_INVOKED
 # error dont edit with MSVC
@@ -47,7 +47,7 @@
 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 © 2002 The PHP Group\0"
+VALUE "LegalCopyright", "Copyright © 2003 The PHP Group\0"
 VALUE "LegalTrademarks", "PHP\0"
 VALUE "OriginalFilename", FILE_NAME "\0"
 VALUE "PrivateBuild", "\0"

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