[Sumover-dev] [svn commit] r3842 - vic/trunk

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Mon Sep 11 14:33:24 2006
New Revision: 3842

Modified:
   vic/trunk/vic-nsis-installer.nsi

Log:
Updated installer script paths, and added addition checks.

Modified: vic/trunk/vic-nsis-installer.nsi
==============================================================================
--- vic/trunk/vic-nsis-installer.nsi	(original)
+++ vic/trunk/vic-nsis-installer.nsi	Mon Sep 11 14:33:24 2006
@@ -2,16 +2,15 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "Vic"
-!define PRODUCT_VERSION "v2.8ucl1.1.7"
+!define PRODUCT_VERSION "v2.8ucl1.2.0"
 !define PRODUCT_PUBLISHER "UCL"
-!define PRODUCT_WEB_SITE "http://www-mice.cs.ucl.ac.uk/multimedia/software/"
+!define PRODUCT_WEB_SITE "https://mediatools.cs.ucl.ac.uk/nets/mmedia/wiki/VicWiki"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\vic.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 
-; for path manipulation
-;http://nsis.sourceforge.net/wiki/Path_Manipulation
-!include "AddToPath.nsh"
+;Local utility macros - mostly from nsis website
+!include "win32\utility-macros.nsh"
 
 ; MUI 1.67 compatible ------
 !include "MUI.nsh"
@@ -28,7 +27,7 @@
 ; Welcome page
 !insertmacro MUI_PAGE_WELCOME
 ; License page
-!insertmacro MUI_PAGE_LICENSE "..\cygwin\home\piers\LICENSE.txt"
+!insertmacro MUI_PAGE_LICENSE "LICENSE.txt"
 ; Directory page
 !insertmacro MUI_PAGE_DIRECTORY
 ; Instfiles page
@@ -45,7 +44,7 @@
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "Setup.exe"
+OutFile "Vic-Installer.exe"
 InstallDir "$PROGRAMFILES\UCL Media Tools"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
@@ -54,16 +53,20 @@
 Section "MainSection" SEC01
   SetOutPath "$INSTDIR"
   SetOverwrite ifnewer
-  File "vic\Debug IPv6 XP\vic.exe"
+  File "Debug\vic.exe"
   CreateDirectory "$SMPROGRAMS\UCL Media Tools"
   CreateShortCut "$SMPROGRAMS\UCL Media Tools\Vic.lnk" "$INSTDIR\vic.exe"
-  CreateShortCut "$DESKTOP\Vic.lnk" "$INSTDIR\vic.exe"
 SectionEnd
 
 Section "Add to path"
   Push $INSTDIR
   Call AddToPath
 
+  ;Add HOME variable - used for .vic.tcl files
+  Push "HOME"
+  Push $INSTDIR
+  Call AddToEnvVar
+  
   ;likewise AddToPath could be
   ;Push "PATH"
   ;Push $INSTDIR
@@ -72,15 +75,15 @@
 
 Section -AdditionalIcons
   WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
-  CreateShortCut "$SMPROGRAMS\UCL Media Tools\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
-  CreateShortCut "$SMPROGRAMS\UCL Media Tools\Uninstall.lnk" "$INSTDIR\uninst.exe"
+  CreateShortCut "$SMPROGRAMS\UCL Media Tools\Vic-Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
+  CreateShortCut "$SMPROGRAMS\UCL Media Tools\Vic-Uninstaller.lnk" "$INSTDIR\Vic-Uninstaller.exe"
 SectionEnd
 
 Section -Post
-  WriteUninstaller "$INSTDIR\uninst.exe"
+  WriteUninstaller "$INSTDIR\Vic-Uninstaller.exe"
   WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\vic.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Vic-Uninstaller.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\vic.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
@@ -100,20 +103,26 @@
 
 Section Uninstall
   Delete "$INSTDIR\${PRODUCT_NAME}.url"
-  Delete "$INSTDIR\uninst.exe"
+  Delete "$INSTDIR\Vic-Uninstaller.exe"
   Delete "$INSTDIR\vic.exe"
 
-  Delete "$SMPROGRAMS\UCL Media Tools\Uninstall.lnk"
+  Delete "$SMPROGRAMS\UCL Media Tools\Vic-Uninstaller.lnk"
   Delete "$SMPROGRAMS\UCL Media Tools\Website.lnk"
-  Delete "$DESKTOP\Vic.lnk"
   Delete "$SMPROGRAMS\UCL Media Tools\Vic.lnk"
+  ;Delete "$DESKTOP\Vic.lnk"
   
-  Push $INSTDIR
-  Call un.RemoveFromPath
-  
-  RMDir "$SMPROGRAMS\UCL Media Tools"
-  RMDir "$INSTDIR"
-
+  Push "$SMPROGRAMS\UCL Media Tools"
+  Call un.isEmptyDir
+  Pop $0
+  StrCmp $0 1 0 +2
+    RMDir "$SMPROGRAMS\UCL Media Tools"
+    RMDir "$INSTDIR"
+    Push $INSTDIR
+    Call un.RemoveFromPath
+    Push "HOME"
+    Push $INSTDIR
+    Call un.RemoveFromEnvVar
+    
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
   SetAutoClose true