Changeset 142 for smplayer/trunk/setup/smplayer.nsi

Timestamp:

May 27, 2013, 3:28:05 PM (12 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to 0.8.5

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• setup/smplayer.nsi (modified) (24 diffs)

smplayer/trunk/setup/smplayer.nsi

@@ -43 +43 @@
   !define SMPLAYER_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\SMPlayer"
 
-  ;Fallback versions
-  ;These can be changed in the compiler, otherwise
-  ;if not defined the values shown here will be used.
-!ifndef DEFAULT_CODECS_VERSION
-  !define DEFAULT_CODECS_VERSION "windows-essential-20071007"
-!endif
-
-  ;Version control
-!ifndef VERSION_FILE_URL
-  !define VERSION_FILE_URL "http://smplayer.sourceforge.net/mplayer-version-info"
-!endif
+  !define CODEC_VERSION "windows-essential-20071007"
 
 ;--------------------------------
@@ -110 +100 @@
   Var Reinstall_UninstallButton
   Var Reinstall_UninstallButton_State
+  Var Restore_Codecs
   Var SMPlayer_Path
   Var SMPlayer_UnStrPath
@@ -233 +224 @@
   !insertmacro MUI_LANGUAGE "Slovenian"
   !insertmacro MUI_LANGUAGE "Spanish"
+  !insertmacro MUI_LANGUAGE "Thai"
   !insertmacro MUI_LANGUAGE "TradChinese"
 
@@ -260 +252 @@
   !insertmacro LANGFILE_INCLUDE "translations\slovenian.nsh"
   !insertmacro LANGFILE_INCLUDE "translations\spanish.nsh"
+  !insertmacro LANGFILE_INCLUDE "translations\thai.nsh"
   !insertmacro LANGFILE_INCLUDE "translations\tradchinese.nsh"
 
@@ -271 +264 @@
   !insertmacro MUI_RESERVEFILE_LANGDLL
   ReserveFile "${NSISDIR}\Plugins\UserInfo.dll"
-  ReserveFile "FindProcDLL.dll"
 
 ;--------------------------------
@@ -288 +280 @@
       Quit
     ${ElseIf} $Reinstall_OverwriteButton_State == 1
+
+      Call Backup_Codecs
+
       ${If} "$INSTDIR" == "$SMPlayer_Path"
         ExecWait '"$SMPlayer_UnStrPath" /S /R _?=$SMPlayer_Path'
@@ -293 +288 @@
         ExecWait '"$SMPlayer_UnStrPath" /S /R'
       ${EndIf}
+
+      Sleep 2500
+
     ${EndIf}
 
@@ -363 +361 @@
 
     SetOutPath "$INSTDIR\mplayer"
-    File /r "${SMPLAYER_BUILD_DIR}\mplayer\*.*"
+    File /r /x mencoder.exe "${SMPLAYER_BUILD_DIR}\mplayer\*.*"
 
     WriteRegDWORD HKLM "${SMPLAYER_REG_KEY}" Installed_MPlayer 0x1
@@ -371 +369 @@
   Section /o $(Section_MPlayerCodecs) SecCodecs
 
-    AddSize 22300
-
-    Var /GLOBAL Codec_Version
-
-    Call GetVerInfo
-
-    /* Read from version-info
-    If it was unable to download, set version to that defined in the
-    beginning of the script. */
-    ${If} ${FileExists} "$PLUGINSDIR\version-info"
-      ReadINIStr $Codec_Version "$PLUGINSDIR\version-info" smplayer mplayercodecs
-    ${Else}
-      StrCpy $Codec_Version ${DEFAULT_CODECS_VERSION}
+    AddSize 22931
+
+    ${If} $Restore_Codecs == 1
+      DetailPrint $(Info_Codecs_Restore)
+      CopyFiles /SILENT "$PLUGINSDIR\codecbak\*" "$INSTDIR\mplayer\codecs"
+      Goto check_codecs
+    ${ElseIf} ${FileExists} "$EXEDIR\${CODEC_VERSION}.zip"
+      CopyFiles /SILENT "$EXEDIR\${CODEC_VERSION}.zip" "$PLUGINSDIR"
+      Goto extract_codecs
     ${EndIf}
 
-    retry_codecs:
+    retry_codecs_dl:
 
     DetailPrint $(Codecs_DL_Msg)
+!ifndef USE_NSISDL
     inetc::get /CONNECTTIMEOUT 15000 /RESUME "" /BANNER $(Codecs_DL_Msg) /CAPTION $(Codecs_DL_Msg) \
-    "http://www.mplayerhq.hu/MPlayer/releases/codecs/$Codec_Version.zip" \
-    "$PLUGINSDIR\$Codec_Version.zip" /END
+    "http://www.mplayerhq.hu/MPlayer/releases/codecs/${CODEC_VERSION}.zip" \
+    "$PLUGINSDIR\${CODEC_VERSION}.zip" /END
     Pop $R0
-    StrCmp $R0 OK 0 check_codecs
+    StrCmp $R0 OK +4 0
+!else
+    NSISdl::download /TIMEOUT=15000 \
+    "http://www.mplayerhq.hu/MPlayer/releases/codecs/${CODEC_VERSION}.zip" \
+    "$PLUGINSDIR\${CODEC_VERSION}.zip" /END
+    Pop $R0
+    StrCmp $R0 "success" +4 0
+!endif
+      DetailPrint $(Codecs_DL_Failed)
+      MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(Codecs_DL_Retry) /SD IDCANCEL IDRETRY retry_codecs_dl
+      Goto check_codecs
+
+    extract_codecs:
 
     DetailPrint $(Info_Files_Extract)
-    nsExec::Exec '"$PLUGINSDIR\7za.exe" x "$PLUGINSDIR\$Codec_Version.zip" -y -o"$PLUGINSDIR"'
+    nsExec::Exec '"$PLUGINSDIR\7za.exe" x "$PLUGINSDIR\${CODEC_VERSION}.zip" -y -o"$PLUGINSDIR"'
 
     CreateDirectory "$INSTDIR\mplayer\codecs"
-    CopyFiles /SILENT "$PLUGINSDIR\$Codec_Version\*" "$INSTDIR\mplayer\codecs"
+    CopyFiles /SILENT "$PLUGINSDIR\${CODEC_VERSION}\*" "$INSTDIR\mplayer\codecs"
 
     check_codecs:
 
-    ${If} $R0 != "OK"
-      DetailPrint $(Codecs_DL_Failed)
-    ${EndIf}
-
-    IfFileExists "$INSTDIR\mplayer\codecs\*.dll" codecsInstSuccess codecsInstFailed
-      codecsInstSuccess:
+    IfFileExists "$INSTDIR\mplayer\codecs\*.dll" 0 codecsInstFailed
         WriteRegDWORD HKLM "${SMPLAYER_REG_KEY}" Installed_Codecs 0x1
         Goto done
       codecsInstFailed:
-        MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(Codecs_DL_Retry) /SD IDCANCEL IDRETRY retry_codecs
         DetailPrint $(Codecs_Inst_Failed)
         WriteRegDWORD HKLM "${SMPLAYER_REG_KEY}" Installed_Codecs 0x0
@@ -498 +499 @@
 !macro MacroAllExtensions _action
   !insertmacro ${_action} ".3gp"
+  !insertmacro ${_action} ".aac"
   !insertmacro ${_action} ".ac3"
   !insertmacro ${_action} ".ape"
   !insertmacro ${_action} ".asf"
   !insertmacro ${_action} ".avi"
+  !insertmacro ${_action} ".bik"
   !insertmacro ${_action} ".bin"
   !insertmacro ${_action} ".dat"
   !insertmacro ${_action} ".divx"
+  !insertmacro ${_action} ".dts"
   !insertmacro ${_action} ".dv"
   !insertmacro ${_action} ".dvr-ms"
@@ -515 +519 @@
   !insertmacro ${_action} ".m2t"
   !insertmacro ${_action} ".m2ts"
+  !insertmacro ${_action} ".mts"
   !insertmacro ${_action} ".m2v"
   !insertmacro ${_action} ".m3u"
@@ -541 +546 @@
   !insertmacro ${_action} ".rm"
   !insertmacro ${_action} ".rmvb"
+  !insertmacro ${_action} ".smk"
   !insertmacro ${_action} ".swf"
   !insertmacro ${_action} ".thd"
@@ -591 +597 @@
   Delete "$INSTDIR\zlib1.dll"
   Delete "$INSTDIR\Qt*.dll"
+  Delete "$INSTDIR\sample.avi"
   Delete "$INSTDIR\smplayer.exe"
   Delete "$INSTDIR\smtube.exe"
@@ -613 +620 @@
 ;Shared functions
 
+!ifdef USE_RUNCHECK
 !macro RunCheckMacro UN
 Function ${UN}RunCheck
 
-  retry_runcheck:
-  FindProcDLL::FindProc "smplayer.exe"
-  IntCmp $R0 1 0 +3
-    MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(SMPlayer_Is_Running) /SD IDCANCEL IDRETRY retry_runcheck
-    Abort
+    retry_runcheck:
+    FindWindow $0 "QWidget" "SMPlayer"
+    StrCmp $0 0 notRunning
+      MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(SMPlayer_Is_Running) /SD IDCANCEL IDRETRY retry_runcheck
+      Abort
+    notrunning:
 
 FunctionEnd
@@ -626 +635 @@
 !insertmacro RunCheckMacro ""
 !insertmacro RunCheckMacro "un."
+!endif
 
 ;--------------------------------
@@ -632 +642 @@
 Function .onInit
 
+/*
   ${Unless} ${AtLeastWinXP}
     MessageBox MB_YESNO|MB_ICONSTOP $(OS_Not_Supported) /SD IDNO IDYES installonoldwindows
@@ -637 +648 @@
   installonoldwindows:
   ${EndIf}
+*/
 
 !ifdef WIN64
@@ -675 +687 @@
     Abort
 
+!ifdef USE_RUNCHECK
   ;Check if SMPlayer is running
   ;Allow skipping check using /NORUNCHECK
@@ -681 +694 @@
   IfErrors 0 +2
     Call RunCheck
+!endif
 
   ;Check for admin on < Vista
@@ -705 +719 @@
   ${MementoSectionSave}
 
+  ExecShell "open" "http://smplayer.sourceforge.net/thank-you.php?version=${SMPLAYER_VERSION}"
+
 FunctionEnd
 
@@ -717 +733 @@
   Delete "$INSTDIR\${SMPLAYER_UNINST_EXE}"
   RMDir "$INSTDIR"
+
+FunctionEnd
+
+Function un.onUninstSuccess
+
+  ;Don't launch uninstall page if reinstalling
+  ${un.GetParameters} $R0
+  ${un.GetOptionsS} $R0 "/R" $R1
+
+  IfErrors 0 +2
+  ExecShell "open" "http://smplayer.sourceforge.net/uninstall.php?version=${SMPLAYER_VERSION}"
 
 FunctionEnd
@@ -747 +774 @@
 FunctionEnd
 
-Function GetVerInfo
-
-  IfFileExists "$PLUGINSDIR\version-info" end_dl_ver_info 0
-    DetailPrint $(VerInfo_DL_Msg)
-    inetc::get /CONNECTTIMEOUT 15000 /SILENT ${VERSION_FILE_URL} "$PLUGINSDIR\version-info" /END
-    Pop $R0
-    StrCmp $R0 OK +2
-      DetailPrint $(VerInfo_DL_Failed)
-
-  end_dl_ver_info:
+Function Backup_Codecs
+
+  ${IfNot} ${SectionIsSelected} ${SecCodecs}
+    Return
+  ${EndIf}
+
+  IfFileExists "$SMPlayer_Path\mplayer\codecs\*.dll" 0 NoBackup
+    DetailPrint $(Info_Codecs_Backup)
+    CreateDirectory "$PLUGINSDIR\codecbak"
+    CopyFiles /SILENT "$SMPlayer_Path\mplayer\codecs\*" "$PLUGINSDIR\codecbak"
+    StrCpy $Restore_Codecs 1
+    Return
+  NoBackup:
+    StrCpy $Restore_Codecs 0
 
 FunctionEnd
@@ -969 +1000 @@
   ${EndIf}
 
+!ifdef USE_RUNCHECK
   ;Check if SMPlayer is running
   ;Allow skipping check using /NORUNCHECK
@@ -975 +1007 @@
   IfErrors 0 +2
     Call un.RunCheck
+!endif
 
   ;Gets start menu folder name