mudgangster

commit 99d5d6e8a4bee2253331e98a2276d9c645b0713e
parent b8ff7d747500a9156c2df75b35cc2807523c0020
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Sun,  3 May 2020 11:17:37 +0300

Remove example scripts installer

Diffstat:
M
appveyor-windows.yml
 | 
2
+-
D
installer/example_scripts.nsi
 | 
16
----------------
R
icon.ico -> installer/icon.ico
 | 
0

A
installer/installer.nsi
 | 
59
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D
installer/mudgangster.nsi
 | 
59
-----------------------------------------------------------
M
src/rc.rc
 | 
2
+-

6 files changed, 61 insertions(+), 77 deletions(-)
diff --git a/appveyor-windows.yml b/appveyor-windows.yml
@@ -8,7 +8,7 @@ build_script:
 - ggbuild\ninja.exe -v -k 0
 - ggbuild\lua.exe ggbuild\ninja_timeline.lua
 - ggbuild\ducible.exe release\mudgangster.exe
-- makensis.exe installer\mudgangster.nsi
+- makensis.exe installer\installer.nsi
 
 artifacts:
 - path: installer/MudGangsterInstaller.exe
diff --git a/installer/example_scripts.nsi b/installer/example_scripts.nsi
@@ -1,16 +0,0 @@
-!include "MUI2.nsh"
-
-Name "Mud Gangster Example Scripts"
-Outfile "MudGangsterExampleScriptsInstaller.exe"
-
-InstallDir "$APPDATA\Mud Gangster\scripts"
-RequestExecutionLevel admin
-
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-
-Section "Install" SectionInstall
-	# Install stuff
-	SetOutPath $INSTDIR
-	FILE /r ..\example_scripts\*
-SectionEnd
diff --git a/icon.ico b/installer/icon.ico
Binary files differ.
diff --git a/installer/installer.nsi b/installer/installer.nsi
@@ -0,0 +1,59 @@
+!include "MUI2.nsh"
+
+Name "Mud Gangster"
+Outfile "MudGangsterInstaller.exe"
+
+!define MUI_ICON "icon.ico"
+!define MUI_UNICON "icon.ico"
+
+InstallDir "$PROGRAMFILES64\Mud Gangster"
+RequestExecutionLevel admin
+
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+Section "Install" SectionInstall
+	# Install stuff
+	SetOutPath $INSTDIR
+	File ..\release\mudgangster.exe
+	File licenses.txt
+
+	# Start menu shortcut
+	CreateDirectory "$SMPROGRAMS\Mud Gangster"
+	CreateShortCut "$SMPROGRAMS\Mud Gangster\Mud Gangster.lnk" "$INSTDIR\mudgangster.exe"
+
+	# Uninstaller
+	WriteUninstaller "$INSTDIR\uninstall.exe"
+
+	# Registry keys
+	SetRegView 64
+	WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MudGangster" "DisplayName" "Mud Gangster"
+	WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MudGangster" "UninstallString" "$INSTDIR\uninstall.exe"
+	WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MudGangster" "DisplayIcon" "$INSTDIR\mudgangster.exe"
+	WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MudGangster" "Publisher" "Hirve"
+	WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MudGangster" "DisplayVersion" "0.0.0.0"
+	WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MudGangster" "NoModify" 1
+	WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MudGangster" "NoRepair" 1
+
+	SectionGetSize ${SectionInstall} $0
+	IntFmt $1 "0x%08X" $0
+	WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MudGangster" "EstimatedSize" $1
+SectionEnd
+
+Section "Uninstall"
+	# Files
+	Delete "$INSTDIR\MudGangster.exe"
+	Delete "$INSTDIR\licenses.txt"
+	Delete "$INSTDIR\uninstall.exe"
+	RMDir "$INSTDIR"
+
+	# Start menu shortcut
+	Delete "$SMPROGRAMS\Mud Gangster\Mud Gangster.lnk"
+	RMDir "$SMPROGRAMS\Mud Gangster"
+
+	# Registry keys
+	SetRegView 64
+	DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MudGangster"
+SectionEnd
diff --git a/installer/mudgangster.nsi b/installer/mudgangster.nsi
@@ -1,59 +0,0 @@
-!include "MUI2.nsh"
-
-Name "Mud Gangster"
-Outfile "MudGangsterInstaller.exe"
-
-!define MUI_ICON "../icon.ico"
-!define MUI_UNICON "../icon.ico"
-
-InstallDir "$PROGRAMFILES64\Mud Gangster"
-RequestExecutionLevel admin
-
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-Section "Install" SectionInstall
-	# Install stuff
-	SetOutPath $INSTDIR
-	File ..\release\mudgangster.exe
-	File licenses.txt
-
-	# Start menu shortcut
-	CreateDirectory "$SMPROGRAMS\Mud Gangster"
-	CreateShortCut "$SMPROGRAMS\Mud Gangster\Mud Gangster.lnk" "$INSTDIR\mudgangster.exe"
-
-	# Uninstaller
-	WriteUninstaller "$INSTDIR\uninstall.exe"
-
-	# Registry keys
-	SetRegView 64
-	WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MudGangster" "DisplayName" "Mud Gangster"
-	WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MudGangster" "UninstallString" "$INSTDIR\uninstall.exe"
-	WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MudGangster" "DisplayIcon" "$INSTDIR\mudgangster.exe"
-	WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MudGangster" "Publisher" "Hirve"
-	WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MudGangster" "DisplayVersion" "0.0.0.0"
-	WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MudGangster" "NoModify" 1
-	WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MudGangster" "NoRepair" 1
-
-	SectionGetSize ${SectionInstall} $0
-	IntFmt $1 "0x%08X" $0
-	WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MudGangster" "EstimatedSize" $1
-SectionEnd
-
-Section "Uninstall"
-	# Files
-	Delete "$INSTDIR\MudGangster.exe"
-	Delete "$INSTDIR\licenses.txt"
-	Delete "$INSTDIR\uninstall.exe"
-	RMDir "$INSTDIR"
-
-	# Start menu shortcut
-	Delete "$SMPROGRAMS\Mud Gangster\Mud Gangster.lnk"
-	RMDir "$SMPROGRAMS\Mud Gangster"
-
-	# Registry keys
-	SetRegView 64
-	DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MudGangster"
-SectionEnd
diff --git a/src/rc.rc b/src/rc.rc
@@ -1 +1 @@
-1000 ICON DISCARDABLE "..\icon.ico"
+1000 ICON DISCARDABLE "..\installer\icon.ico"