From ef2610e60028feaffc1feeeec062627f5c034600 Mon Sep 17 00:00:00 2001 From: Ansgar Becker Date: Tue, 13 Jan 2009 00:38:52 +0000 Subject: [PATCH] Fix exe versioning in auto build mode. Replaces binary .res file by .rc files and compiles them at build time. --- extra/build_everything.cmd | 2 ++ packages/delphi11/heidisql.dpr | 3 ++- packages/delphi11/heidisql.dproj | 6 ++++++ packages/delphi11/heidisql.res | Bin 13336 -> 0 bytes packages/delphi11/icon.rc | 1 + packages/delphi11/version.rc | 20 ++++++++++++++++++++ 6 files changed, 31 insertions(+), 1 deletion(-) delete mode 100644 packages/delphi11/heidisql.res create mode 100644 packages/delphi11/icon.rc create mode 100644 packages/delphi11/version.rc diff --git a/extra/build_everything.cmd b/extra/build_everything.cmd index f93b7797..dc175bd4 100644 --- a/extra/build_everything.cmd +++ b/extra/build_everything.cmd @@ -225,6 +225,8 @@ if not %err% == 0 goto end rem Build main executable echo Compiling main project. cd /d "%base_dir%\packages\%package_dir%\" +brcc32 version.rc +brcc32 icon.rc "%compiler%" %params% -e"%base_dir%\out" heidisql.dpr if not %errorlevel% == 0 goto end diff --git a/packages/delphi11/heidisql.dpr b/packages/delphi11/heidisql.dpr index d4359749..5c706b00 100644 --- a/packages/delphi11/heidisql.dpr +++ b/packages/delphi11/heidisql.dpr @@ -43,7 +43,8 @@ uses uVistaFuncs in '..\..\source\uVistaFuncs.pas', dataviewsave in '..\..\source\dataviewsave.pas' {FrmDataViewSave}; -{$R *.RES} +{$R icon.RES} +{$R version.RES} begin debug('perf: All modules loaded.'); diff --git a/packages/delphi11/heidisql.dproj b/packages/delphi11/heidisql.dproj index 4f4b272c..4ce528d7 100644 --- a/packages/delphi11/heidisql.dproj +++ b/packages/delphi11/heidisql.dproj @@ -58,6 +58,12 @@ MainSource + +
icon.res
+
+ +
version.res
+
AboutBox
diff --git a/packages/delphi11/heidisql.res b/packages/delphi11/heidisql.res deleted file mode 100644 index 3080b66d1802c0d5b03ebb3986cf22c3df880f01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13336 zcmd^F3tSY{9v%f!G)>LYigG1Oufl-9O(9Xa47ZzW;a5nVH== zvlK;90&LCAWJA%w;>`5*W{Byct?SdLo4Gz{7z%x`39xmc24c@^`6e4Eii(Q9GuaSa zTU&eCWJ53;A71rqD5@XV0D`XMacRL4NMsxvx9S2>G`iW)O~h+Jz1?LjGfi8H9uT=a%f-3qQ6C7h57B zTGUCp{#;_}CSuxD7%r6RhWJxB!``OIVYh-s6bO^U)x&Xdp!6dG?CQ=u>S@8AE!(2&SxzYPsBGb(lC^X#xu!$Xt=FTUl?jt|%{fP=;b;pT7I|D}oRkHB;L zzA+WZ$Erg{$OE`=kokv|-Xi1Q%j&h4T>}XE4IRnyW0oy?KGW6WsbNAn&LWTlBNRd| z56U2Sn?KztIhc!4Nx>{X-~9Hn8q(uAE8pxBgqiG}lBaQbPzL$MR4E)CiDISQ6*DD3S}84@GVA4-JUN;JoG+J1kJr|BcaO z=WaqS*F`j!2W60Zua=Hm5zB?!@)+<3?Y?3&ea`sB`&f~fM0or*orVV&?<~G8l6I+@yE1m0WmjoE=tn z+jLqs(kn~D&g7f~3%rOKd9>3t?q9CKjX^@N7v2dC;!+{63j)1pi$t zrtaA@bx)BIgnNoY_m)gAE*F(n(d7r?Dyt>?Yh<6-C=S%fs|w|n>58hg1Sm@@(q!dn zp~Z`)?0dgO1Qst0D_tzASRS{3jqG5Cx;ittCOf4z$8^lE*%VQ=G^p|;4i-mzzKpI; zlhtm}9LY)idzf>0)67GwLJutm!fRI2hcgt%vQ=N@J}x95%Zog^HsV-X%!v*1x?Dxw zrpF7-sr;C_toZs|+1b2~fa=U<+4;>0-*yy~UvI%JSMkF(`Gv<1(1JXbc|3SR#^l~+ z#eI&!;sVV0ImRBoS=icmj=|HwzdC_I2DIYQ0fkOt5K~`Y-w{t>kH!fx7@6~(#vlem z^i8KR^4w|ia#x23;yD##^L?i=h(Vu!=rjf~7@MCujX?~?rllw9C*y+{Jj!2c)ebiN zy!OkhX-EDp(vMs%KhtWaOP3(#;>C+bivirjFV0_zsBF&y1G@~+Vxi)GdHv<9Eg4A) zF_;*`We9_#%_n{_@q4a`Ve7tXG+e4MIKrX=)#=_)SL7sayQne#e=Ex%-pf zb~fmiQ6E81Sm_-n`Rb>7^&=;?%e;K($*Q}}pY2bG!I|?HzkPB}w}4IbVEwZ15PL5A zylP9*vDX)wDUYS4&j^N-DzqA{UQhfR>+bMp`wJ82rU`eD`tf1>avcxR1O6^%=0-5m zgX{W@utchh?&;KOjIUqb86pPzchU>_a>4JW2^&9ehND`@2hY`+gi1GGuQ`Mk-{eBL z>t`c9BgG#R4^9|d@8q__>hWH`lP?$i5aXE|>68+}hY4vL4fL3BKYaRy!O%0nVO;3G zMpgz}@X7pyFBkj}IRloLJAW%e#(~%eu(j295?p; znSAixz$~Bwre9yr+qggv7Vkq#n0qPa3!i9X=j4*ZNjabK<$@n#CN7t_eiX?EpDgAg zZI>RemHWF|bc3YseFr@EhI7vWuV~NhF2Q@4uXeth_VDF`A7Xr0%ds%bhlx1_M9-TM zDd_l+Ns;7`-G}UJgdf0L8rJEZRz1+cov1Q&`)@1e%LPBg z1m>n-A)F6>TX(e1-`?7Q?WKIV;D;Dt!91Tl4IlgqceXcU>+w@|mht6+A7X+FQzvar z;lt#@45J%t>*?C8_1}@tmkWM~3ElPnb!`OkMX|36ahQ_RxIK}Naf;LpRW*Cubo|+nRqy-qcQ)BJkf!b!3UNY zA?)C?sG2nC;Y{_>oc|@}ewl~7VKpmQ%=ltW{Lu}{3`zT?5QGmL7j1 zOK~dq2_pGKe(doL(@(CAK9wmuy-EJ0kyN)?T$deFpDk_3?+nnKDUhDclYFzelR$lL z%YyGeO}J3dNsxNsGklR-@YC+u7Yd&^AOm7ju|2src}(*EPfKOGjb~Km9VN3hH}|F{ zQ|^=x<%i9K^2dL@ao=k)jm+?-llec8Vt!TKg%SwJ5%b&5u9Q9Km^$VSsTtKDB%`r4 zH}{}~;19r`uQr1_j(rUB*!Qtye~&E;@Unke=&n#m#8D!(SS|xcE`BbGRN(4^4dP*3 zZMj_?;R&XuQZuoiKn0>iGR(w(KgtW)7^^aG`VXU#=?P={|86KVzer_75Ox%F_8+Zd zDy62Bl$erHv0xKZ5{d@1jEbS;h&!*1v8Nm{qR!YHp@C6kt(l=w^B!OU0ojvEfE>LPUt5k4EoAC?`OP z-o{hC5bdwyU`CP2tM4;&L`EbItw|qM)NDl9;y4)_V7iXRJ1fwk|F?sOyz2=QOd@sqT*<&NM$1xM=9khd5qd7N-iBE zQb}zS9jpaXkxU#ztJJ~VY@iYdSTdhzTBa7OQy8Z}piWUBW0F`la)dSU$V5_jJmk^z zJG4kC2z2)pOjT>5#d2N!gN~plwj-QIyk$FTl>JC+0coyK%A;tNO0INQM#YKMbd*}7 z1mAFLJ0c^RR?sp?h)U5OLzv#9cGq=RSHY{fW!;RIXrHVf8ru-DELxtVvh|QlrE-~# zhg_ys$|WjYPnZ^LZ=BE>{Bf!jnn>KGCebNEc>;}za~kD5D$>c(!O<})D#jr?h7&3g z$znC4SZzPaFfiP032DY9CpQ+{9C1q_uu@Rdkd_iRpeYs7iXa z2B!!e9iS8^iY0U`tzs*oiLIWHjHb*z+LunGB@enK5J(t@tF=hwBTK~CC^;h`5NO2i rQOp_OY8@kzsA%21GvmQ@m}P$`xr?2FR2Mt8&rs)Lr@t0(fNSl)N9-|c diff --git a/packages/delphi11/icon.rc b/packages/delphi11/icon.rc new file mode 100644 index 00000000..211cbc12 --- /dev/null +++ b/packages/delphi11/icon.rc @@ -0,0 +1 @@ +MAINICON ICON "../../res/mainicon.ico" \ No newline at end of file diff --git a/packages/delphi11/version.rc b/packages/delphi11/version.rc new file mode 100644 index 00000000..9c155853 --- /dev/null +++ b/packages/delphi11/version.rc @@ -0,0 +1,20 @@ +1 VERSIONINFO + FILEVERSION 0,0,0,0 + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "FileDescription", "A lightweight, fast and flexible interface to MySQL\000" + VALUE "ProductName", "HeidiSQL\000" + VALUE "LegalCopyright", "See GLP license\000" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409 0x04E4 + END + END + \ No newline at end of file