diff --git a/Update_Rev.bat b/Update_Rev.bat index 877a0eb..bdc22a9 100644 --- a/Update_Rev.bat +++ b/Update_Rev.bat @@ -1,11 +1,13 @@ -::@ECHO OFF +@ECHO OFF SETLOCAL ENABLEDELAYEDEXPANSION +SET CURRENT_PATH=%~dp0 SET CURRENT_TIME=%TIME% SET CURRENT_DATE=%DATE% 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 @@ -29,12 +31,8 @@ SET PCF=0 SET PYS=0 SET PA=0 -SET CURRENT_PATH=%CD% -CD .. -SET PARENT=!CURRENT_PATH:%CD%\=! -SET NEW_PATH=%CURRENT_PATH%\%PARENT% -CD /d "%NEW_PATH%" -ECHO #pragma once > revision.h +CD /D "%CURRENT_PATH%" +ECHO #pragma once> revision.h 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") @@ -47,7 +45,7 @@ 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:%%y%%m%%d ^| find /I "Date:"') DO (SET GIT_DATE_NUM=%%B) 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=Build time: %%A, %%B %%C" + SET "GIT_DATETIME=Git time: %%A, %%B %%C" SET "GIT_TIME=%%C" ) @@ -56,28 +54,28 @@ SET VS=%VerMajor%.%VerMinor%.%VerBuild% SET VNF=%VerMajor%,%VerMinor%,%VerBuild%,%GIT_COUNT% SET VN=%VerMajor%,%VerMinor%,%VerBuild% -SET PNF="%PN% v%VS% (C++)" -SET PCF="Copyright (C) %PYS%-%CURRENT_YEAR% by %PA%" +SET PNF=%PN% v%VS% (C++) +SET PCF=Copyright (C) %PYS%-%CURRENT_YEAR% by %PA% -SET INT_NAME="%PN%C++" -SET ORIG_NAME="%PN%.exe" +SET INT_NAME=%PN%C++ +SET ORIG_NAME=%PN%.exe -ECHO #define BUILD_DATE "%BUILDDATE%" >> revision.h -ECHO #define BUILD_TIME "%BUILDTIME%" >> revision.h -::ECHO #define GIT_DATE_HUMAN "%GIT_DATE_NUM%" >> revision.h -ECHO #define GIT_DATE "%GIT_DATE%" >> revision.h -ECHO #define GIT_TIME "%GIT_TIME%" >> revision.h -ECHO #define GIT_DATETIME "%GIT_DATETIME%" >> revision.h +ECHO #define BUILD_DATE "%BUILDDATE%">> revision.h +ECHO #define BUILD_TIME "%BUILDTIME%">> revision.h +ECHO #define BUILD_DATETIME "%BUILD_DATETIME%">> revision.h +ECHO #define GIT_DATE "%GIT_DATE%">> revision.h +ECHO #define GIT_TIME "%GIT_TIME%">> revision.h +ECHO #define GIT_DATETIME "%GIT_DATETIME%">> revision.h ECHO #define GIT_COUNT %GIT_COUNT% >> revision.h ECHO #define V_SECS %BUILDSECS% >> revision.h -ECHO #define INTERNAL_NAME %INT_NAME% >> revision.h -ECHO #define ORIG_FILE_NAME %ORIG_NAME% >> revision.h -ECHO #define PRODUCT_NAME_FULL %PNF% >> revision.h -ECHO #define PRODUCT_COPYRIGHT %PCF% >> revision.h +ECHO #define INTERNAL_NAME "%INT_NAME%">> revision.h +ECHO #define ORIG_FILE_NAME "%ORIG_NAME%">> revision.h +ECHO #define PRODUCT_NAME_FULL "%PNF%">> revision.h +ECHO #define PRODUCT_COPYRIGHT "%PCF%">> revision.h ECHO #define VERSION_NUM %VN% >> revision.h -ECHO #define VERSION_STR "%VS%" >> revision.h +ECHO #define VERSION_STR "%VS%">> revision.h ECHO #define VERSION_NUM_FULL %VNF% >> revision.h -ECHO #define VERSION_STR_FULL "%VSF%" >> revision.h -pause +ECHO #define VERSION_STR_FULL "%VSF%">> revision.h + ENDLOCAL EXIT diff --git a/Version.h b/Version.h new file mode 100644 index 0000000..3296db6 --- /dev/null +++ b/Version.h @@ -0,0 +1,13 @@ +// wCenterWindow +// Version.h +// +#pragma once +#include "revision.h" + +#define V_MAJOR 2 +#define V_MINOR 3 +#define V_BUILD 3 +#define PRODUCT_NAME "wCenterWindow" +#define PRODUCT_AUTHORS "W0LF aka 'dreamforce'" +#define PRODUCT_YEAR_START 2020 +#define PRODUCT_DESCRIPTION "Centers windows by hotkey" diff --git a/wCenterWindow/Version.h b/wCenterWindow/Version.h deleted file mode 100644 index 80b0622..0000000 --- a/wCenterWindow/Version.h +++ /dev/null @@ -1,13 +0,0 @@ -// wCenterWindow -// Version.h -// -#pragma once -#include "revision.h" - -#define V_MAJOR 2 -#define V_MINOR 3 -#define V_BUILD 3 -#define PRODUCT_NAME "wCenterWindow" -#define PRODUCT_AUTHORS "W0LF aka 'dreamforce'" -#define PRODUCT_YEAR_START 2020 -#define PRODUCT_DESCRIPTION "Centers windows by hotkey (C++)" diff --git a/wCenterWindow/wCenterWindow.rc b/wCenterWindow/wCenterWindow.rc index 86ebed5..972597d 100644 Binary files a/wCenterWindow/wCenterWindow.rc and b/wCenterWindow/wCenterWindow.rc differ diff --git a/wCenterWindow/wCenterWindow.vcxproj b/wCenterWindow/wCenterWindow.vcxproj index a73d57a..6c3ac0f 100644 --- a/wCenterWindow/wCenterWindow.vcxproj +++ b/wCenterWindow/wCenterWindow.vcxproj @@ -103,7 +103,7 @@ - ..\Update_Rev.bat + "$(SolutionDir)Update_Rev.bat" @@ -128,7 +128,7 @@ %(AdditionalManifestFiles) - ..\Update_Rev.bat + "$(SolutionDir)Update_Rev.bat" @@ -148,7 +148,7 @@ %(AdditionalManifestFiles) - ..\Update_Rev.bat + "$(SolutionDir)Update_Rev.bat" @@ -173,7 +173,7 @@ %(AdditionalManifestFiles) - ..\Update_Rev.bat + "$(SolutionDir)Update_Rev.bat"