Fixes issue version info extraction.

master
Dominik Deák 4 years ago
parent 2f40d80a42
commit 41dddc9955
  1. 8
      Scripts/Detail/Config.py
  2. 2
      Synergy-Core

@ -147,12 +147,12 @@ class Configuration():
versionParts = re.findall( r'set \(SYNERGY_VERSION_\w+ "?(\w+)"?\)', versionData ) versionParts = re.findall( r'set \(SYNERGY_VERSION_\w+ "?(\w+)"?\)', versionData )
if len( versionParts ) != 4: if len( versionParts ) == 0:
printError( "Failed to extract version information." ) utility.printError( "Failed to extract version information." )
raise SystemExit( 1 ) raise SystemExit( 1 )
self.productVersion = ".".join( versionParts[ 0:3 ] ) self.productVersion = ".".join( versionParts[ 0:-1 ] )
self.productStage = versionParts[ 3 ] self.productStage = versionParts[ -1 ]
self.productRevision = utility.captureCommandOutput( "git rev-parse --short=8 HEAD" ) self.productRevision = utility.captureCommandOutput( "git rev-parse --short=8 HEAD" )
self.productPackageName = "-".join( [ self.productName, self.productVersion, self.productStage, self.platformVersion ] ).lower() self.productPackageName = "-".join( [ self.productName, self.productVersion, self.productStage, self.platformVersion ] ).lower()

@ -1 +1 @@
Subproject commit 9b29327b40ab007dbbeb751ccd62bb1c3b917a08 Subproject commit ede272185d5acae6466bfd19edeb8efed95ac429
Loading…
Cancel
Save