Avoid an assertion failure when loading settings from winmerge.ini

[winmerge-jp/winmerge-jp.git] / SetVersion.cmd

diff --git a/SetVersion.cmd b/SetVersion.cmd
index c39fca0..b99f644 100644 (file)
--- a/SetVersion.cmd
+++ b/SetVersion.cmd
@@ -1,12 +1,17 @@
 set MAJOR=2
-set MINOR=14
-set REVISION=0
-set PATCHLEVEL=97
-set PRIVATEBUILD=jp-97
+set MINOR=16
+set REVISION=12
+set PATCHLEVEL=0
+set STRPRIVATEBUILD=""
 
 set RCVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
 rem set STRVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
 set STRVER=%MAJOR%.%MINOR%.%REVISION%
-set APPVER=%STRVER%+-%PRIVATEBUILD%
-set SAFEAPPVER=%STRVER%-%PRIVATEBUILD%
-
+SET PRIVATEBUILD=%STRPRIVATEBUILD:"=%
+if %STRPRIVATEBUILD% == "" (
+  set APPVER=%STRVER%
+  set SAFEAPPVER=%STRVER%
+) else (
+  set APPVER=%STRVER%+-%PRIVATEBUILD%
+  set SAFEAPPVER=%STRVER%-%PRIVATEBUILD%
+)