[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.9 and 1.10

version 1.9, 2004/12/22 08:14:07 version 1.10, 2004/12/22 13:42:54
Line 26 Line 26
   
   
   Var STARTMENU_FOLDER    Var STARTMENU_FOLDER
   
 ;--------------------------------  ;--------------------------------
 ;Interface Settings  ;Interface Settings
   
Line 55 Line 54
   
   !insertmacro MUI_PAGE_INSTFILES    !insertmacro MUI_PAGE_INSTFILES
       
     !define MUI_FINISHPAGE_LINK "Visit the Amaya site for the latest news, FAQs and support"
     !define MUI_FINISHPAGE_LINK_LOCATION "http://www.w3.org/Amaya"
   
     !define MUI_FINISHPAGE_RUN "$INSTDIR\WindowsWX\bin\amaya.exe"
     !define MUI_FINISHPAGE_NOREBOOTSUPPORT
     
     !insertmacro MUI_PAGE_FINISH
   
   !insertmacro MUI_UNPAGE_CONFIRM    !insertmacro MUI_UNPAGE_CONFIRM
   !insertmacro MUI_UNPAGE_INSTFILES    !insertmacro MUI_UNPAGE_INSTFILES
   
Line 120 Line 127
 Section "Amaya" SecAmaya  Section "Amaya" SecAmaya
   
   
     SetDetailsPrint textonly
     DetailPrint "Testing supported OS..."
     SetDetailsPrint listonly
   
  ;XXXXXXXXXXXXXXXXXXXXXXXXXX   ;XXXXXXXXXXXXXXXXXXXXXXXXXX
  ;Test the platform   ;Test the platform
  ;XXXXXXXXXXXXXXXXXXXXXXXXXX   ;XXXXXXXXXXXXXXXXXXXXXXXXXX
    ReadRegStr $R0 HKLM \     ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
    "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion     StrCmp $R0 "" lbl_notwinnt lbl_winnt
   
    IfErrors 0 lbl_winnt  
         
    ; we are not NT     ; we are not NT
    ReadRegStr $R0 HKLM \     lbl_notwinnt:
    "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber     ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber
     
    StrCpy $R1 $R0 1     StrCpy $R1 $R0 1
    StrCmp $R1 '4' 0 lbl_error     StrCmp $R1 '4' 0 lbl_error
Line 141  Section "Amaya" SecAmaya Line 150  Section "Amaya" SecAmaya
    StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98     StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98
     
    lbl_win32_95:     lbl_win32_95:
      Abort       Abort "Win95 not supported"
     
    lbl_win32_98:     lbl_win32_98:
      Abort       Abort "Win98 not supported"
     
    lbl_win32_ME:     lbl_win32_ME:
      Abort       Abort "WinME not supported"
     
    lbl_winnt:     lbl_winnt:
     
Line 160  Section "Amaya" SecAmaya Line 169  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 lbl_error     StrCmp $R1 '5.2' lbl_winnt_2003
      Goto lbl_error
     
    lbl_winnt_x:     lbl_winnt_x:
      StrCpy $R0 "NT $R0" 6       StrCpy $R0 "NT $R0" 6
Line 179  Section "Amaya" SecAmaya Line 189  Section "Amaya" SecAmaya
    Goto lbl_done     Goto lbl_done
     
    lbl_error:     lbl_error:
      Abort       Abort "Only WinXP/2k/NT are supported"
    lbl_done:     lbl_done:
    MessageBox MB_OK $R0   
   ;XXXXXXXXXXXXXXXXXXXXXXXXXX    ;XXXXXXXXXXXXXXXXXXXXXXXXXX
   
   ;This section is required : readonly mode    ;This section is required : readonly mode
   SectionIn RO    SectionIn RO
   
     SetDetailsPrint textonly
     DetailPrint "Installing Amaya binaries and wxWidgets DLL"
     SetDetailsPrint listonly
   
   SetOutPath "$INSTDIR\WindowsWX\bin"    SetOutPath "$INSTDIR\WindowsWX\bin"
   File WindowsWX\bin\amaya.exe    File WindowsWX\bin\amaya.exe
   File WindowsWX\bin\wxmsw*u_xrc_vc_custom.dll    File WindowsWX\bin\wxmsw*u_xrc_vc_custom.dll
Line 198  Section "Amaya" SecAmaya Line 211  Section "Amaya" SecAmaya
   File WindowsWX\bin\wxbase*u_xml_vc_custom.dll    File WindowsWX\bin\wxbase*u_xml_vc_custom.dll
 ;  File WindowsWX\bin\thotprinter.exe  ;  File WindowsWX\bin\thotprinter.exe
   
     SetDetailsPrint textonly
     DetailPrint "Installing Amaya resources : icons, dialogues"
     SetDetailsPrint listonly
   
   SetOutPath "$INSTDIR\resources\icons"    SetOutPath "$INSTDIR\resources\icons"
   File resources\icons\*.png    File resources\icons\*.png
Line 205  Section "Amaya" SecAmaya Line 221  Section "Amaya" SecAmaya
   SetOutPath "$INSTDIR\resources\xrc"    SetOutPath "$INSTDIR\resources\xrc"
   File resources\xrc\*.xrc    File resources\xrc\*.xrc
   
     SetDetailsPrint textonly
     DetailPrint "Installing Amaya schemas"
     SetDetailsPrint listonly
   
   SetOutPath "$INSTDIR\amaya"    SetOutPath "$INSTDIR\amaya"
   File amaya\COPYRIGHT    File amaya\COPYRIGHT
Line 221  Section "Amaya" SecAmaya Line 240  Section "Amaya" SecAmaya
   File amaya\*.ico    File amaya\*.ico
   File amaya\*.svg    File amaya\*.svg
   
     SetDetailsPrint textonly
     DetailPrint "Installing annotlib schemas"
     SetDetailsPrint listonly
   
   SetOutPath "$INSTDIR\annotlib"    SetOutPath "$INSTDIR\annotlib"
   File annotlib\*.png    File annotlib\*.png
   File annotlib\*.gif    File annotlib\*.gif
Line 229  Section "Amaya" SecAmaya Line 252  Section "Amaya" SecAmaya
   File annotlib\*.TRA    File annotlib\*.TRA
   File annotlib\*.en    File annotlib\*.en
   
     SetDetailsPrint textonly
     DetailPrint "Installing Amaya config files"
     SetDetailsPrint listonly
   
   SetOutPath "$INSTDIR\config\libconfig"    SetOutPath "$INSTDIR\config\libconfig"
   File config\libconfig\*.png    File config\libconfig\*.png
   File config\libconfig\*.svg    File config\libconfig\*.svg
Line 248  Section "Amaya" SecAmaya Line 275  Section "Amaya" SecAmaya
   File config\annot.schemas    File config\annot.schemas
   File config\win-thot.rc    File config\win-thot.rc
   
     SetDetailsPrint textonly
     DetailPrint "Installing Amaya dictionnaries"
     SetDetailsPrint listonly
   
   SetOutPath "$INSTDIR\dicopar"    SetOutPath "$INSTDIR\dicopar"
   File dicopar\alphabet    File dicopar\alphabet
   File dicopar\*.ptn    File dicopar\*.ptn
   File dicopar\clavier    File dicopar\clavier
   File dicopar\*.dic    File dicopar\*.dic
   
     SetDetailsPrint textonly
     DetailPrint "Installing Amaya documentation"
     SetDetailsPrint listonly
   
   SetOutPath "$INSTDIR\doc\html"    SetOutPath "$INSTDIR\doc\html"
   File doc\html\*    File doc\html\*
   SetOutPath "$INSTDIR\doc\html\accessibility_in_amaya"    SetOutPath "$INSTDIR\doc\html\accessibility_in_amaya"
Line 306  Section "Amaya" SecAmaya Line 341  Section "Amaya" SecAmaya
   SetOutPath "$INSTDIR\doc\images"    SetOutPath "$INSTDIR\doc\images"
   File doc\images\*    File doc\images\*
   
     SetDetailsPrint textonly
     DetailPrint "Installing Amaya ttf fonts"
     SetDetailsPrint listonly
   
   SetOutPath "$INSTDIR\fonts"    SetOutPath "$INSTDIR\fonts"
   File fonts\*    File fonts\*
   
     SetDetailsPrint textonly
     DetailPrint "Writting registry keys"
     SetDetailsPrint listonly
   
   ;Store installation folder    ;Store installation folder
   WriteRegStr HKCU "Software\AmayaWX" "" $INSTDIR    WriteRegStr HKCU "Software\AmayaWX" "" $INSTDIR 
     WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX" "UninstallString" '"$INSTDIR\Uninstall.exe"'
     WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX" "InstallLocation" "$INSTDIR"
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX" "DisplayName" "Amaya"
     ;WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX" "DisplayIcon" "$INSTDIR\NSIS.exe,0"
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX" "DisplayVersion" "${VERSION}"
   ;  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX" "VersionMajor" "${VER_MAJOR}"
   ;  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX" "VersionMinor" "${VER_MINOR}.${VER_REVISION}"
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX" "URLInfoAbout" "http://www.w3.org/Amaya"
       
   ;Create uninstaller    ;Create uninstaller
   WriteUninstaller "$INSTDIR\Uninstall.exe"    WriteUninstaller "$INSTDIR\Uninstall.exe"
Line 352  FunctionEnd Line 403  FunctionEnd
   
 Section "Uninstall"  Section "Uninstall"
   
   Delete "$INSTDIR\Uninstall.exe"    SetDetailsPrint textonly
     DetailPrint "Uninstalling Amaya..."
   RMDir /r "$INSTDIR"    SetDetailsPrint listonly
   
   ;Start Menu uninstall    IfFileExists $INSTDIR\WindowsWX\bin\amaya.exe amaya_installed
 ;  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP         MessageBox MB_YESNO "It does not appear that Amaya is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?" IDYES amaya_installed
 ;  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"      Abort "Uninstall aborted by user"
 ;  ;Delete empty start menu parent diretories    amaya_installed:
 ;  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"  
 ;  startMenuDeleteLoop:  
 ;    ClearErrors    SetDetailsPrint textonly
 ;    RMDir $MUI_TEMP    DetailPrint "Deleting Files..."
 ;    GetFullPathName $MUI_TEMP "$MUI_TEMP\.."        SetDetailsPrint listonly
 ;    IfErrors startMenuDeleteLoopDone  
 ;    StrCmp $MUI_TEMP $SMPROGRAMS startMenuDeleteLoopDone startMenuDeleteLoop    ReadRegStr $STARTMENU_FOLDER HKCU "Software\AmayaWX" "Start Menu Folder"
 ;  startMenuDeleteLoopDone:    IfFileExists "$SMPROGRAMS\$STARTMENU_FOLDER\Amaya.lnk" amaya_smp_installed
       Goto amaya_smp_notinstalled
     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\AmayaWX.lnk"
     amaya_smp_notinstalled:
   
     RMDir /r "$INSTDIR"
   
     SetDetailsPrint textonly
     DetailPrint "Deleting Registry Keys..."
     SetDetailsPrint listonly
   
   DeleteRegKey /ifempty HKCU "Software\AmayaWX"    DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\AmayaWX"
     DeleteRegKey HKLM "Software\AmayaWX"
   
 SectionEnd  SectionEnd
   
Removed from v.1.9  
changed lines
  Added in v.1.10

Webmaster