#92 -- Merge branch '#fix_version_regex' into master

Author: roman-modelist-dev

keychain_lib/src/version_info.cpp

@@ -40,14 +40,15 @@ about_info keychain_app::version_info::about()
 
 std::string keychain_app::version_info::version()
 {
-  static const std::regex VERSION_REGEXP("^\\d+\\.\\d+\\-\\d+");
+  static const std::regex VERSION_REGEXP("^\\d+\\.\\d+(\\-\\d)*");
   std::string description_string( git_revision_description );
   auto it = std::sregex_iterator(description_string.begin(), description_string.end(), VERSION_REGEXP);
   if(it == std::sregex_iterator())
     FC_LIGHT_THROW_EXCEPTION(fc_light::internal_error_exception, "Invalid version string has been returned by Git");
   auto version_string = it->str();
   auto replace_pos = version_string.find('-');
-  version_string[replace_pos] = '.';
+  if (replace_pos != std::string::npos)
+    version_string[replace_pos] = '.';
   return version_string;
 }
 

keychain_win/keychain_service/service_installer/wsserverinstaller/CMakeLists.txt

@@ -127,9 +127,15 @@ if(WIN32)
 	list( APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/git_version_gen" )
     include( GetGitRevisionDescription )
 	git_describe(KEYCHAIN_COMMON_GIT_REVISION_DESCRIPTION --tags)
-	SET(VERSION_REGEXP "^[0-9]+\\.[0-9]+\\-[0-9]+")
+	SET(VERSION_REGEXP "^[0-9]+\\.[0-9]+(\\-[0-9])*")
 	string(REGEX MATCH ${VERSION_REGEXP} VERSION_STRING_GIT ${KEYCHAIN_COMMON_GIT_REVISION_DESCRIPTION})
-	string(REGEX REPLACE "\\-" "." VERSION_STRING ${VERSION_STRING_GIT})
+	string(FIND ${VERSION_STRING_GIT} "-" 3RD_NUM_POS)
+	if (${3RD_NUM_POS} EQUAL "-1")
+		set(VERSION_STRING ${VERSION_STRING_GIT})
+	    string(APPEND VERSION_STRING ".0")
+	else()
+		string(REPLACE "-" "." VERSION_STRING ${VERSION_STRING_GIT})
+	endif()
 	set(installerversion ${VERSION_STRING})
 
 	#-bf - flag causes all of the files to be bound int the resulting .wixout/.* file.