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

Timestamp:

May 16, 2014, 9:51:55 AM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to latest 0.8.7

Location:

smplayer/trunk

Files:

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

smplayer/trunk/setup/smplayer.nsi

@@ -5 +5 @@
 !ifndef VER_MAJOR | VER_MINOR | VER_BUILD
   !error "Version information not defined (or incomplete). You must define: VER_MAJOR, VER_MINOR, VER_BUILD."
+!endif
+
+!ifdef WIN64
+  !define DISABLE_CODECS
 !endif
 
@@ -102 +106 @@
   Var Reinstall_UninstallButton
   Var Reinstall_UninstallButton_State
+!ifndef DISABLE_CODECS
   Var Restore_Codecs
+!endif
   Var SMPlayer_Path
   Var SMPlayer_UnStrPath
@@ -204 +210 @@
 
   !insertmacro MUI_LANGUAGE "English"
+  !insertmacro MUI_LANGUAGE "Albanian"
+  !insertmacro MUI_LANGUAGE "Arabic"
   !insertmacro MUI_LANGUAGE "Basque"
+  !insertmacro MUI_LANGUAGE "Bulgarian"
   !insertmacro MUI_LANGUAGE "Catalan"
   !insertmacro MUI_LANGUAGE "Croatian"
@@ -218 +227 @@
   !insertmacro MUI_LANGUAGE "Japanese"
   !insertmacro MUI_LANGUAGE "Korean"
+  !insertmacro MUI_LANGUAGE "Malay"
   !insertmacro MUI_LANGUAGE "Norwegian"
   !insertmacro MUI_LANGUAGE "Polish"
   !insertmacro MUI_LANGUAGE "Portuguese"
+  !insertmacro MUI_LANGUAGE "PortugueseBR"
   !insertmacro MUI_LANGUAGE "Russian"
+  !insertmacro MUI_LANGUAGE "Serbian"
   !insertmacro MUI_LANGUAGE "SimpChinese"
   !insertmacro MUI_LANGUAGE "Slovak"
@@ -232 +244 @@
 
   !insertmacro LANGFILE_INCLUDE "translations\english.nsh"
+  !insertmacro LANGFILE_INCLUDE "translations\albanian.nsh"
+  !insertmacro LANGFILE_INCLUDE "translations\arabic.nsh"
   !insertmacro LANGFILE_INCLUDE "translations\basque.nsh"
+  !insertmacro LANGFILE_INCLUDE "translations\bulgarian.nsh"
   !insertmacro LANGFILE_INCLUDE "translations\catalan.nsh"
   !insertmacro LANGFILE_INCLUDE "translations\croatian.nsh"
@@ -246 +261 @@
   !insertmacro LANGFILE_INCLUDE "translations\japanese.nsh"
   !insertmacro LANGFILE_INCLUDE "translations\korean.nsh"
+  !insertmacro LANGFILE_INCLUDE "translations\malay.nsh"
   !insertmacro LANGFILE_INCLUDE "translations\norwegian.nsh"
   !insertmacro LANGFILE_INCLUDE "translations\polish.nsh"
   !insertmacro LANGFILE_INCLUDE "translations\portuguese.nsh"
+  !insertmacro LANGFILE_INCLUDE "translations\portuguesebrazil.nsh"
   !insertmacro LANGFILE_INCLUDE "translations\russian.nsh"
+  !insertmacro LANGFILE_INCLUDE "translations\serbian.nsh"
   !insertmacro LANGFILE_INCLUDE "translations\simpchinese.nsh"
   !insertmacro LANGFILE_INCLUDE "translations\slovak.nsh"
@@ -283 +301 @@
     ${ElseIf} $Reinstall_OverwriteButton_State == 1
 
+!ifndef DISABLE_CODECS
       Call Backup_Codecs
+!endif
 
       ${If} "$INSTDIR" == "$SMPlayer_Path"
@@ -308 +328 @@
   File /r "${SMPLAYER_BUILD_DIR}\imageformats\*.*"
 
+  ;Qt platforms (Qt 5+)
+  SetOutPath "$INSTDIR\platforms"
+  File /nonfatal /r "${SMPLAYER_BUILD_DIR}\platforms\*.*"
+
   ;SMPlayer key shortcuts
   SetOutPath "$INSTDIR\shortcuts"
   File /r "${SMPLAYER_BUILD_DIR}\shortcuts\*.*"
 
+!ifndef DISABLE_CODECS
   SetOutPath "$PLUGINSDIR"
   File 7za.exe
+!endif
 
   ;Initialize to 0 if don't exist (based on error flag)
@@ -363 +389 @@
 
     SetOutPath "$INSTDIR\mplayer"
-    File /r /x mplayer.exe /x mencoder.exe /x mplayer64.exe /x mencoder64.exe "${SMPLAYER_BUILD_DIR}\mplayer\*.*"
+    File /r /x mplayer.exe /x mencoder.exe /x mplayer64.exe /x mencoder64.exe /x *.exe.debug "${SMPLAYER_BUILD_DIR}\mplayer\*.*"
 !ifdef WIN64
     File /oname=mplayer.exe "${SMPLAYER_BUILD_DIR}\mplayer\mplayer64.exe"
@@ -374 +400 @@
   SectionEnd
 
+!ifndef DISABLE_CODECS
   Section /o $(Section_MPlayerCodecs) SecCodecs
