From c487532b4d846c1ce6c684ddc22bfcf48a39b6a2 Mon Sep 17 00:00:00 2001 From: Ennea Date: Sun, 21 Nov 2021 12:07:44 +0100 Subject: [PATCH] bump version to 1.0, change NSIS script line endings to unix style --- frontend/script.js | 2 +- wishing-well.nsi | 168 ++++++++++++++++++++++----------------------- wishing-well.py | 2 +- 3 files changed, 86 insertions(+), 86 deletions(-) diff --git a/frontend/script.js b/frontend/script.js index 9353121..f3d0481 100644 --- a/frontend/script.js +++ b/frontend/script.js @@ -1,6 +1,6 @@ document.addEventListener('alpine:init', () => { Alpine.data('app', () => ({ - VERSION: '0.1', + VERSION: '1.0', // raw data from the backend bannerTypes: {}, diff --git a/wishing-well.nsi b/wishing-well.nsi index 6af30aa..fd76cf2 100644 --- a/wishing-well.nsi +++ b/wishing-well.nsi @@ -1,84 +1,84 @@ -!include "MUI2.nsh" -!define MUI_ICON "icon.ico" - -Name "Wishing Well" -OutFile "wishing-well.exe" -Unicode True -RequestExecutionLevel admin -InstallDir "$PROGRAMFILES\Wishing Well" -InstallDirRegKey HKLM "Software\WishingWell" "InstallDir" - -;-------------------------------- -; Pages - -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES - -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES - -;-------------------------------- - -!insertmacro MUI_LANGUAGE "English" - -;-------------------------------- -; Section - -Section "Wishing Well" - - SectionIn RO - SetOutPath $INSTDIR - - ; Files to install - File /r "wishing-well.dist\frontend*.*" - File "wishing-well.dist\icon.png" - File "wishing-well.dist\wishing-well.exe" - - File /r "wishing-well.dist\tcl*.*" - File /r "wishing-well.dist\tk*.*" - File "wishing-well.dist\libcrypto-1_1.dll" - File "wishing-well.dist\libssl-1_1.dll" - File "wishing-well.dist\python39.dll" - File "wishing-well.dist\vcruntime140.dll" - File "wishing-well.dist\tcl86t.dll" - File "wishing-well.dist\tk86t.dll" - File "wishing-well.dist\_bz2.pyd" - File "wishing-well.dist\_hashlib.pyd" - File "wishing-well.dist\_lzma.pyd" - File "wishing-well.dist\_socket.pyd" - File "wishing-well.dist\_ssl.pyd" - File "wishing-well.dist\_tkinter.pyd" - File "wishing-well.dist\select.pyd" - File "wishing-well.dist\unicodedata.pyd" - - ; Write the installation path into the registry - WriteRegStr HKLM "Software\WishingWell" "InstallDir" "$INSTDIR" - - ; start menu shortcut - CreateDirectory "$SMPROGRAMS\Wishing Well" - CreateShortcut "$SMPROGRAMS\Wishing Well\Wishing Well.lnk" "$INSTDIR\wishing-well.exe" - - ; Write the uninstall keys for Windows - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WishingWell" "DisplayName" "Wishing Well" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WishingWell" "DisplayIcon" '"$INSTDIR\wishing-well.exe"' - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WishingWell" "UninstallString" '"$INSTDIR\uninstall.exe"' - WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WishingWell" "NoModify" 1 - WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WishingWell" "NoRepair" 1 - WriteUninstaller "$INSTDIR\uninstall.exe" - -SectionEnd - -;-------------------------------- -; Uninstaller - -Section "Uninstall" - - ; Remove registry keys - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WishingWell" - DeleteRegKey HKLM "Software\WishingWell" - - Delete "$SMPROGRAMS\Wishing Well\*.lnk" - RMDir "$SMPROGRAMS\Wishing Well" - RMDir /r "$INSTDIR" - -SectionEnd +!include "MUI2.nsh" +!define MUI_ICON "icon.ico" + +Name "Wishing Well" +OutFile "wishing-well-1.0.exe" +Unicode True +RequestExecutionLevel admin +InstallDir "$PROGRAMFILES\Wishing Well" +InstallDirRegKey HKLM "Software\WishingWell" "InstallDir" + +;-------------------------------- +; Pages + +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES + +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES + +;-------------------------------- + +!insertmacro MUI_LANGUAGE "English" + +;-------------------------------- +; Section + +Section "Wishing Well" + + SectionIn RO + SetOutPath $INSTDIR + + ; Files to install + File /r "wishing-well.dist\frontend*.*" + File "wishing-well.dist\icon.png" + File "wishing-well.dist\wishing-well.exe" + + File /r "wishing-well.dist\tcl*.*" + File /r "wishing-well.dist\tk*.*" + File "wishing-well.dist\libcrypto-1_1.dll" + File "wishing-well.dist\libssl-1_1.dll" + File "wishing-well.dist\python39.dll" + File "wishing-well.dist\vcruntime140.dll" + File "wishing-well.dist\tcl86t.dll" + File "wishing-well.dist\tk86t.dll" + File "wishing-well.dist\_bz2.pyd" + File "wishing-well.dist\_hashlib.pyd" + File "wishing-well.dist\_lzma.pyd" + File "wishing-well.dist\_socket.pyd" + File "wishing-well.dist\_ssl.pyd" + File "wishing-well.dist\_tkinter.pyd" + File "wishing-well.dist\select.pyd" + File "wishing-well.dist\unicodedata.pyd" + + ; Write the installation path into the registry + WriteRegStr HKLM "Software\WishingWell" "InstallDir" "$INSTDIR" + + ; start menu shortcut + CreateDirectory "$SMPROGRAMS\Wishing Well" + CreateShortcut "$SMPROGRAMS\Wishing Well\Wishing Well.lnk" "$INSTDIR\wishing-well.exe" + + ; Write the uninstall keys for Windows + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WishingWell" "DisplayName" "Wishing Well" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WishingWell" "DisplayIcon" '"$INSTDIR\wishing-well.exe"' + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WishingWell" "UninstallString" '"$INSTDIR\uninstall.exe"' + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WishingWell" "NoModify" 1 + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WishingWell" "NoRepair" 1 + WriteUninstaller "$INSTDIR\uninstall.exe" + +SectionEnd + +;-------------------------------- +; Uninstaller + +Section "Uninstall" + + ; Remove registry keys + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WishingWell" + DeleteRegKey HKLM "Software\WishingWell" + + Delete "$SMPROGRAMS\Wishing Well\*.lnk" + RMDir "$SMPROGRAMS\Wishing Well" + RMDir /r "$INSTDIR" + +SectionEnd diff --git a/wishing-well.py b/wishing-well.py index bff5662..fda5588 100644 --- a/wishing-well.py +++ b/wishing-well.py @@ -8,7 +8,7 @@ # nuitka-project: --windows-icon-from-ico=./icon.ico # nuitka-project: --windows-company-name=- # nuitka-project: --windows-product-name=Wishing Well -# nuitka-project: --windows-product-version=0.1 +# nuitka-project: --windows-product-version=1.0 import logging import bottle