[BACK]Return to amaya-wx_release.nsi CVS log [TXT] [DIR] Up to [Public] / Amaya

Diff for /Amaya/amaya-wx_release.nsi between versions 1.33 and 1.34

version 1.33, 2007/02/27 09:30:39 version 1.34, 2007/03/22 15:02:42
Line 8 Line 8
 ;General  ;General
   
   ;Name and file    ;Name and file
   !define VERSION "9.54"    !define VERSION "9.55"
   Name "Amaya ${VERSION}"    Name "Amaya"
   OutFile "amaya-WinXP-${VERSION}.exe"    OutFile "amaya-WinXP-${VERSION}.exe"
       
   ;Use lzma to compress (better than zip)    ;Use lzma to compress (better than zip)
   SetCompressor lzma    SetCompressor lzma
   
   ;Default installation folder    ;Default installation folder
   InstallDir "$PROGRAMFILES\Amaya-${VERSION}"    InstallDir "$PROGRAMFILES\Amaya"
       
   ;Get installation folder from registry if available    ;Get installation folder from registry if available
   InstallDirRegKey HKCU "Software\Amaya-${VERSION}" ""    InstallDirRegKey HKCU "Software\Amaya" ""
   
 ;--------------------------------  ;--------------------------------
 ;Variables  ;Variables
Line 36 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\Amaya-${VERSION}"     !define MUI_LANGDLL_REGISTRY_KEY "Software\Amaya" 
   !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"    !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
   
 ;--------------------------------  ;--------------------------------
Line 48 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\Amaya-${VERSION}"     !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Amaya" 
   !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 72 Line 72
   !insertmacro MUI_LANGUAGE "French"    !insertmacro MUI_LANGUAGE "French"
   !insertmacro MUI_LANGUAGE "German"    !insertmacro MUI_LANGUAGE "German"
   !insertmacro MUI_LANGUAGE "Spanish"    !insertmacro MUI_LANGUAGE "Spanish"
 ;  !insertmacro MUI_LANGUAGE "SimpChinese"    !insertmacro MUI_LANGUAGE "SimpChinese"
 ;  !insertmacro MUI_LANGUAGE "TradChinese"    !insertmacro MUI_LANGUAGE "TradChinese"
 ;  !insertmacro MUI_LANGUAGE "Japanese"  ;  !insertmacro MUI_LANGUAGE "Japanese"
 ;  !insertmacro MUI_LANGUAGE "Korean"  ;  !insertmacro MUI_LANGUAGE "Korean"
   !insertmacro MUI_LANGUAGE "Italian"    !insertmacro MUI_LANGUAGE "Italian"
Line 141  Section "Amaya" SecAmaya Line 141  Section "Amaya" SecAmaya
    lbl_notwinnt:     lbl_notwinnt:
    ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber     ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber
     
    StrCpy $R1 $R0 1      
    StrCmp $R1 '4' 0 lbl_error  
    
    StrCpy $R1 $R0 3     StrCpy $R1 $R0 3
     
    StrCmp $R1 '4.0' lbl_win32_95     StrCmp $R1 '4.0' lbl_win32_95
Line 170  Section "Amaya" SecAmaya Line 168  Section "Amaya" SecAmaya
    StrCmp $R1 '5.0' lbl_winnt_2000     StrCmp $R1 '5.0' lbl_winnt_2000
    StrCmp $R1 '5.1' lbl_winnt_XP     StrCmp $R1 '5.1' lbl_winnt_XP
    StrCmp $R1 '5.2' lbl_winnt_2003     StrCmp $R1 '5.2' lbl_winnt_2003
    Goto lbl_error      Abort "Only WinXP/2k/NT are supported"
     
    lbl_winnt_x:     lbl_winnt_x:
      StrCpy $R0 "NT $R0" 6       StrCpy $R0 "NT $R0" 6
