Skip to content

Commit 0d1befd

Browse files
committed
Update installer and NSIS Tool
1 parent d1799f5 commit 0d1befd

File tree

10 files changed

+42
-29
lines changed

10 files changed

+42
-29
lines changed
22.1 MB
Binary file not shown.
1.64 MB
Binary file not shown.
104 KB
Binary file not shown.
-2.57 MB
Binary file not shown.
-472 KB
Binary file not shown.
76 KB
Binary file not shown.

software/updates.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"open-url": "",
55
"type-version": "Alpha",
66
"latest-version": "2.0.3",
7-
"download-url": "https://raw.githubusercontent.com/RTduino/pinout-generator/master/software/PinoutGenerator-v2.0.3-Setup.exe",
7+
"download-url": "https://raw.githubusercontent.com/RTduino/pinout-generator/master/software/pinout-generator-v2.0.3-setup.exe",
88
"changelog": "This is an example changelog for Windows. Go on...",
99
"mandatory-update": false
1010
}

tools/Create-setup.bat

Lines changed: 0 additions & 1 deletion
This file was deleted.

tools/Setup.nsi renamed to tools/nsis/setup.nsi

Lines changed: 41 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
; Script generated by the HM NIS Edit Script Wizard.
22

33
; HM NIS Edit Wizard helper defines
4-
!define PRODUCT_NAME "Pinout-Generator"
5-
!define PRODUCT_EXE_NAME "pinout-generator.exe"
4+
!define PRODUCT_NAME "pinout-generator"
5+
!define PRODUCT_EXE_NAME "${PRODUCT_NAME}.exe"
66
!define PRODUCT_VERSION "2.0.3"
7+
!define PRODUCT_SOURCE_PATH "..\..\software\pinout-generator-windows"
78
!define PRODUCT_PUBLISHER "RTduino, Inc."
89
!define PRODUCT_WEB_SITE "https://www.rtduino.com/"
910
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_EXE_NAME}"
@@ -15,8 +16,8 @@
1516

1617
; MUI Settings
1718
!define MUI_ABORTWARNING
18-
!define MUI_ICON "..\project\RTduino.ico"
19-
!define MUI_UNICON "..\project\RTduino.ico"
19+
!define MUI_ICON "..\..\project\RTduino.ico"
20+
!define MUI_UNICON "..\..\project\RTduino.ico"
2021

2122
; Language Selection Dialog Settings
2223
!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
@@ -26,7 +27,7 @@
2627
; Welcome page
2728
!insertmacro MUI_PAGE_WELCOME
2829
; License page
29-
!insertmacro MUI_PAGE_LICENSE ".\Licence.txt"
30+
!insertmacro MUI_PAGE_LICENSE ".\licence.txt"
3031
; Directory page
3132
!insertmacro MUI_PAGE_DIRECTORY
3233
; Instfiles page
@@ -45,8 +46,8 @@
4546
; MUI end ------
4647