-
-!ifdef WIN64
-    SectionIn RO
-!endif
 
     AddSize 22931
@@ -394 +417 @@
 
     DetailPrint $(Codecs_DL_Msg)
-!ifndef USE_NSISDL
+!ifdef USE_INETC
     inetc::get /CONNECTTIMEOUT 15000 /RESUME "" /BANNER $(Codecs_DL_Msg) /CAPTION $(Codecs_DL_Msg) \
     "http://www.mplayerhq.hu/MPlayer/releases/codecs/${CODEC_VERSION}.zip" \
@@ -432 +455 @@
 
   SectionEnd
+!endif
 
 SectionGroupEnd
@@ -487 +511 @@
   WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "DisplayIcon" "$INSTDIR\smplayer.exe"
   WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "DisplayVersion" "${SMPLAYER_VERSION}"
-  WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "HelpLink" "http://smplayer.sourceforge.net/forum"
+  WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "HelpLink" "http://forum.smplayer.info"
   WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "Publisher" "Ricardo Villalba"
   WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "UninstallString" "$INSTDIR\${SMPLAYER_UNINST_EXE}"
@@ -495 +519 @@
   WriteRegDWORD HKLM "${SMPLAYER_UNINST_KEY}" "NoRepair" "1"
 
+  ;Clean up empty directories
+  RMDir "$INSTDIR\platforms"
+!ifdef WIN64
+  RMDir "$INSTDIR\mplayer\codecs"
+!endif
+
 SectionEnd
 
@@ -506 +536 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenuShortcut} $(Section_StartMenu_Desc)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecMPlayer} $(Section_MPlayer_Desc)
+!ifndef DISABLE_CODECS
   !insertmacro MUI_DESCRIPTION_TEXT ${SecCodecs} $(Section_MPlayerCodecs_Desc)
+!endif
   !insertmacro MUI_DESCRIPTION_TEXT ${SecThemes} $(Section_IconThemes_Desc)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecTranslations} $(Section_Translations_Desc)
@@ -606 +638 @@
   RMDir /r "$INSTDIR\imageformats"
   RMDir /r "$INSTDIR\mplayer"
+  RMDir /r "$INSTDIR\platforms"
   RMDir /r "$INSTDIR\shortcuts"
   RMDir /r "$INSTDIR\themes"
   RMDir /r "$INSTDIR\translations"
   Delete "$INSTDIR\*.txt"
-  Delete "$INSTDIR\libgcc_s_dw2-1.dll"
+  Delete "$INSTDIR\icudt51.dll"
+  Delete "$INSTDIR\icuin51.dll"
+  Delete "$INSTDIR\icuuc51.dll"
+  Delete "$INSTDIR\libgcc_s_*.dll"
+  Delete "$INSTDIR\libstdc++-6.dll"
   Delete "$INSTDIR\libwinpthread-1.dll"
   Delete "$INSTDIR\mingwm10.dll"
@@ -720 +757 @@
   ${EndIf}
 
-  Call LoadPreviousSettings
-
   ;Setup language selection
   !insertmacro MUI_LANGDLL_DISPLAY
 
+  Call LoadPreviousSettings
+
   Call CheckPreviousVersion
 
@@ -734 +771 @@
 
   ${MementoSectionSave}
-
-/*
-  ${Unless} $Reinstall_Uninstall == 1
-    ExecShell "open" "http://smplayer.sourceforge.net/thank-you.php?version=${SMPLAYER_VERSION}"
-  ${EndIf}
-*/
 
 FunctionEnd
@@ -755 +786 @@
 
 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 */
 
 Function CheckPreviousVersion
@@ -776 +796 @@
   ${IfNot} ${Errors}
     StrCpy $Reinstall_Uninstall 1
+    !ifdef WIN64
+    ;Workaround for InstallDirRegKey on 64-bit
+    StrCpy $INSTDIR $SMPlayer_Path
+    !endif
+
+    ;Since we can't get input from a silent install to initialize the variables, prefer upgrading
+    ${If} ${Silent}
+      StrCpy $Reinstall_UninstallButton_State 0
+      StrCpy $Reinstall_OverwriteButton_State 1
+    ${EndIf}
   ${EndIf}
 
@@ -794 +824 @@
 FunctionEnd
 
+!ifndef DISABLE_CODECS
 Function Backup_Codecs
 
@@ -810 +841 @@
 
 FunctionEnd
+!endif
 
 Function LoadPreviousSettings
@@ -815 +847 @@
   ;MPlayer codecs section doesn't use Memento so we need to restore it manually
   ;32-bit only
-!ifdef WIN64
-    !insertmacro UnSelectSection ${SecCodecs}
-!else
+!ifndef DISABLE_CODECS
     ReadRegDWORD $R0 HKLM "${SMPLAYER_REG_KEY}" "Installed_Codecs"
     ${If} $R0 == 1
@@ -989 +1019 @@
 
   ;Make sure SMPlayer is installed from where the uninstaller is being executed.
-  IfFileExists $INSTDIR\smplayer.exe smplayer_installed
-    MessageBox MB_YESNO $(Uninstaller_NotInstalled) /SD IDNO IDYES smplayer_installed
-    Abort $(Uninstaller_Aborted)
-
-  smplayer_installed:
+  IfFileExists "$INSTDIR\smplayer.exe" +2
+    Abort $(Uninstaller_InvalidDirectory)
 
   SetDetailsPrint textonly