From d0851b819f836d124f2f36c52f758afa042eb201 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Thu, 11 Jan 2024 01:15:43 +0100 Subject: [PATCH] Updating windows installer --- scripts/build-wine.sh | 4 ++++ win/installer.nsi | 12 +++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/scripts/build-wine.sh b/scripts/build-wine.sh index 53dd11c..be8ca58 100644 --- a/scripts/build-wine.sh +++ b/scripts/build-wine.sh @@ -28,3 +28,7 @@ rm dist/logarithmplotter/_internal/PySide6/Qt6WebEngineCore.dll # Remove the QtQuick styles that are unused rm -rf dist/logarithmplotter/_internal/PySide6/qml/QtQuick/Controls/{Imagine,Material,designer} + +# Remove unused tools +rm dist/logarithmplotter/_internal/PySide6/qml/{Qt3D,QtQuick3D} +rm dist/logarithmplotter/_internal/PySide6/Qt6{Pdf.dll,*3D*,Location.dll} diff --git a/win/installer.nsi b/win/installer.nsi index 449fa85..7c5b248 100644 --- a/win/installer.nsi +++ b/win/installer.nsi @@ -50,7 +50,7 @@ VIAddVersionKey "FileVersion" "${APP_VERSION}" !define MUI_PAGE_HEADER_SUBTEXT "${COPYRIGHT}" !define MUI_WELCOMEPAGE_TITLE "Install ${APP_NAME} v${VERSION_SHORT}" -!define MUI_WELCOMEPAGE_TEXT "Welcome to the ${APP_NAME} installer! Follow the steps provided by this installer to install ${APP_NAME}" +!define MUI_WELCOMEPAGE_TEXT "Thank you for downloading ${APP_NAME}! Follow the steps provided by this installer to install ${APP_NAME}." !define MUI_HEADERIMAGE_RIGHT ;Extra space for the title area ;!insertmacro MUI_WELCOMEPAGE_TITLE_3LINES @@ -89,7 +89,7 @@ Icon "logarithmplotter.ico" ;!define MUI_DIRECTORYPAGE_VARIABLE $INSTDIR !define MUI_INSTFILESPAGE_FINISHHEADER_TEXT "Success!" -!define MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT "${APP_NAME} v${VERSION_SHORT} was installed on your computer" +!define MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT "${APP_NAME} v${VERSION_SHORT} was installed on your computer." !define MUI_INSTFILESPAGE_ABORTHEADER_TEXT "There was an error during the installation process." !define MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT "${APP_NAME} v${VERSION_SHORT} was not installed on your computer." @@ -155,16 +155,10 @@ Icon "logarithmplotter.ico" Section "" SetOutPath $INSTDIR File logarithmplotter.exe - File *.dll - File *.pyd File *.md - ;File *.manifest - File *.zip File *.bmp File *.ico - File /r qml - File /r PySide6 - File /r shiboken6 + File /r _internal CreateShortcut "$SMPROGRAMS\LogarithmPlotter.lnk" "$INSTDIR\logarithmplotter.exe"