From 6b3a90d68248b748c9d09a77e80646cb5dd8ae2a Mon Sep 17 00:00:00 2001 From: W0LF Date: Sun, 26 Mar 2023 21:29:55 +0300 Subject: [PATCH] Update versioning scripts. --- Update_version.bat | 71 ++++++++++++++++------------ wCenterWindow.sln | 10 +++- wCenterWindow/VersionInfo.h | 28 +++++++++++ wCenterWindow/VersionInfo.rc | Bin 0 -> 1954 bytes wCenterWindow/framework.h | 2 +- wCenterWindow/resource.h | 6 +++ wCenterWindow/wCenterWindow.rc | Bin 14644 -> 12890 bytes wCenterWindow/wCenterWindow.vcxproj | 23 ++++++--- 8 files changed, 100 insertions(+), 40 deletions(-) create mode 100644 wCenterWindow/VersionInfo.h create mode 100644 wCenterWindow/VersionInfo.rc diff --git a/Update_version.bat b/Update_version.bat index 7f79ddb..3df6465 100644 --- a/Update_version.bat +++ b/Update_version.bat @@ -1,4 +1,5 @@ @ECHO OFF +CHCP 1251 >nul SETLOCAL ENABLEDELAYEDEXPANSION SET CURRENT_TIME=%TIME% @@ -8,8 +9,8 @@ SET BUILDTIME=%CURRENT_TIME:~0,8% SET BUILDDATE=%CURRENT_DATE% SET BUILD_DATETIME=Build time: %BUILDDATE% %BUILDTIME% SET CURRENT_YEAR=%CURRENT_DATE:~6,4% - SET BUILDSECS=0 + SET GIT_COUNT=0 SET GIT_TIME=0 SET GIT_DATE=0 @@ -28,25 +29,28 @@ SET PYS=0 SET PA=0 CD /D %~dp0 -IF NOT EXIST "VersionInfo.h" ( - ECHO Can't find file 'VersionInfo.h' +IF NOT EXIST "Version.h" ( + ECHO Can't find file 'Version.h' TIMEOUT /T 3 EXIT /B 1 ) -COPY /Y "VersionInfo.h" "version.h" >nul +COPY /Y "Version.h" "VersionInfo.h" >nul -FOR /F "tokens=3" %%A IN ('FINDSTR /I /L /C:"define V_MAJOR" "version.h"') DO (SET "VerMajor=%%A") -FOR /F "tokens=3" %%A IN ('FINDSTR /I /L /C:"define V_MINOR" "version.h"') DO (SET "VerMinor=%%A") -FOR /F "tokens=3" %%A IN ('FINDSTR /I /L /C:"define V_PATCH" "version.h"') DO (SET "VerPatch=%%A") -FOR /F "tokens=3" %%A IN ('FINDSTR /I /L /C:"define PRODUCT_NAME" "version.h"') DO (SET "PN=%%~A") -FOR /F "tokens=3" %%A IN ('FINDSTR /I /L /C:"define PRODUCT_YEAR_START" "version.h"') DO (SET "PYS=%%A") -FOR /F "tokens=2*" %%A IN ('FINDSTR /I /L /C:"define PRODUCT_AUTHORS" "version.h"') DO (SET "PA=%%~B") +FOR /F "tokens=3" %%A IN ('FINDSTR /I /L /C:"define V_MAJOR" "VersionInfo.h"') DO (SET "VerMajor=%%A") +FOR /F "tokens=3" %%A IN ('FINDSTR /I /L /C:"define V_MINOR" "VersionInfo.h"') DO (SET "VerMinor=%%A") +FOR /F "tokens=3" %%A IN ('FINDSTR /I /L /C:"define V_PATCH" "VersionInfo.h"') DO (SET "VerPatch=%%A") +FOR /F "tokens=3" %%A IN ('FINDSTR /I /L /C:"define PRODUCT_NAME" "VersionInfo.h"') DO (SET "PN=%%~A") +FOR /F "tokens=3" %%A IN ('FINDSTR /I /L /C:"define PRODUCT_YEAR_START" "VersionInfo.h"') DO (SET "PYS=%%A") +FOR /F "tokens=2*" %%A IN ('FINDSTR /I /L /C:"define PRODUCT_AUTHORS" "VersionInfo.h"') DO (SET "PA=%%~B") FOR /F "tokens=1-4 delims=:., " %%A IN ("%BUILDTIME%") DO (SET /A "BUILDSECS=%%A * 3600 + %%B * 60 + %%C") -FOR /F "delims=" %%A IN ('git rev-list --count HEAD') DO (SET /A GIT_COUNT=%%A) -FOR /F "tokens=1,2 delims= " %%A IN ('git log -1 --date=format:%%d.%%m.%%Y ^| find /I "Date:"') DO (SET "GIT_DATE=%%B") -FOR /F "tokens=2-4 delims=, " %%A IN ('git log -1 --date=format:"%%a,%%d-%%h-%%Y,%%T" ^| find /I "Date:"') DO ( - SET "GIT_DATETIME=Git time: %%A, %%B %%C" - SET "GIT_TIME=%%C" + +IF EXIST ".git" ( + FOR /F "delims=" %%A IN ('git rev-list --count HEAD') DO (SET /A GIT_COUNT=%%A) + FOR /F "tokens=1,2 delims= " %%A IN ('git log -1 --date=format:%%d.%%m.%%Y ^| find /I "Date:"') DO (SET "GIT_DATE=%%B") + FOR /F "tokens=2-4 delims=, " %%A IN ('git log -1 --date=format:"%%a,%%d-%%h-%%Y,%%T" ^| find /I "Date:"') DO ( + SET "GIT_DATETIME=Git time: %%A, %%B %%C" + SET "GIT_TIME=%%C" + ) ) SET VSF=%VerMajor%.%VerMinor%.%VerPatch%.%GIT_COUNT% @@ -60,22 +64,27 @@ SET PCF=Copyright (C) %PYS%-%CURRENT_YEAR% by %PA% SET INT_NAME=%PN%C++ SET ORIG_NAME=%PN%.exe -ECHO #define BUILD_DATE "%BUILDDATE%">> version.h -ECHO #define BUILD_TIME "%BUILDTIME%">> version.h -ECHO #define BUILD_DATETIME "%BUILD_DATETIME%">> version.h -ECHO #define GIT_DATE "%GIT_DATE%">> version.h -ECHO #define GIT_TIME "%GIT_TIME%">> version.h -ECHO #define GIT_DATETIME "%GIT_DATETIME%">> version.h -ECHO #define GIT_COUNT %GIT_COUNT% >> version.h -ECHO #define V_SECS %BUILDSECS% >> version.h -ECHO #define INTERNAL_NAME "%INT_NAME%">> version.h -ECHO #define ORIG_FILE_NAME "%ORIG_NAME%">> version.h -ECHO #define PRODUCT_NAME_FULL "%PNF%">> version.h -ECHO #define PRODUCT_COPYRIGHT "%PCF%">> version.h -ECHO #define VERSION_NUM %VN% >> version.h -ECHO #define VERSION_STR "%VS%">> version.h -ECHO #define VERSION_NUM_FULL %VNF% >> version.h -ECHO #define VERSION_STR_FULL "%VSF%">> version.h +ECHO #define BUILD_DATE "%BUILDDATE%">> VersionInfo.h +ECHO #define BUILD_TIME "%BUILDTIME%">> VersionInfo.h +ECHO #define BUILD_DATETIME "%BUILD_DATETIME%">> VersionInfo.h + +IF EXIST ".git" ( + ECHO #define GIT_DATE "%GIT_DATE%">> VersionInfo.h + ECHO #define GIT_TIME "%GIT_TIME%">> VersionInfo.h + ECHO #define GIT_DATETIME "%GIT_DATETIME%">> VersionInfo.h + ECHO #define GIT_COUNT %GIT_COUNT% >> VersionInfo.h +) + +ECHO #define V_SECS %BUILDSECS% >> VersionInfo.h +ECHO #define INTERNAL_NAME "%INT_NAME%">> VersionInfo.h +ECHO #define ORIG_FILE_NAME "%ORIG_NAME%">> VersionInfo.h +ECHO #define PRODUCT_NAME_FULL "%PNF%">> VersionInfo.h +ECHO #define PRODUCT_COPYRIGHT "%PCF%">> VersionInfo.h +ECHO #define VERSION_NUM %VN% >> VersionInfo.h +ECHO #define VERSION_STR "%VS%">> VersionInfo.h +ECHO #define VERSION_NUM_FULL %VNF% >> VersionInfo.h +ECHO #define VERSION_STR_FULL "%VSF%">> VersionInfo.h ENDLOCAL +TIMEOUT /T 1 >nul EXIT diff --git a/wCenterWindow.sln b/wCenterWindow.sln index df62922..fe3ab9e 100644 --- a/wCenterWindow.sln +++ b/wCenterWindow.sln @@ -1,10 +1,16 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31112.23 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.33516.290 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wCenterWindow", "wCenterWindow\wCenterWindow.vcxproj", "{F1A1603A-F5D0-47B8-8E4B-CF17747BCFBA}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C7B4FD1E-DC1B-46A4-842C-5130F09EFCB5}" + ProjectSection(SolutionItems) = preProject + Update_version.bat = Update_version.bat + Version.h = Version.h + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 diff --git a/wCenterWindow/VersionInfo.h b/wCenterWindow/VersionInfo.h new file mode 100644 index 0000000..e78339e --- /dev/null +++ b/wCenterWindow/VersionInfo.h @@ -0,0 +1,28 @@ +// wCenterWindow +// version.h +// +#pragma once + +#define V_MAJOR 2 +#define V_MINOR 3 +#define V_PATCH 5 +#define PRODUCT_NAME "wCenterWindow" +#define PRODUCT_AUTHORS "W0LF aka 'dreamforce'" +#define PRODUCT_YEAR_START 2020 +#define PRODUCT_DESCRIPTION "Centers windows by hotkey" +#define BUILD_DATE "26.03.2023" +#define BUILD_TIME "21:26:13" +#define BUILD_DATETIME "Build time: 26.03.2023 21:26:13" +#define GIT_DATE "16.03.2022" +#define GIT_TIME "17:42:44" +#define GIT_DATETIME "Git time: Wed, 16-Mar-2022 17:42:44" +#define GIT_COUNT 71 +#define V_SECS 77173 +#define INTERNAL_NAME "wCenterWindowC++" +#define ORIG_FILE_NAME "wCenterWindow.exe" +#define PRODUCT_NAME_FULL "wCenterWindow v2.3.5 (C++)" +#define PRODUCT_COPYRIGHT "Copyright (C) 2020-2023 by W0LF aka 'dreamforce'" +#define VERSION_NUM 2,3,5 +#define VERSION_STR "2.3.5" +#define VERSION_NUM_FULL 2,3,5,71 +#define VERSION_STR_FULL "2.3.5.71" diff --git a/wCenterWindow/VersionInfo.rc b/wCenterWindow/VersionInfo.rc new file mode 100644 index 0000000000000000000000000000000000000000..696dad222a084b5f037087977447402209f342fc GIT binary patch literal 1954 zcmd6n-EP`I5QWcmrM`njZ>xr?d4cd76en2VAoa>Z4Uk9)ARton@=d<+vRSW_Rs!`R zvS97qnR8~&%Yzf z-#6WIW%FH<{;O(jfcYhzvTO^0@{ndYl zwp)~qa}UhUzFDzf!e^|p$B_7(?I|(ZbGr8list&Mj0ocx!ugoUTc}pG^2{y#`eg+j zZvsk!b&A^UQke!3?C2xwm<3h2BeNMEu0LFFI4|>i4=tQlQC&9SKSl~Z|3dUu6Y7|f zrD@P0?v)<2)|42Z=%*=PGxoo78uw9w-!;mdldW}hRRfRh*OER;e{LGW8bRG`qi4sZD({`qz}}Q?2{}w&5P#`q%RDm9wwV7gm46 zHpSdMbxdX%Tr1}Ik&f8al&g2%;kw1>|EmkS#Mz1Te7h6h2NRUryy|$&O%Qin4w}vC Xmg-DvGi3L2vz%P_R-Kj*XLx%7QS$Ne literal 0 HcmV?d00001 diff --git a/wCenterWindow/framework.h b/wCenterWindow/framework.h index f8f264b..80b8a6e 100644 --- a/wCenterWindow/framework.h +++ b/wCenterWindow/framework.h @@ -6,7 +6,6 @@ #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers // Windows Header Files -#include #include #include #include @@ -17,3 +16,4 @@ // Project Specific Header Files #include "Logger.h" +#include "VersionInfo.h" diff --git a/wCenterWindow/resource.h b/wCenterWindow/resource.h index 1f65376..ce35626 100644 --- a/wCenterWindow/resource.h +++ b/wCenterWindow/resource.h @@ -2,6 +2,10 @@ // Microsoft Visual C++ generated include file. // Used by wCenterWindow.rc // +#define V_MAJOR 2 +#define V_MINOR 3 +#define V_PATCH 4 +#define GIT_COUNT 72 #define IDS_CLASSNAME 102 #define IDS_APP_TITLE 103 #define IDD_ABOUTBOX 104 @@ -33,6 +37,8 @@ #define IDC_BUTTON_CLOSE 1007 #define IDC_ABOUTHELP 1008 #define IDC_DONATIONLINK 1009 +#define PRODUCT_YEAR_START 2020 +#define V_SECS 52245 #define IDC_STATIC -1 // Next default values for new objects diff --git a/wCenterWindow/wCenterWindow.rc b/wCenterWindow/wCenterWindow.rc index 303d3900847857558cf74bd21277cdc96c14aa81..cedd24744cd3a1152a42125a02b760a60f22bf97 100644 GIT binary patch delta 336 zcmdl|bSq`Tf{mB<2u?21k&#qjC}S{U&|@$LViN`h1`P&h25lhJoLtBwJ^6%Cl)Vyz z6GJIOCPNNG3Q)cT$jW6%Wv~LWjTj7px(vX2jexWfkfi_=GXcsP1Nl}!mMPerFk!LD zdBRSKN^vn1q;?1XQcQ5DpaeVQ>So5*f0A zSb;$u=$ay+I}(AeNduZ$#E=Z+se^3W{7P7cX>y6M0J8!^&18Lk@y!Ne7kDO1D2d62 z0o4>S6a($fXUJpl1Y(e0J+N-2$!nFQCmSe#+B`{n6VJpV5dx|Ul^0KbW#I(?VkJe3 delta 1605 zcma)6O>a_B5Ir@qA=>%{wjl)igt#!(N-G-^6T@eVr9j|;F)<wFL2+xcjnBQGc)&B(@gfzm~L7Z<1?xm1Y;RUyP?3`C$E}5PP_mbR=@jOOL zla?lT=rOcgnlsd%GdhDCWt1!)Fj^9u*n&BinosgIyj<9paR!K&O+S1`z9GfGVD|2de+D4^G)P7*C>F5h`PuGGsUa50Rxjp`p`6 zN|Qy;lA=yxa-Jvk2%BiyilNoPRnMwaKf}fp75t3VW%Jh2K#dIQOrpwiHAt%oznXIg z)DN#?MfVX#LEN^OJ>kD!9r`Y-kk_X^I~|)vYMf$xVdrO@CSIV0GBNjA;WEFf+`rCK zy|N|x707vu?AT-$Ch_t*-iTw2C>=btxVM;tHGC)FN-^_fB4d)3(Nf>MZsD3d9$O!U z0av~6O2jjXH}2ID+qjM>N_NS#&9zKz_55W_WY}|DMYHimF+#IxnIcln!Vy(l)Ke-~ z!!yP>UeVzNp~`2M)sfF3IcIc+nIVRBfG`~CD_@gJNk!y}k$eZkJi~Qc$ITMA$p+tJ zjk>nH?RB5M9;Khi)uyJ7`QKF%HBZOMA*SA}EZ;ELdGhEzU1YxParQG4a97XHq^)#x lhl-VL-6uE8U_PYB*RjC~2{Q7v{!!r3qWbCnq%LgS`wNg179#)v diff --git a/wCenterWindow/wCenterWindow.vcxproj b/wCenterWindow/wCenterWindow.vcxproj index b1e9ac9..3c2f0d1 100644 --- a/wCenterWindow/wCenterWindow.vcxproj +++ b/wCenterWindow/wCenterWindow.vcxproj @@ -73,16 +73,25 @@ true + false false false + false + false + false + false true false + false + false + false + false @@ -103,7 +112,8 @@ - "$(SolutionDir)Update_version.bat" + start "" /wait "$(SolutionDir)Update_version.bat" && move /y "$(SolutionDir)VersionInfo.h" "$(ProjectDir)" + @@ -113,8 +123,8 @@ true true WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded + false + MultiThreadedDLL stdcpp17 @@ -128,7 +138,8 @@ %(AdditionalManifestFiles) - "$(SolutionDir)Update_version.bat" + start "" /wait "$(SolutionDir)Update_version.bat" && move /y "$(SolutionDir)VersionInfo.h" "$(ProjectDir)" + @@ -160,13 +171,13 @@ NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true stdcpp17 - MultiThreaded + MultiThreadedDLL Windows true true - true + false comctl32.lib;%(AdditionalDependencies)