4748
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
48-
OutFile "..\software\PinoutGenerator-v2.0.3-Setup.exe"
49-
InstallDir "$PROGRAMFILES\pinout-generator"
49+
OutFile "..\..\software\${PRODUCT_NAME}-v${PRODUCT_VERSION}-setup.exe"
50+
InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
5051
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
5152
ShowInstDetails show
5253
ShowUnInstDetails show
@@ -58,29 +59,29 @@ FunctionEnd
5859
Section "MainSection" SEC01
5960
SetOutPath "$INSTDIR"
6061
SetOverwrite ifnewer
61-
File "..\software\pinout-generator-windows\${PRODUCT_EXE_NAME}"
62-
CreateDirectory "$SMPROGRAMS\pinout-generator"
63-
CreateShortCut "$SMPROGRAMS\pinout-generator\pinout-generator.lnk" "$INSTDIR\${PRODUCT_EXE_NAME}"
64-
CreateShortCut "$DESKTOP\pinout-generator.lnk" "$INSTDIR\${PRODUCT_EXE_NAME}"
65-
File "..\software\pinout-generator-windows\*.*"
62+
File "${PRODUCT_SOURCE_PATH}\${PRODUCT_EXE_NAME}"
63+
CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
64+
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_EXE_NAME}"
65+
CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_EXE_NAME}"
66+
File "${PRODUCT_SOURCE_PATH}\*.*"
6667
SetOutPath "$INSTDIR\iconengines"
67-
File "..\software\pinout-generator-windows\iconengines\*.*"
68+
File "${PRODUCT_SOURCE_PATH}\iconengines\*.*"
6869
SetOutPath "$INSTDIR\imageformats"
69-
File "..\software\pinout-generator-windows\imageformats\*.*"
70+
File "${PRODUCT_SOURCE_PATH}\imageformats\*.*"
7071
SetOutPath "$INSTDIR\mcus"
71-
File "..\software\pinout-generator-windows\mcus\*.*"
72+
File "${PRODUCT_SOURCE_PATH}\mcus\*.*"
7273
SetOutPath "$INSTDIR\platforms"
73-
File "..\software\pinout-generator-windows\platforms\*.*"
74+
File "${PRODUCT_SOURCE_PATH}\platforms\*.*"
7475
SetOutPath "$INSTDIR\styles"
75-
File "..\software\pinout-generator-windows\styles\*.*"
76+
File "${PRODUCT_SOURCE_PATH}\styles\*.*"
7677
SetOutPath "$INSTDIR\translations"
77-
File "..\software\pinout-generator-windows\translations\*.*"
78+
File "${PRODUCT_SOURCE_PATH}\translations\*.*"
7879
SectionEnd
7980

8081
Section -AdditionalIcons
8182
WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
82-
CreateShortCut "$SMPROGRAMS\pinout-generator\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
83-
CreateShortCut "$SMPROGRAMS\pinout-generator\Uninstall.lnk" "$INSTDIR\uninst.exe"
83+
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
84+
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\uninst.exe"
8485
SectionEnd
8586

8687
Section -Post
@@ -109,15 +110,28 @@ FunctionEnd
109110
Section Uninstall
110111
Delete "$INSTDIR\${PRODUCT_NAME}.url"
111112
Delete "$INSTDIR\uninst.exe"
112-
Delete "$INSTDIR\*.*"
113-
Delete "$INSTDIR\${PRODUCT_EXE_NAME}"
114113

115-
Delete "$SMPROGRAMS\pinout-generator\Uninstall.lnk"
116-
Delete "$SMPROGRAMS\pinout-generator\Website.lnk"
117-
Delete "$DESKTOP\pinout-generator.lnk"
118-
Delete "$SMPROGRAMS\pinout-generator\pinout-generator.lnk"
114+
Delete "$INSTDIR\iconengines\*.*"
115+
Delete "$INSTDIR\imageformats\*.*"
116+
Delete "$INSTDIR\mcus\*.*"
117+
Delete "$INSTDIR\platforms\*.*"
118+
Delete "$INSTDIR\styles\*.*"
119+
Delete "$INSTDIR\translations\*.*"
120+
Delete "$INSTDIR\${PRODUCT_EXE_NAME}"
121+
Delete "$INSTDIR\*.*"
119122

120-
RMDir "$SMPROGRAMS\pinout-generator"
123+
Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk"
124+
Delete "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk"
125+
Delete "$DESKTOP\${PRODUCT_NAME}.lnk"
126+
Delete "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk"
127+
128+
RMDir "$INSTDIR\iconengines"
129+
RMDir "$INSTDIR\imageformats"
130+
RMDir "$INSTDIR\mcus"
131+
RMDir "$INSTDIR\platforms"
132+
RMDir "$INSTDIR\styles"
133+
RMDir "$INSTDIR\translations"
134+
RMDir "$SMPROGRAMS\${PRODUCT_NAME}"
121135
RMDir "$INSTDIR"
122136

123137
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"

0 commit comments

Comments
 (0)