Skip to content

Commit

Permalink
bump version to 1.0, change NSIS script line endings to unix style
Browse files Browse the repository at this point in the history
  • Loading branch information
Ennea committed Nov 21, 2021
1 parent 4058183 commit c487532
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 86 deletions.
2 changes: 1 addition & 1 deletion frontend/script.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
document.addEventListener('alpine:init', () => {
Alpine.data('app', () => ({
VERSION: '0.1',
VERSION: '1.0',

// raw data from the backend
bannerTypes: {},
Expand Down
168 changes: 84 additions & 84 deletions wishing-well.nsi
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion wishing-well.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c487532

Please sign in to comment.