(no commit message)

diff --git a/fluidbook/compile/script.nsi b/fluidbook/compile/script.nsi
index b949d9dee63e727024e0e7a52c8a8e7d39ccd7e8..4d48abcc311b2910a8c66762967ba166339370e6 100644 (file)
--- a/fluidbook/compile/script.nsi
+++ b/fluidbook/compile/script.nsi
@@ -3,6 +3,7 @@
 ;--------------------------------\r
 \r
 !define FLUIDBOOKNAME "$name"\r
+!define REG_UNINSTALL "Software\Microsoft\Windows\CurrentVersion\Uninstall\$fname"\r
 \r
 ; The name of the installer\r
 Name "${FLUIDBOOKNAME}"\r
@@ -11,7 +12,7 @@ Name "${FLUIDBOOKNAME}"
 OutFile "$output"\r
 \r
 ; The default installation directory\r
-InstallDir $PROGRAMFILES\$fname\r
+InstallDir $LOCALAPPDATA\$fname\r
 \r
 ; Request application privileges for Windows Vista\r
 RequestExecutionLevel user\r
@@ -50,8 +51,28 @@ Section "" ;No components page, name is not important
   CreateShortCut "$SMPROGRAMS\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "" "$INSTDIR\data\fluidbook.ico"\r
   CreateShortCut "$DESKTOP\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "" "$INSTDIR\data\fluidbook.ico"\r
   \r
+  WriteRegStr HKCU "${REG_UNINSTALL}" "DisplayName" "${FLUIDBOOKNAME}"\r
+  WriteRegStr HKCU "${REG_UNINSTALL}" "DisplayIcon" "$\"$INSTDIR\data\fluidbook.ico$\""\r
+  WriteRegStr HKCU "${REG_UNINSTALL}" "InstallLocation" "$\"$INSTDIR$\""\r
+  WriteRegDWord HKCU "${REG_UNINSTALL}" "NoModify" 1\r
+  WriteRegDWord HKCU "${REG_UNINSTALL}" "NoRepair" 1\r
+  WriteRegStr HKCU "${REG_UNINSTALL}" "UninstallString" "$\"$INSTDIR\Uninstall.exe$\""\r
+\r
+  WriteUninstaller "$INSTDIR\Uninstall.exe"\r
+\r
   ExecShell "" "$INSTDIR\$fname.exe"\r
   \r
-SectionEnd ; end the section\r
+SectionEnd\r
+\r
+Section "Uninstall"\r
+\r
+DeleteRegKey HKCU "${REG_UNINSTALL}"\r
+Delete "$SMPROGRAMS\${FLUIDBOOKNAME}.lnk"\r
+Delete "$DESKTOP\${FLUIDBOOKNAME}.lnk"\r
+Delete "$INSTDIR\Uninstall.exe"\r
+RMDIR /r /REBOOTOK $INSTDIR\r
+SetRebootFlag false\r
+\r
+SectionEnd \r
 \r
 \r