Added bacK MSI_VERSION

Author: azonenberg

CMakeLists.txt

@@ -34,8 +34,27 @@ if(Git_FOUND)
 		OUTPUT_VARIABLE NGSCOPECLIENT_VERSION
 		OUTPUT_STRIP_TRAILING_WHITESPACE)
 	message("Git reports scopehal-apps version ${NGSCOPECLIENT_VERSION}")
+
+
+	execute_process(
+		COMMAND ${GIT_EXECUTABLE} describe --always --tags --long
+		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+		OUTPUT_VARIABLE NGSCOPECLIENT_VERSION_LONG
+		OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+	# Ugly string parsing to make windows build happy
+	# First path: release candidate tags
+	if(NGSCOPECLIENT_VERSION_LONG MATCHES "v([0-9]*).([0-9]*)-rc([0-9])-([0-9]*)")
+		set(MSI_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}.${CMAKE_MATCH_4}")
+
+	# Release tags
+	elseif(NGSCOPECLIENT_VERSION_LONG MATCHES "v([0-9]*).([0-9]*)-([0-9]*)")
+		set(MSI_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.0.${CMAKE_MATCH_3}")
+	endif()
+
 else()
 	set(NGSCOPECLIENT_VERSION "unknown")
+	set(MSI_VERSION "0.1")
 	message("Git not detected, scopehal-apps version unknown")
 endif()
 

src/ngscopeclient/wix/ngscopeclient.wxs.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?define Manufacturer = "Antikernel Labs" ?>
 <?define Product = "ngscopeclient" ?>
-<?define Version = "0.1" ?>
+<?define Version = "@MSI_VERSION@" ?>
 <?define RegKey = "ngscopeclient" ?>
 <?define DefaultInstallDir = "ngscopeclient" ?>
 <?define ShortcutTarget = "ngscopeclient.exe" ?>
@@ -15,7 +15,7 @@
     <Property Id="ARPURLINFOABOUT" Value="https://www.github.com/azonenberg/scopehal-apps" />
     <Property Id="ARPURLUPDATEINFO" Value="https://www.github.com/azonenberg/scopehal-apps" />
     <Property Id="ARPNOMODIFY" Value="1" />
-    <Directory Id="TARGETDIR" Name="SourceDir">      
+    <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramMenuFolder">
         <Directory Id="ProgramMenuDir" Name="ngscopeclient">
           <Component Id="StartMenuShortcuts" Guid="$(var.Uuid.StartMenuShortcuts)">
@@ -43,7 +43,7 @@
     <UIRef Id="WixUI_Custom" />
     <Property Id="ALLUSERS" Value="1" />
     <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
-    <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" /> 
+    <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" />
     <UI Id="WixUI_Custom">
       <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
       <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />