From 0a248c9a53c23f715d282c8cc748dd425a00d00a Mon Sep 17 00:00:00 2001 From: cmclark00 Date: Sun, 13 Oct 2024 22:30:07 -0400 Subject: [PATCH] updated windows build --- src/CMakeLists.txt | 2 +- src/windows/retro-imager-cli.cmd | 4 ++-- src/windows/retro-imager.nsi.in | 34 ++++++++++++++++---------------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1d9a85d..407ef26 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -402,7 +402,7 @@ if (WIN32) add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD - COMMAND "${WINDEPLOYQT}" --no-translations --qmldir "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_BINARY_DIR}/deploy/rpi-imager.exe") + COMMAND "${WINDEPLOYQT}" --no-translations --qmldir "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_BINARY_DIR}/deploy/retro-imager.exe") # Remove excess files add_custom_command(TARGET ${PROJECT_NAME} diff --git a/src/windows/retro-imager-cli.cmd b/src/windows/retro-imager-cli.cmd index 99c15f7..8158775 100644 --- a/src/windows/retro-imager-cli.cmd +++ b/src/windows/retro-imager-cli.cmd @@ -1,9 +1,9 @@ @echo off rem -rem For scripting: call rpi-imager.exe and wait until it finished before continuing +rem For scripting: call retro-imager.exe and wait until it finished before continuing rem This is necessary because it is compiled as GUI application, and Windows rem normalling does not wait until those exit rem -start /WAIT rpi-imager.exe --cli %* +start /WAIT retro-imager.exe --cli %* diff --git a/src/windows/retro-imager.nsi.in b/src/windows/retro-imager.nsi.in index 79951fa..bc1e1ce 100644 --- a/src/windows/retro-imager.nsi.in +++ b/src/windows/retro-imager.nsi.in @@ -766,13 +766,13 @@ WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "URLInfoAbout" "${WEB_SITE}" !endif -WriteRegStr SHCTX "Software\Classes\.zip\OpenWithProgIds" "RPI_IMAGINGUTILITY" "" -WriteRegStr SHCTX "Software\Classes\.gz\OpenWithProgIds" "RPI_IMAGINGUTILITY" "" -WriteRegStr SHCTX "Software\Classes\.xz\OpenWithProgIds" "RPI_IMAGINGUTILITY" "" -WriteRegStr SHCTX "Software\Classes\.img\OpenWithProgIds" "RPI_IMAGINGUTILITY" "" -WriteRegStr SHCTX "Software\Classes\.zstd\OpenWithProgIds" "RPI_IMAGINGUTILITY" "" -WriteRegStr SHCTX "Software\Classes\RPI_IMAGINGUTILITY\shell\open" "FriendlyAppName" "Raspberry Pi Imager" -WriteRegStr SHCTX "Software\Classes\RPI_IMAGINGUTILITY\shell\open\command" "" '"$INSTDIR\rpi-imager.exe" "%1"' +WriteRegStr SHCTX "Software\Classes\.zip\OpenWithProgIds" "RETRO_IMAGINGUTILITY" "" +WriteRegStr SHCTX "Software\Classes\.gz\OpenWithProgIds" "RETRO_IMAGINGUTILITY" "" +WriteRegStr SHCTX "Software\Classes\.xz\OpenWithProgIds" "RETRO_IMAGINGUTILITY" "" +WriteRegStr SHCTX "Software\Classes\.img\OpenWithProgIds" "RETRO_IMAGINGUTILITY" "" +WriteRegStr SHCTX "Software\Classes\.zstd\OpenWithProgIds" "RETRO_IMAGINGUTILITY" "" +WriteRegStr SHCTX "Software\Classes\RETRO_IMAGINGUTILITY\shell\open" "FriendlyAppName" "Retro Imager" +WriteRegStr SHCTX "Software\Classes\RETRO_IMAGINGUTILITY\shell\open\command" "" '"$INSTDIR\retro-imager.exe" "%1"' SectionEnd @@ -805,8 +805,8 @@ Delete "$INSTDIR\Qt5Widgets.dll" Delete "$INSTDIR\Qt5WinExtras.dll" # Old name Delete "$INSTDIR\imagingutility.exe" -Delete "$INSTDIR\rpi-imager.exe" -Delete "$INSTDIR\rpi-imager-cli.cmd" +Delete "$INSTDIR\retro-imager.exe" +Delete "$INSTDIR\retro-imager-cli.cmd" Delete "$INSTDIR\styles\qwindowsvistastyle.dll" Delete "$INSTDIR\QtQuick.2\plugins.qmltypes" Delete "$INSTDIR\QtQuick.2\qmldir" @@ -1195,8 +1195,8 @@ Delete "$INSTDIR\Qt6Svg.dll" Delete "$INSTDIR\Qt6VirtualKeyboard.dll" Delete "$INSTDIR\Qt6Widgets.dll" Delete "$INSTDIR\libgcc_s_seh-1.dll" -Delete "$INSTDIR\rpi-imager-cli.cmd" -Delete "$INSTDIR\rpi-imager.exe" +Delete "$INSTDIR\retro-imager-cli.cmd" +Delete "$INSTDIR\retro-imager.exe" Delete "$INSTDIR\generic\qtuiotouchplugin.dll" Delete "$INSTDIR\iconengines\qsvgicon.dll" Delete "$INSTDIR\imageformats\qgif.dll" @@ -1710,12 +1710,12 @@ DeleteRegKey ${REG_ROOT} "${REG_APP_PATH}" DeleteRegKey ${REG_ROOT} "${UNINSTALL_PATH}" # File associations -DeleteRegValue SHCTX "Software\Classes\.zip\OpenWithProgIds" "RPI_IMAGINGUTILITY" -DeleteRegValue SHCTX "Software\Classes\.gz\OpenWithProgIds" "RPI_IMAGINGUTILITY" -DeleteRegValue SHCTX "Software\Classes\.xz\OpenWithProgIds" "RPI_IMAGINGUTILITY" -DeleteRegValue SHCTX "Software\Classes\.img\OpenWithProgIds" "RPI_IMAGINGUTILITY" -DeleteRegValue SHCTX "Software\Classes\.zstd\OpenWithProgIds" "RPI_IMAGINGUTILITY" -DeleteRegKey SHCTX "Software\Classes\RPI_IMAGINGUTILITY" +DeleteRegValue SHCTX "Software\Classes\.zip\OpenWithProgIds" "RETRO_IMAGINGUTILITY" +DeleteRegValue SHCTX "Software\Classes\.gz\OpenWithProgIds" "RETRO_IMAGINGUTILITY" +DeleteRegValue SHCTX "Software\Classes\.xz\OpenWithProgIds" "RETRO_IMAGINGUTILITY" +DeleteRegValue SHCTX "Software\Classes\.img\OpenWithProgIds" "RETRO_IMAGINGUTILITY" +DeleteRegValue SHCTX "Software\Classes\.zstd\OpenWithProgIds" "RETRO_IMAGINGUTILITY" +DeleteRegKey SHCTX "Software\Classes\RETRO_IMAGINGUTILITY" DeleteRegKey ${REG_ROOT} ""