Line 188  Section "Amaya" SecAmaya Line 186  Section "Amaya" SecAmaya
      Strcpy $R0 '2003'       Strcpy $R0 '2003'
    Goto lbl_done     Goto lbl_done
     
    lbl_error:  
      Abort "Only WinXP/2k/NT are supported"  
    lbl_done:     lbl_done:
   ;XXXXXXXXXXXXXXXXXXXXXXXXXX    ;XXXXXXXXXXXXXXXXXXXXXXXXXX
   
Line 319  Section "Amaya" SecAmaya Line 315  Section "Amaya" SecAmaya
   SetDetailsPrint listonly    SetDetailsPrint listonly
   
   ;Store installation folder    ;Store installation folder
   WriteRegStr HKCU "Software\Amaya-${VERSION}" "" $INSTDIR     WriteRegStr HKCU "Software\Amaya" "" $INSTDIR 
   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Amaya-${VERSION}" "UninstallString" '"$INSTDIR\Uninstall.exe"'    WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Amaya" "UninstallString" '"$INSTDIR\Uninstall.exe"'
   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Amaya-${VERSION}" "InstallLocation" "$INSTDIR"    WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Amaya" "InstallLocation" "$INSTDIR"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Amaya-${VERSION}" "DisplayName" "Amaya ${VERSION}"    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Amaya" "DisplayName" "Amaya"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Amaya-${VERSION}" "DisplayIcon" "$INSTDIR\WindowsWX\bin\amaya.exe"    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Amaya" "DisplayIcon" "$INSTDIR\WindowsWX\bin\amaya.exe"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Amaya-${VERSION}" "DisplayVersion" "${VERSION}"    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Amaya" "DisplayVersion" "${VERSION}"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Amaya-${VERSION}" "URLInfoAbout" "http://www.w3.org/Amaya"    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Amaya" "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 351  Section "Amaya" SecAmaya Line 347  Section "Amaya" SecAmaya
   !insertmacro MUI_STARTMENU_WRITE_END    !insertmacro MUI_STARTMENU_WRITE_END
   
   ;Create desktop link    ;Create desktop link
   CreateShortCut "$DESKTOP\Amaya-${VERSION}.lnk" "$INSTDIR\WindowsWX\bin\amaya.exe"    CreateShortCut "$DESKTOP\Amaya.lnk" "$INSTDIR\WindowsWX\bin\amaya.exe"
 SectionEnd  SectionEnd
   
   
Line 460  Section "Uninstall" Line 456  Section "Uninstall"
   ;Uninstall Amaya for all users    ;Uninstall Amaya for all users
   SetShellVarContext all    SetShellVarContext all
       
   ReadRegStr $STARTMENU_FOLDER HKCU "Software\Amaya-${VERSION}" "Start Menu Folder"    ReadRegStr $STARTMENU_FOLDER HKCU "Software\Amaya" "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\Amaya-${VERSION}.lnk"    Delete "$DESKTOP\Amaya.lnk"
   amaya_smp_notinstalled:    amaya_smp_notinstalled:
   
   RMDir /r "$INSTDIR"    RMDir /r "$INSTDIR"
Line 476  Section "Uninstall" Line 472  Section "Uninstall"
   DetailPrint "Deleting Registry Keys..."    DetailPrint "Deleting Registry Keys..."
   SetDetailsPrint listonly    SetDetailsPrint listonly
   
   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Amaya-${VERSION}"    DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Amaya"
   DeleteRegKey HKLM "Software\Amaya-${VERSION}"    DeleteRegKey HKLM "Software\Amaya"
   DeleteRegKey HKCR "Amaya"    DeleteRegKey HKCR "Amaya"
   DeleteRegKey HKCU "Software\Amaya-${VERSION}"    DeleteRegKey HKCU "Software\Amaya"
   ; uninstall files associations    ; uninstall files associations
   ; --> .html    ; --> .html
   ReadRegStr $R0 HKCR ".html" ""    ReadRegStr $R0 HKCR ".html" ""
Removed from v.1.33  
changed lines
  Added in v.1.34

Webmaster