From fc53b15fa4f1bbd7b9d1ca67b5452a94554dc017 Mon Sep 17 00:00:00 2001 From: PKEuS Date: Sun, 14 Oct 2012 10:21:22 +0200 Subject: [PATCH] Refactorized resource files: - Stored global information about cppcheck version and copyright string in a single resource.h file. - Use macros of windows.h instead of numeric values for filetype, etc. - Added versioninfo metadata to lib (#4275) - Removed VS resource editor code from resource files - these files shouldn't be modified with it to avoid information loss - Renamed files to version.h/rc - Encoded files as ANSI again - use escape sequences for unicode characters in literals (#4281) --- cli/cli.pro | 4 ++-- cli/cli.vcxproj | 3 +-- cli/cli.vcxproj.filters | 7 ++----- cli/cppcheck.rc | Bin 4856 -> 0 bytes cli/resource.h | 14 -------------- cli/version.rc | 34 ++++++++++++++++++++++++++++++++++ gui/cppcheck-gui.rc | Bin 378 -> 182 bytes lib/cppcheck.vcxproj | 4 ++++ lib/cppcheck.vcxproj.filters | 6 ++++++ lib/version.h | 3 +++ lib/version.rc | 34 ++++++++++++++++++++++++++++++++++ 11 files changed, 86 insertions(+), 23 deletions(-) delete mode 100644 cli/cppcheck.rc delete mode 100644 cli/resource.h create mode 100644 cli/version.rc create mode 100644 lib/version.h create mode 100644 lib/version.rc diff --git a/cli/cli.pro b/cli/cli.pro index 70966fdf0..d7d49ac00 100644 --- a/cli/cli.pro +++ b/cli/cli.pro @@ -27,8 +27,8 @@ HEADERS += cppcheckexecutor.h \ threadexecutor.h win32 { - RC_FILE = cppcheck.rc - HEADERS += resource.h + RC_FILE = version.rc + HEADERS += ../lib/version.h } # Enable STL checking in GCC debug builds diff --git a/cli/cli.vcxproj b/cli/cli.vcxproj index bcef697fc..93e5c1019 100644 --- a/cli/cli.vcxproj +++ b/cli/cli.vcxproj @@ -354,7 +354,7 @@ - + @@ -364,7 +364,6 @@ - diff --git a/cli/cli.vcxproj.filters b/cli/cli.vcxproj.filters index c4c8c513b..d7d2e0370 100644 --- a/cli/cli.vcxproj.filters +++ b/cli/cli.vcxproj.filters @@ -10,7 +10,7 @@ cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - {6d3be647-edb6-43e6-a7eb-3031a2c7b655} + {6d3be647-edb6-43e6-a7eb-3031a2c7b655} @@ -32,9 +32,6 @@ Header Files - - Header Files - Header Files @@ -75,7 +72,7 @@ - + Resource Files diff --git a/cli/cppcheck.rc b/cli/cppcheck.rc deleted file mode 100644 index 2ebf81767ae8fc501d3a9909843d191741646da1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4856 zcmds*U2hsk6o$`rrT&L4+$2hhapEZIr45)^!C(bUTFKJN0h`h~*aDn5QhsiJN0R5A zVc1<*Y~%ETRI6cjXXkvq=VQ+D?dz6pS!9Pcw4ROa(k6^^o3hqrZDQAUY8O0J>@w?Tyt~t#aSAhW*7#o8Lp*W2M1;kS`rJ?+V(5IkGyq zEMj~PN|*K?`=_8I96DJ2C%*?+UBOP_QDglXW6>j7AKVYsS8%R6p3PiD^E~;{d8v=4 zABlm)k43yan)xx$gLlaa*leEnq>;z-b_?$lqnmG~tc{4W5q01KUr&g|$Q}`UCGxCf zk8@&glFH;EwI#COG8x^6e%JPiWuM7yvi6vqt{^8S{u*53`);q>smd--fc8^!3bI^-}~SxErs!-rar>bwk%gc)qyV9y~dKNvu`uA zC1gx`URBLPMrhX92A}-8r?-1pUUweWQ#8Bs&zBP`&(0Xdi^oe;s-Ejh$g70~ynSvr zvs&zHVZly#KEd1md`om(rO)#R>9eksB2k${pw~+N$*a}NaVFd}ex`WqV)2;zH6%Mn zbM1pAU2-`ln`+dQHW8)HB6g9r&%Ju1^cx|fbx}v$9Z)4|3wt8s?P+TGy+`nG5q-y0 zyUx8R0{4AaiRx%~NcC!y^^$NyhP>pBxGN^pwNKr_9+K({dM2Dy$vuw-wbo;>k3BIR zm(DK@Stfb4RPDL|$Fn=RmZ4pTYlz1zsx4%DOLt~=CWv?F`i{^nAmMRH-unuk-6gFg zA-{I0-na0L&@CW&O3bK#9e~P^6YvaQk3jiyA)oWPg>27qE!z&L|H0U?cl>56Lqd~R z+rry0ckzunL19ps>sUq4bVu%EzTi%^0_W2eSI>2oJ^L5RUALn1y+;k3GAl>&^}1bh zHp_yrZj zg-~mzwc=C=g-F%YZAg`ncEeZ)u_I)uySXM(rg!?{zlf}?#2<;T^uN`8{Qe!j{7SX} diff --git a/cli/resource.h b/cli/resource.h deleted file mode 100644 index ad96cc0f0..000000000 --- a/cli/resource.h +++ /dev/null @@ -1,14 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by cppcheck.rc - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/cli/version.rc b/cli/version.rc new file mode 100644 index 000000000..c2497f95c --- /dev/null +++ b/cli/version.rc @@ -0,0 +1,34 @@ +#include "..\lib\version.h" +#include "winresrc.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION CPPCHECK_VERSION + PRODUCTVERSION CPPCHECK_VERSION + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS (0x1L|VS_FF_PRERELEASE) +#else + FILEFLAGS (0x0L|VS_FF_PRERELEASE) +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "cppcheck Application" + VALUE "FileVersion", CPPCHECK_VERSION_STRING + VALUE "InternalName", "cppcheck" + VALUE "LegalCopyright", LEGALCOPYRIGHT + VALUE "OriginalFilename", "cppcheck.exe" + VALUE "ProductName", "cppcheck Application" + VALUE "ProductVersion", CPPCHECK_VERSION_STRING + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/gui/cppcheck-gui.rc b/gui/cppcheck-gui.rc index e0d41f78f66a31fd6725890b2cc639ecb9bd558b..570ce2f59832e85f15edc59775806b83fc7f08fc 100644 GIT binary patch literal 182 zcmY+6K?=e!5JmTa++nB-cL^S$wju+fptzPYP3vGX35oUmw$hD%`TpZs3n=8L-T}oB zI_bf)I7m5;xeMC@*_AkDaxk!8Bzbo%EF*keE*u3|hN#ts*Gy%MCC_%fO{PjKt*nLP o9RcTnR@mYLo6C6z|6ABXTD&#&wXOH3!%wIvC3-q~8KyYrzAR5Q*#H0l literal 378 zcmaKn%?iRm5QB3Te1}pG-YPyq{Xq(%pm-M9YAx0()%y7AH(M&=L6&W2l1Vo6dJZ&D zphTsd3e`%rr+2#O%-Mmb^o4RNW3H;;GQK}Dt) za21*yRY`C7fjR)c;}NN=j(Q&d&K1H$BsMJf|0{`{j_90DaF!tSYIA6|n`y&_wx#V= sdN$F7e#;$esfC8{|4uvC&X{_QHr5KKSR>6f{c;F->o;5O-*3{r0UJy?n*aa+ diff --git a/lib/cppcheck.vcxproj b/lib/cppcheck.vcxproj index 0fab24eb0..23923dca4 100644 --- a/lib/cppcheck.vcxproj +++ b/lib/cppcheck.vcxproj @@ -107,6 +107,10 @@ + + + + {C183DB5B-AD6C-423D-80CA-1F9549555A1A} diff --git a/lib/cppcheck.vcxproj.filters b/lib/cppcheck.vcxproj.filters index be9799909..f44d60a28 100644 --- a/lib/cppcheck.vcxproj.filters +++ b/lib/cppcheck.vcxproj.filters @@ -223,5 +223,11 @@ Header Files + + Header Files + + + + \ No newline at end of file diff --git a/lib/version.h b/lib/version.h new file mode 100644 index 000000000..1515ebd56 --- /dev/null +++ b/lib/version.h @@ -0,0 +1,3 @@ +#define CPPCHECK_VERSION_STRING "1.57 dev" +#define CPPCHECK_VERSION 0,0,0,0 +#define LEGALCOPYRIGHT "Copyright (C) 2007-2012 Daniel Marjam\xE4ki and Cppcheck team." diff --git a/lib/version.rc b/lib/version.rc new file mode 100644 index 000000000..cff2debd7 --- /dev/null +++ b/lib/version.rc @@ -0,0 +1,34 @@ +#include "version.h" +#include "winresrc.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION CPPCHECK_VERSION + PRODUCTVERSION CPPCHECK_VERSION + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS (0x1L|VS_FF_PRERELEASE) +#else + FILEFLAGS (0x0L|VS_FF_PRERELEASE) +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "cppcheck core library" + VALUE "FileVersion", CPPCHECK_VERSION_STRING + VALUE "InternalName", "cppcheck" + VALUE "LegalCopyright", LEGALCOPYRIGHT + VALUE "OriginalFilename", "cppcheck.exe" + VALUE "ProductName", "cppcheck core library" + VALUE "ProductVersion", CPPCHECK_VERSION_STRING + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END