From 22dc0fbf6b116e85b7eefc0674ab326d72b22fa0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 28 May 2012 15:37:58 +0000 Subject: fix for the make_ver.bat git-svn-id: http://svn.miranda-ng.org/main/trunk@216 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/build.no | 2 +- bin10/make_ver.bat | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) (limited to 'bin10') diff --git a/bin10/build.no b/bin10/build.no index e6442bdc64..20a401d944 100644 --- a/bin10/build.no +++ b/bin10/build.no @@ -1 +1 @@ -92 1 0 \ No newline at end of file +0 92 1 \ No newline at end of file diff --git a/bin10/make_ver.bat b/bin10/make_ver.bat index fae2c806ec..ed7cf308ee 100644 --- a/bin10/make_ver.bat +++ b/bin10/make_ver.bat @@ -1,24 +1,29 @@ -@echo off +rem @echo off + +for /F "tokens=2,3" %%i in (..\include\m_version.h) do if "%%i"=="MIRANDA_VERSION_FILEVERSION" (set OldVer=%%j) +echo %OldVer% for /F "tokens=1,2" %%i in ('svn info miranda32.sln') do call :AddBuild %%i %%j goto :eof :AddBuild if (%1) == (Revision:) ( - for /F "tokens=1,2,3 delims= " %%i in (build.no) do call :WriteVer %%i %%j %2 + for /F "tokens=1,2,3 delims= " %%i in (build.no) do call :WriteVer %%i %%j %%k %2 ) goto :eof :WriteVer +if "%OldVer%" == "%1,%2,%3,%4" (goto :eof) + copy m_version.h.in ..\include\m_version.h -echo #define MIRANDA_VERSION_FILEVERSION 0,%1,%2,%3 >>..\include\m_version.h -echo #define MIRANDA_VERSION_STRING "0.%1.%2.%3" >>..\include\m_version.h -echo #define MIRANDA_VERSION_DISPLAY "0.%1.%2 alpha build #%3" >>..\include\m_version.h -echo #define MIRANDA_VERSION_DWORD MIRANDA_MAKE_VERSION(0, %1, %2, %3) >>..\include\m_version.h -echo #define MIRANDA_VERSION_CORE MIRANDA_MAKE_VERSION(0, %1, %2, 0) >>..\include\m_version.h -echo #define MIRANDA_VERSION_CORE_STRING "0.%1.%2.0" >>..\include\m_version.h +echo #define MIRANDA_VERSION_FILEVERSION %1,%2,%3,%4 >>..\include\m_version.h +echo #define MIRANDA_VERSION_STRING "%1.%2.%3.%4" >>..\include\m_version.h +echo #define MIRANDA_VERSION_DISPLAY "%1.%2.%3 alpha build #%4" >>..\include\m_version.h +echo #define MIRANDA_VERSION_DWORD MIRANDA_MAKE_VERSION(%1, %2, %3, %4) >>..\include\m_version.h +echo #define MIRANDA_VERSION_CORE MIRANDA_MAKE_VERSION(%1, %2, %3, 0) >>..\include\m_version.h +echo #define MIRANDA_VERSION_CORE_STRING "%1.%2.%3.0" >>..\include\m_version.h echo. >>..\include\m_version.h echo #endif // M_VERSION_H__ >>..\include\m_version.h goto :eof -- cgit v1.2.3