Diff for /Amaya/amaya-wx_debug.nsi between versions 1.23 and 1.24

version 1.23, 2005/05/25 07:48:47 version 1.24, 2005/06/22 09:26:56
Line 8 Line 8
 ;General  ;General
   
   ;Name and file    ;Name and file
   !define VERSION "9.1.4"    !define VERSION "9.2"
   Name "Amaya WX ${VERSION} (debug)"    Name "Amaya WX ${VERSION} (debug)"
   OutFile "amaya-WinXP-${VERSION}-debug.exe"    OutFile "amaya-WinXP-${VERSION}-debug.exe"
       
Line 16 Line 16
   SetCompressor lzma    SetCompressor lzma
   
   ;Default installation folder    ;Default installation folder
   InstallDir "$PROGRAMFILES\AmayaWX-debug"    InstallDir "$PROGRAMFILES\AmayaWX-${VERSION}-debug"
       
   ;Get installation folder from registry if available    ;Get installation folder from registry if available
   InstallDirRegKey HKCU "Software\AmayaWX-debug" ""    InstallDirRegKey HKCU "Software\AmayaWX-${VERSION}-debug" ""
   
   
 ;--------------------------------  ;--------------------------------
 ;Variables  ;Variables
Line 37 Line 36
   
   ;Remember the installer language    ;Remember the installer language
   !define MUI_LANGDLL_REGISTRY_ROOT "HKCU"     !define MUI_LANGDLL_REGISTRY_ROOT "HKCU" 
   !define MUI_LANGDLL_REGISTRY_KEY "Software\AmayaWX-debug"     !define MUI_LANGDLL_REGISTRY_KEY "Software\AmayaWX-${VERSION}-debug" 
   !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"    !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
   
 ;--------------------------------  ;--------------------------------
Line 49 Line 48
   
   ;Start Menu Folder Page Configuration    ;Start Menu Folder Page Configuration
   !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"     !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" 
   !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\AmayaWX-debug"     !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\AmayaWX-${VERSION}-debug" 
   !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"    !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
   !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER    !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
   
Line 370  Section "Amaya" SecAmaya Line 369  Section "Amaya" SecAmaya
   SetDetailsPrint listonly    SetDetailsPrint listonly
   
   ;Store installation folder    ;Store installation folder
   WriteRegStr HKCU "Software\AmayaWX-debug" "" $INSTDIR     WriteRegStr HKCU "Software\AmayaWX-${VERSION}-debug" "" $INSTDIR 
   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX-debug" "UninstallString" '"$INSTDIR\Uninstall.exe"'    WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX-${VERSION}-debug" "UninstallString" '"$INSTDIR\Uninstall.exe"'
   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX-debug" "InstallLocation" "$INSTDIR"    WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX-${VERSION}-debug" "InstallLocation" "$INSTDIR"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX-debug" "DisplayName" "Amaya"    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX-${VERSION}-debug" "DisplayName" "Amaya"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX-debug" "DisplayIcon" "$INSTDIR\WindowsWX\bin\amaya.exe"    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX-${VERSION}-debug" "DisplayIcon" "$INSTDIR\WindowsWX\bin\amaya.exe"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX-debug" "DisplayVersion" "${VERSION}"    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX-${VERSION}-debug" "DisplayVersion" "${VERSION}"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX-debug" "URLInfoAbout" "http://www.w3.org/Amaya"    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX-${VERSION}-debug" "URLInfoAbout" "http://www.w3.org/Amaya"
   
   ; Associate files to amaya    ; Associate files to amaya
   WriteRegStr HKCR "Amaya" "" "Amaya Files"    WriteRegStr HKCR "Amaya" "" "Amaya Files"
Line 390  Section "Amaya" SecAmaya Line 389  Section "Amaya" SecAmaya
   ;Create uninstaller    ;Create uninstaller
   WriteUninstaller "$INSTDIR\Uninstall.exe"    WriteUninstaller "$INSTDIR\Uninstall.exe"
   
     ;Install Amaya for all users
     SetShellVarContext all
   
   ;Start Menu    ;Start Menu
   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application       !insertmacro MUI_STARTMENU_WRITE_BEGIN Application   
     ;Create shortcuts      ;Create shortcuts
Line 399  Section "Amaya" SecAmaya Line 401  Section "Amaya" SecAmaya
   !insertmacro MUI_STARTMENU_WRITE_END    !insertmacro MUI_STARTMENU_WRITE_END
   
   ;Create desktop link    ;Create desktop link
   CreateShortCut "$DESKTOP\AmayaWX.lnk" "$INSTDIR\WindowsWX\bin\amaya.exe"    CreateShortCut "$DESKTOP\Amaya-${VERSION}-debug.lnk" "$INSTDIR\WindowsWX\bin\amaya.exe"
 SectionEnd  SectionEnd
   
   
Line 506  Section "Uninstall" Line 508  Section "Uninstall"
   DetailPrint "Deleting Files..."    DetailPrint "Deleting Files..."
   SetDetailsPrint listonly    SetDetailsPrint listonly
   
   ReadRegStr $STARTMENU_FOLDER HKCU "Software\AmayaWX-debug" "Start Menu Folder"    ;Uninstall Amaya for all users
     SetShellVarContext all
   
     ReadRegStr $STARTMENU_FOLDER HKCU "Software\AmayaWX-${VERSION}-debug" "Start Menu Folder"
   IfFileExists "$SMPROGRAMS\$STARTMENU_FOLDER\Amaya.lnk" amaya_smp_installed    IfFileExists "$SMPROGRAMS\$STARTMENU_FOLDER\Amaya.lnk" amaya_smp_installed
     Goto amaya_smp_notinstalled      Goto amaya_smp_notinstalled
   amaya_smp_installed:    amaya_smp_installed:
     Delete "$SMPROGRAMS\$STARTMENU_FOLDER\Amaya.lnk"      Delete "$SMPROGRAMS\$STARTMENU_FOLDER\Amaya.lnk"
     Delete "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk"      Delete "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk"
     RMDir  "$SMPROGRAMS\$STARTMENU_FOLDER"      RMDir  "$SMPROGRAMS\$STARTMENU_FOLDER"
     Delete "$DESKTOP\AmayaWX.lnk"      Delete "$DESKTOP\Amaya-${VERSION}-debug.lnk"
   amaya_smp_notinstalled:    amaya_smp_notinstalled:
   
   RMDir /r "$INSTDIR"    RMDir /r "$INSTDIR"
Line 522  Section "Uninstall" Line 527  Section "Uninstall"
   DetailPrint "Deleting Registry Keys..."    DetailPrint "Deleting Registry Keys..."
   SetDetailsPrint listonly    SetDetailsPrint listonly
   
   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX-debug"    DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX-${VERSION}-debug"
   DeleteRegKey HKLM "Software\AmayaWX-debug"    DeleteRegKey HKLM "Software\AmayaWX-${VERSION}-debug"
   DeleteRegKey HKCR "Amaya"    DeleteRegKey HKCR "Amaya"
   DeleteRegKey HKCU "Software\AmayaWX-debug"    DeleteRegKey HKCU "Software\AmayaWX-${VERSION}-debug"
   
   ; uninstall files associations    ; uninstall files associations
   ; --> .html    ; --> .html

Removed from v.1.23  
changed lines
  Added in v.1.24


Webmaster