diff --git a/Update_Rev.bat b/Update_version.bat similarity index 58% rename from Update_Rev.bat rename to Update_version.bat index bdc22a9..cbe1b04 100644 --- a/Update_Rev.bat +++ b/Update_version.bat @@ -32,14 +32,19 @@ SET PYS=0 SET PA=0 CD /D "%CURRENT_PATH%" -ECHO #pragma once> revision.h +IF NOT EXIST "VersionInfo.h" ( + ECHO Can't find file 'VersionInfo.h' + TIMEOUT /T 1 + EXIT /B 1 +) +COPY /Y "VersionInfo.h" "version.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_BUILD" "Version.h"') DO (SET "VerBuild=%%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" "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_BUILD" "version.h"') DO (SET "VerBuild=%%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=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:%%y%%m%%d ^| find /I "Date:"') DO (SET GIT_DATE_NUM=%%B) @@ -60,22 +65,22 @@ SET PCF=Copyright (C) %PYS%-%CURRENT_YEAR% by %PA% 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 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 VERSION_NUM %VN% >> 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 +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 ENDLOCAL EXIT diff --git a/Version.h b/VersionInfo.h similarity index 88% rename from Version.h rename to VersionInfo.h index 3296db6..a402d96 100644 --- a/Version.h +++ b/VersionInfo.h @@ -1,8 +1,7 @@ // wCenterWindow -// Version.h +// version.h // #pragma once -#include "revision.h" #define V_MAJOR 2 #define V_MINOR 3 diff --git a/wCenterWindow/wCenterWindow.rc b/wCenterWindow/wCenterWindow.rc index 972597d..303d390 100644 Binary files a/wCenterWindow/wCenterWindow.rc and b/wCenterWindow/wCenterWindow.rc differ diff --git a/wCenterWindow/wCenterWindow.vcxproj b/wCenterWindow/wCenterWindow.vcxproj index 3a2083e..b1e9ac9 100644 --- a/wCenterWindow/wCenterWindow.vcxproj +++ b/wCenterWindow/wCenterWindow.vcxproj @@ -103,7 +103,7 @@ - "$(SolutionDir)Update_Rev.bat" + "$(SolutionDir)Update_version.bat" @@ -128,7 +128,7 @@ %(AdditionalManifestFiles) - "$(SolutionDir)Update_Rev.bat" + "$(SolutionDir)Update_version.bat" @@ -148,7 +148,7 @@ %(AdditionalManifestFiles) - "$(SolutionDir)Update_Rev.bat" + "$(SolutionDir)Update_version.bat" @@ -173,7 +173,7 @@ %(AdditionalManifestFiles) - "$(SolutionDir)Update_Rev.bat" + "$(SolutionDir)Update_version.bat"