From 031e7d77d15187c4f986c3e6d72bbcd0095ac271 Mon Sep 17 00:00:00 2001 From: Alex Spataru Date: Fri, 29 Nov 2024 17:10:05 -0500 Subject: [PATCH] Try to add shortcuts using Wix --- .github/workflows/deploy.yml | 2 +- app/CMakeLists.txt | 7 ++++--- app/deploy/windows/license.rtf | 27 --------------------------- 3 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 app/deploy/windows/license.rtf diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index cd807bb4..aa57c139 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -386,7 +386,7 @@ jobs: mv *.msi ${{env.EXECUTABLE}}-${{env.VERSION}}-Windows-x86_64.msi mv ${{env.EXECUTABLE}}-${{env.VERSION}}-Windows-x86_64.msi ../ - - name: '📤 Upload artifact: NSIS installer' + - name: '📤 Upload artifact: MSI installer' uses: actions/upload-artifact@v4 with: name: ${{env.EXECUTABLE}}-${{env.VERSION}}-Windows-x86_64.msi diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index fa708d9c..1604b710 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -340,12 +340,13 @@ if(NOT CPACK_GENERATOR) set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\deploy\\\\windows\\\\icon.ico") set(CPACK_WIX_UI_BANNER "${CMAKE_CURRENT_SOURCE_DIR}\\\\deploy\\\\windows\\\\banner.bmp") set(CPACK_WIX_UI_DIALOG "${CMAKE_CURRENT_SOURCE_DIR}\\\\deploy\\\\windows\\\\dialog.bmp") - set(CPACK_WIX_LICENSE_RTF "${CMAKE_CURRENT_SOURCE_DIR}\\\\deploy\\\\windows\\\\license.rtf") + set(CPACK_WIX_LICENSE_RTF "${CMAKE_CURRENT_SOURCE_DIR}\\\\LICENSE.md") set(CPACK_WIX_PROPERTY_ARPHELPLINK "${PROJECT_CONTACT}") set(CPACK_WIX_PROPERTY_ARPCONTACT "${PROJECT_CONTACT}") set(CPACK_WIX_UPGRADE_GUID "a21bfa96-8805-4c47-8fa7-3b3daee6efce") - set(CPACK_WIX_PROGRAM_MENU_FOLDER "${PROJECT_DISPNAME}") - set(CPACK_WIX_SHORTCUTS ON) + set(CPACK_WIX_PROGRAM_MENU_FOLDER ".") + set(CPACK_WIX_SHORTCUTS "${PROJECT_DISPNAME};${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_EXECUTABLE}.exe") + elseif(APPLE) set(CPACK_GENERATOR "DragNDrop") else() diff --git a/app/deploy/windows/license.rtf b/app/deploy/windows/license.rtf deleted file mode 100644 index 3e13ce04..00000000 --- a/app/deploy/windows/license.rtf +++ /dev/null @@ -1,27 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf2820 -\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;} -{\colortbl;\red255\green255\blue255;} -{\*\expandedcolortbl;;} -\margl1440\margr1440\vieww11520\viewh8400\viewkind0 -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 - -\f0\fs24 \cf0 Copyright (c) 2020-2024 Alex Spataru.\ -\ -Permission is hereby granted, free of charge, to any person obtaining a copy\ -of this software and associated documentation files (the "Software"), to deal\ -in the Software without restriction, including without limitation the rights\ -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ -copies of the Software, and to permit persons to whom the Software is\ -furnished to do so, subject to the following conditions:\ -\ -The above copyright notice and this permission notice shall be included in all\ -copies or substantial portions of the Software.\ -\ -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\ -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\ -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\ -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\ -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\ -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\ -SOFTWARE.\ -} \ No newline at end of file