From 59bcbc79b3d056a6b36901f96afa405454f35f52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zdenko=20Podobn=C3=BD?= Date: Fri, 15 May 2015 15:14:49 +0200 Subject: [PATCH] fix GIT_VER info in VS2010 --- api/baseapi.cpp | 2 +- vs2010/port/vcsversion.h | 2 +- vs2010/version.bat | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/baseapi.cpp b/api/baseapi.cpp index d5b6357551..e03642bb08 100644 --- a/api/baseapi.cpp +++ b/api/baseapi.cpp @@ -140,7 +140,7 @@ TessBaseAPI::~TessBaseAPI() { * Returns the version identifier as a static string. Do not delete. */ const char* TessBaseAPI::Version() { -#if defined(DEBUG) && defined(GIT_REV) +#if defined(GIT_REV) && (defined(DEBUG) || defined(_DEBUG)) return GIT_REV; #else return TESSERACT_VERSION_STR; diff --git a/vs2010/port/vcsversion.h b/vs2010/port/vcsversion.h index e93cd405ad..a01a411b67 100644 --- a/vs2010/port/vcsversion.h +++ b/vs2010/port/vcsversion.h @@ -1 +1 @@ -#define GIT_REV "3.03-rc1-159-g035b324" +#define GIT_REV "3.04-rc1-69-gaec22a4" diff --git a/vs2010/version.bat b/vs2010/version.bat index 6a6d7ce4f5..68e6882880 100644 --- a/vs2010/version.bat +++ b/vs2010/version.bat @@ -1,2 +1,2 @@ -REM @echo off -FOR /F "tokens=*" %%i IN ('call git describe --always') DO echo #define GIT_REV "%%i" > ..\port\vcsversion.h \ No newline at end of file +@echo off +FOR /F "tokens=*" %%i IN ('call git describe --tags --always') DO echo #define GIT_REV "%%i" > ..\port\vcsversion.h \ No newline at end of file