Windows: Remove Driver Installer

Author: HTRamsey

cmake/CustomOptions.cmake

@@ -14,6 +14,7 @@ set(QGC_SETTINGS_VERSION "9" CACHE STRING "Settings Version") # If you need to m
 option(BUILD_SHARED_LIBS "Build using shared libraries" OFF)
 option(QGC_STABLE_BUILD "Stable Build" OFF)
 option(QGC_USE_CACHE "Use Build Caching" ON)
+option(QGC_BUILD_INSTALLER "Build Installer" ON)
 cmake_dependent_option(QGC_BUILD_TESTING "Enable testing" ON "CMAKE_BUILD_TYPE STREQUAL Debug" OFF)
 cmake_dependent_option(QGC_DEBUG_QML "Build QGroundControl with QML debugging/profiling support." ON "CMAKE_BUILD_TYPE STREQUAL Debug" OFF)
 

cmake/install/CreateQGCInstaller.cmake

@@ -54,15 +54,8 @@ configure_file(
 # cmake_print_variables(QGC_INSTALLER_ROOT FILES_TO_INSTALL)
 
 if(WIN32)
-    file(DOWNLOAD https://firmware.ardupilot.org/Tools/MissionPlanner/driver.msi
-        ${INSTALLER_SOURCE_PACKAGES_QGC_DATA_DIR}/driver.msi
-        SHOW_PROGRESS
-        STATUS DRIVER_DOWNLOAD_STATUS
-        TIMEOUT 60
-    )
-#   file(COPY ${CMAKE_SOURCE_DIR}/deploy/windows/driver.msi DESTINATION ${INSTALLER_SOURCE_PACKAGES_QGC_DATA_DIR}/driver.msi)
     set(QGC_INSTALLER_NAME ${CMAKE_PROJECT_NAME}-Installer-${CMAKE_SYSTEM_PROCESSOR}.exe)
-# endif()
+endif()
 
 execute_process(
     COMMAND ${QT_INSTALLER_FRAMEWORK} --offline-only -c ${INSTALLER_OUTPUT_CONFIG_DIR}/config.xml -p ${INSTALLER_OUTPUT_PACKAGES_DIR} ${CMAKE_BINARY_DIR}/${QGC_INSTALLER_NAME}

cmake/install/CreateWinInstaller.cmake

@@ -1,23 +1,21 @@
 message(STATUS "QGC: Creating Windows NSIS Installer")
 
+foreach(p IN ITEMS
+    QGC_WINDOWS_ICON_PATH
+    QGC_WINDOWS_INSTALL_HEADER_PATH
+    QGC_WINDOWS_INSTALLER_SCRIPT
+    QGC_WINDOWS_OUT
+    CMAKE_INSTALL_PREFIX)
+    if(NOT DEFINED ${p})
+        message(FATAL_ERROR "QGC: Missing required var: ${p}")
+    endif()
+endforeach()
+
 file(TO_NATIVE_PATH "${QGC_WINDOWS_ICON_PATH}" QGC_INSTALLER_ICON)
 file(TO_NATIVE_PATH "${QGC_WINDOWS_INSTALL_HEADER_PATH}" QGC_INSTALLER_HEADER_BITMAP)
-file(TO_NATIVE_PATH "${QGC_WINDOWS_DRIVER_MSI}" QGC_INSTALLER_DRIVER_MSI)
 file(TO_NATIVE_PATH "${QGC_WINDOWS_INSTALLER_SCRIPT}" QGC_NSIS_INSTALLER_SCRIPT)
 file(TO_NATIVE_PATH "${QGC_WINDOWS_OUT}" QGC_INSTALLER_OUT)
-
-set(QGC_NSIS_INSTALLER_PARAMETERS
-    /DDRIVER_MSI=${QGC_INSTALLER_DRIVER_MSI}
-    /DINSTALLER_ICON=${QGC_INSTALLER_ICON}
-    /DHEADER_BITMAP=${QGC_INSTALLER_HEADER_BITMAP}
-    /DAPPNAME=${CMAKE_PROJECT_NAME}
-    /DEXENAME=${CMAKE_PROJECT_NAME}
-    /DORGNAME=${QGC_ORG_NAME}
-    /DDESTDIR=${CMAKE_INSTALL_PREFIX}
-    /NOCD
-    "/XOutFile ${QGC_INSTALLER_OUT}"
-    ${QGC_NSIS_INSTALLER_SCRIPT}
-)
+file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}" QGC_PAYLOAD_DIR)
 
 set(_pf86 "ProgramFiles(x86)")
 set(_PF86 "PROGRAMFILES(x86)")
@@ -28,8 +26,34 @@ find_program(QGC_NSIS_INSTALLER_CMD makensis
     REQUIRED
 )
 
+set(_nsis_args
+    /NOCD
+    /INPUTCHARSET UTF8
+    /V4
+    "/DAPPNAME=${CMAKE_PROJECT_NAME}"
+    "/DEXENAME=${CMAKE_PROJECT_NAME}"
+    "/DORGNAME=${QGC_ORG_NAME}"
+    "/DDESTDIR=${QGC_PAYLOAD_DIR}"
+)
+
+if(EXISTS "${QGC_INSTALLER_ICON}")
+    list(APPEND _nsis_args "/DINSTALLER_ICON=${QGC_INSTALLER_ICON}")
+endif()
+
+if(EXISTS "${QGC_INSTALLER_HEADER_BITMAP}")
+    list(APPEND _nsis_args "/DHEADER_BITMAP=${QGC_INSTALLER_HEADER_BITMAP}")
+endif()
+
+set(_APPVER "${CMAKE_PROJECT_VERSION}")
+if(_APPVER)
+    list(APPEND _nsis_args "/DAPPVERSION=${_APPVER}")
+endif()
+
+list(APPEND _nsis_args "/XOutFile ${QGC_INSTALLER_OUT}")
+
 execute_process(
-    COMMAND ${QGC_NSIS_INSTALLER_CMD} ${QGC_NSIS_INSTALLER_PARAMETERS}
+    COMMAND "${QGC_NSIS_INSTALLER_CMD}" ${_nsis_args} "${QGC_NSIS_INSTALLER_SCRIPT}"
+    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
     COMMAND_ECHO STDOUT
     COMMAND_ERROR_IS_FATAL ANY
 )

cmake/install/Install.cmake

@@ -1,5 +1,7 @@
 include(InstallRequiredSystemLibraries)
 
+# if(QGC_BUILD_INSTALLER AND CMAKE_INSTALL_CONFIG_NAME MATCHES "^[Rr]elease$")
+
 install(
     TARGETS ${CMAKE_PROJECT_NAME}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -32,6 +34,7 @@ qt_generate_deploy_qml_app_script(
     DEPLOY_TOOL_OPTIONS ${deploy_tool_options_arg}
 )
 install(SCRIPT ${deploy_script})
+message(STATUS "QGC: Deploy Script: ${deploy_script}")
 
 if(ANDROID)
     # get_target_property(QGC_ANDROID_DEPLOY_FILE ${CMAKE_PROJECT_NAME} QT_ANDROID_DEPLOYMENT_SETTINGS_FILE)
@@ -79,10 +82,10 @@ elseif(LINUX)
 elseif(WIN32)
     install(CODE "
         set(CMAKE_PROJECT_NAME ${CMAKE_PROJECT_NAME})
+        set(CMAKE_PROJECT_VERSION ${CMAKE_PROJECT_VERSION})
         set(QGC_ORG_NAME ${QGC_ORG_NAME})
         set(QGC_WINDOWS_ICON_PATH \"${QGC_WINDOWS_ICON_PATH}\")
         set(QGC_WINDOWS_INSTALL_HEADER_PATH \"${QGC_WINDOWS_INSTALL_HEADER_PATH}\")
-        set(QGC_WINDOWS_DRIVER_MSI \"${CMAKE_SOURCE_DIR}/deploy/windows/driver.msi\")
         if(CMAKE_CROSSCOMPILING)
             set(QGC_WINDOWS_OUT \"${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-installer-${CMAKE_HOST_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_PROCESSOR}.exe\")
         else()

cmake/platform/Windows.cmake

@@ -3,12 +3,6 @@ if(NOT WIN32)
     return()
 endif()
 
-# CPMAddPackage(
-#     NAME windows_drivers
-#     URL https://firmware.ardupilot.org/Tools/MissionPlanner/driver.msi
-# )
-# ${windows_drivers_SOURCE_DIR}/driver.msi
-
 set_target_properties(${CMAKE_PROJECT_NAME}
     PROPERTIES
         WIN32_EXECUTABLE TRUE

deploy/installer/packages/org.mavlink.qgroundcontrol/data/driver.msi

@@ -12,8 +12,6 @@ Component.prototype.createOperations = function()
     }
 
     if (systemInfo.productType === "windows") {
-        component.addElevatedOperation("Execute", "msiexec", ["/i", "@TargetDir@/driver.msi", "/qn"]);
-
         component.addOperation("CreateShortcut", "@TargetDir@/bin/qgroundcontrol.exe", "@StartMenuDir@/QGroundControl.lnk");
         component.addOperation("CreateShortcut", "@TargetDir@/bin/qgroundcontrol.exe", "@DesktopDir@/QGroundControl.lnk");
     }