cmake: wix: windows: Use configured FLB_OUT_NAME value for fluent-bit executables' name

Signed-off-by: Hiroshi Hatake <[email protected]>

Author: cosmo0920

CMakeLists.txt

@@ -1110,9 +1110,11 @@ endif()
 if(CPACK_GENERATOR MATCHES "WIX")
   set(CPACK_WIX_UPGRADE_GUID cb6825fd-37e6-4596-a55d-6d490d4fe178)
   configure_file(LICENSE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt")
+  configure_file(${CMAKE_SOURCE_DIR}/cpack/wix/WIX.template.in.cmakein
+    ${CMAKE_CURRENT_BINARY_DIR}/WIX.template.in)
   # Specify LICENSE file that has .txt extension
   set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt")
-  set(CPACK_WIX_TEMPLATE ${CMAKE_SOURCE_DIR}/cpack/wix/WIX.template.in)
+  set(CPACK_WIX_TEMPLATE ${CMAKE_CURRENT_BINARY_DIR}/WIX.template.in)
   set(CPACK_WIX_LIGHT_EXTENSIONS "WixUtilExtension")
 endif()
 

cpack/wix/WIX.template.in renamed to cpack/wix/WIX.template.in.cmakein

@@ -78,19 +78,19 @@
         <?include "product_fragment.wxi"?>
 
         <Property Id="CreateFluentBitWinSvc" Value=" "/>
-        <CustomAction Id="SetCreateFluentBitWinSvcCommand" Property="CreateFluentBitWinSvc" Value="&quot;sc.exe&quot; create $(var.CPACK_PACKAGE_NAME) binpath= &quot;\&quot;[INSTALL_ROOT]bin\fluent-bit.exe\&quot; -c \&quot;[INSTALL_ROOT]conf\fluent-bit.conf\&quot;&quot; start= delayed-auto" Execute="immediate" />
+        <CustomAction Id="SetCreateFluentBitWinSvcCommand" Property="CreateFluentBitWinSvc" Value="&quot;sc.exe&quot; create @FLB_OUT_NAME@ binpath= &quot;\&quot;[INSTALL_ROOT]bin\@FLB_OUT_NAME@.exe\&quot; -c \&quot;[INSTALL_ROOT]conf\@FLB_OUT_NAME@.conf\&quot;&quot; start= delayed-auto" Execute="immediate" />
         <CustomAction Id="CreateFluentBitWinSvc" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="check" Impersonate="no" />
 
         <Property Id="LaunchFluentBitWinSvc" Value=" "/>
-        <CustomAction Id="SetLaunchFluentBitWinSvcCommand" Property="LaunchFluentBitWinSvc" Value="&quot;sc.exe&quot; start $(var.CPACK_PACKAGE_NAME)" Execute="immediate" />
+        <CustomAction Id="SetLaunchFluentBitWinSvcCommand" Property="LaunchFluentBitWinSvc" Value="&quot;sc.exe&quot; start @FLB_OUT_NAME@" Execute="immediate" />
         <CustomAction Id="LaunchFluentBitWinSvc" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="check" Impersonate="no" />
 
         <Property Id="StopFluentBitWinSvc" Value=" "/>
-        <CustomAction Id="SetStopFluentBitWinSvcCommand" Property="StopFluentBitWinSvc" Value="&quot;sc.exe&quot; stop $(var.CPACK_PACKAGE_NAME)" Execute="immediate" />
+        <CustomAction Id="SetStopFluentBitWinSvcCommand" Property="StopFluentBitWinSvc" Value="&quot;sc.exe&quot; stop @FLB_OUT_NAME@" Execute="immediate" />
         <CustomAction Id="StopFluentBitWinSvc" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no" />
 
         <Property Id="DeleteFluentBitWinSvc" Value=" "/>
-        <CustomAction Id="SetDeleteFluentBitWinSvcCommand" Property="DeleteFluentBitWinSvc" Value="&quot;sc.exe&quot; delete $(var.CPACK_PACKAGE_NAME)" Execute="immediate" />
+        <CustomAction Id="SetDeleteFluentBitWinSvcCommand" Property="DeleteFluentBitWinSvc" Value="&quot;sc.exe&quot; delete @FLB_OUT_NAME@" Execute="immediate" />
         <CustomAction Id="DeleteFluentBitWinSvc" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="check" Impersonate="no" />
 
         <InstallExecuteSequence>