Changeset 179 for smplayer/vendor/current/setup/smplayer.nsi

Timestamp:

Aug 31, 2016, 5:19:25 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update vendor to version 16.8.0

File:

• smplayer/vendor/current/setup/smplayer.nsi (modified) (16 diffs)

smplayer/vendor/current/setup/smplayer.nsi

@@ -1 @@
-;Installer script for win32/win64 SMPlayer
+;Installer script for win32/win64 SMPlayer
 ;Written by redxii ([email protected])
-;Tested/Developed with Unicode NSIS 2.46.5
+;Tested/Developed with Unicode NSIS 2.46.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
 
@@ -43 +52 @@
   !define SMPLAYER_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\SMPlayer"
 
+
+
+
+
+
+
+
 ;--------------------------------
 ;General
@@ -50 +66 @@
   BrandingText "SMPlayer for Windows v${SMPLAYER_VERSION}"
 !ifdef WIN64
-  !ifdef QT5
-  OutFile "output\Qt5\smplayer-${SMPLAYER_VERSION}-x64-qt5.exe"
-  !else
   OutFile "output\smplayer-${SMPLAYER_VERSION}-x64.exe"
-  !endif
 !else
-  !ifdef QT5
-  OutFile "output\Qt5\smplayer-${SMPLAYER_VERSION}-win32-qt5.exe"
-  !else
   OutFile "output\smplayer-${SMPLAYER_VERSION}-win32.exe"
-  !endif
 !endif
 
@@ -116 +124 @@
   Var SMPlayer_UnStrPath
   Var SMPlayer_StartMenuFolder
+
+
+
+
+
+
 
 ;--------------------------------
@@ -305 +319 @@
 
   !insertmacro MUI_RESERVEFILE_LANGDLL
-  ReserveFile "${NSISDIR}\Plugins\UserInfo.dll"
+!if ! ${NSIS_PACKEDVERSION} > 0x2999999
+  ReserveFile /nonfatal "${NSISDIR}\Plugins\UserInfo.dll"
+!else
+  ReserveFile /nonfatal "${NSISDIR}\Plugins\x86-unicode\UserInfo.dll"
+!endif
 
 ;--------------------------------
@@ -350 +368 @@
   ;Qt imageformats
   SetOutPath "$INSTDIR\imageformats"
-  File /r "${SMPLAYER_BUILD_DIR}\imageformats\*.*"
+  File /r "${SMPLAYER_BUILD_DIR}\imageformats\*.*"
 
   ;Open fonts
@@ -357 +375 @@
 
   ;Qt platforms (Qt 5+)
-!ifdef QT5
   SetOutPath "$INSTDIR\platforms"
-  File /r "${SMPLAYER_BUILD_DIR}\platforms\*.*"
-!endif
+  File /nonfatal /r "${SMPLAYER_BUILD_DIR}\platforms\*.*"
 
   ;SMPlayer key shortcuts
@@ -427 +443 @@
     CopyFiles /SILENT "$PLUGINSDIR\youtube-dl.exe" "$INSTDIR\mpv"
 
-    DetailPrint $(YTDL_Update_Check)
+    DetailPrint $(YTDL_Update_Check)
     NsExec::ExecToLog '"$INSTDIR\mpv\youtube-dl.exe" -U'
 
-    Goto skip_ytdl
+    Goto _ytdl
 
   YTDL:
-  NSISdl::download /TIMEOUT=30000 \
-  "http://yt-dl.org/latest/youtube-dl.exe" \
-  "$INSTDIR\mpv\youtube-dl.exe" /END
+  INetC::get /CONNECTTIMEOUT 30000 /POPUP "" "http://yt-dl.org/latest/youtube-dl.exe" "$INSTDIR\mpv\youtube-dl.exe" /END
   Pop $R0
-  StrCmp $R0 "success" +3 0
+  StrCmp $R0 "" +3 0
     DetailPrint $(YTDL_DL_Failed)
-    MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(YTDL_DL_Retry) /SD IDCANCEL IDRETRY YTDL
+    MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(YTDL_DL_Retry) /SD IDCANCEL IDRETRY YTDL IDCANCEL skip_ytdl
+
+  check_ytdl:
+    NsExec::Exec '"$INSTDIR\mpv\youtube-dl.exe" --version'
+    Pop $YTDL_Exit_Code
+
+    ${If} $YTDL_Exit_Code != "0"
+      DetailPrint $(YTDL_Error_Msg1)
+        ${If} $YTDL_Exit_Code == "${STATUS_DLL_NOT_FOUND}"
+          DetailPrint $(YTDL_Error_Msg2)
+        ${EndIf}
+
+      Sleep 5000
+    ${EndIf}
 
   skip_ytdl:
@@ -474 +501 @@
     CopyFiles /SILENT "$PLUGINSDIR\smtubebak\docs\smtube\*" "$INSTDIR\docs\smtube"
     CopyFiles /SILENT "$PLUGINSDIR\smtubebak\translations\*" "$INSTDIR\translations"
-!ifdef QT5
+    CopyFiles /SILENT "$PLUGINSDIR\smtubebak\icuin*.dll" "$INSTDIR"
+    CopyFiles /SILENT "$PLUGINSDIR\smtubebak\icuuc*.dll" "$INSTDIR"
+    CopyFiles /SILENT "$PLUGINSDIR\smtubebak\icudt*.dll" "$INSTDIR"
     CopyFiles /SILENT "$PLUGINSDIR\smtubebak\Qt5WebKit.dll" "$INSTDIR"
     CopyFiles /SILENT "$PLUGINSDIR\smtubebak\Qt5Sql.dll" "$INSTDIR"
@@ -487 +516 @@
     CopyFiles /SILENT "$PLUGINSDIR\smtubebak\Qt5PrintSupport.dll" "$INSTDIR"
     CopyFiles /SILENT "$PLUGINSDIR\smtubebak\Qt5MultimediaWidgets.dll" "$INSTDIR"
-!else
-    CopyFiles /SILENT "$PLUGINSDIR\smtubebak\QtWebKit4.dll" "$INSTDIR"
-!endif
   ${EndIf}
 
@@ -554 +580 @@
   Sleep 2500
 
-  ;SetAutoClose false
+!ifdef VER_REVISION
+  SetAutoClose false
+!endif
 
 SectionEnd
@@ -692 +720 @@
   Delete "$INSTDIR\smtube.exe"
   Delete "$INSTDIR\dxlist.exe"
-  Delete "$INSTDIR\icudt5*.dll"
-  Delete "$INSTDIR\icuin5*.dll"
-  Delete "$INSTDIR\icuuc5*.dll"
+  Delete "$INSTDIR\icudt*.dll"
+  Delete "$INSTDIR\icuin*.dll"
+  Delete "$INSTDIR\icuuc*.dll"
   Delete "$INSTDIR\libgcc_s_*.dll"
   Delete "$INSTDIR\libstdc++-6.dll"
@@ -747 +775 @@
 !ifdef WIN64
   ${Unless} ${AtLeastWinVista}
+
 !else
   ${Unless} ${AtLeastWinXP}
-!endif
     MessageBox MB_YESNO|MB_ICONSTOP $(OS_Not_Supported) /SD IDNO IDYES installonoldwindows
+
     Abort
   installonoldwindows:
@@ -867 +896 @@
       StrCpy $Reinstall_OverwriteButton_State 1
     ${EndIf}
+
+
   ${EndIf}
 
@@ -923 +954 @@
 
   IfFileExists "$SMPlayer_Path\smtube.exe" 0 NoBackup
-!ifdef QT5
-    IfFileExists "$SMPlayer_Path\Qt5WebKit.dll" 0 NoBackup
-!else
-    IfFileExists "$SMPlayer_Path\QtWebKit4.dll" 0 NoBackup
-!endif
-      DetailPrint $(Info_SMTube_Backup)
-      CreateDirectory "$PLUGINSDIR\smtubebak\translations"
-      CreateDirectory "$PLUGINSDIR\smtubebak\docs\smtube"
-      CopyFiles /SILENT "$SMPlayer_Path\smtube.exe" "$PLUGINSDIR\smtubebak"
-      CopyFiles /SILENT "$SMPlayer_Path\docs\smtube\*" "$PLUGINSDIR\smtubebak\docs\smtube"
-      CopyFiles /SILENT "$SMPlayer_Path\translations\smtube*.qm" "$PLUGINSDIR\smtubebak\translations"
-!ifdef QT5
-      CopyFiles /SILENT "$SMPlayer_Path\Qt5WebKit.dll" "$PLUGINSDIR\smtubebak"
-      CopyFiles /SILENT "$SMPlayer_Path\Qt5Sql.dll" "$PLUGINSDIR\smtubebak"
-      CopyFiles /SILENT "$SMPlayer_Path\Qt5Qml.dll" "$PLUGINSDIR\smtubebak"
-      CopyFiles /SILENT "$SMPlayer_Path\Qt5Quick.dll" "$PLUGINSDIR\smtubebak"
-      CopyFiles /SILENT "$SMPlayer_Path\Qt5Positioning.dll" "$PLUGINSDIR\smtubebak"
-      CopyFiles /SILENT "$SMPlayer_Path\Qt5Multimedia.dll" "$PLUGINSDIR\smtubebak"
-      CopyFiles /SILENT "$SMPlayer_Path\Qt5Sensors.dll" "$PLUGINSDIR\smtubebak"
-      CopyFiles /SILENT "$SMPlayer_Path\Qt5WebChannel.dll" "$PLUGINSDIR\smtubebak"
-      CopyFiles /SILENT "$SMPlayer_Path\Qt5WebKitWidgets.dll" "$PLUGINSDIR\smtubebak"
-      CopyFiles /SILENT "$SMPlayer_Path\Qt5OpenGL.dll" "$PLUGINSDIR\smtubebak"
-      CopyFiles /SILENT "$SMPlayer_Path\Qt5PrintSupport.dll" "$PLUGINSDIR\smtubebak"
-      CopyFiles /SILENT "$SMPlayer_Path\Qt5MultimediaWidgets.dll" "$PLUGINSDIR\smtubebak"
-!else
-      CopyFiles /SILENT "$SMPlayer_Path\QtWebKit4.dll" "$PLUGINSDIR\smtubebak"
-!endif
-
+    StrCmp "${QT_WEBKIT_VERSION}" "$Qt_WebKit_Installed_Version" 0 QtVerMismatch
+    DetailPrint $(Info_SMTube_Backup)
+    CreateDirectory "$PLUGINSDIR\smtubebak\translations"
+    CreateDirectory "$PLUGINSDIR\smtubebak\docs\smtube"
+    CopyFiles /SILENT "$SMPlayer_Path\smtube.exe" "$PLUGINSDIR\smtubebak"
+    CopyFiles /SILENT "$SMPlayer_Path\docs\smtube\*" "$PLUGINSDIR\smtubebak\docs\smtube"
+    CopyFiles /SILENT "$SMPlayer_Path\translations\smtube*.qm" "$PLUGINSDIR\smtubebak\translations"
+    CopyFiles /SILENT "$SMPlayer_Path\icuin*.dll" "$PLUGINSDIR\smtubebak"
+    CopyFiles /SILENT "$SMPlayer_Path\icuuc*.dll" "$PLUGINSDIR\smtubebak"
+    CopyFiles /SILENT "$SMPlayer_Path\icudt*.dll" "$PLUGINSDIR\smtubebak"
+    CopyFiles /SILENT "$SMPlayer_Path\Qt5WebKit.dll" "$PLUGINSDIR\smtubebak"
+    CopyFiles /SILENT "$SMPlayer_Path\Qt5Sql.dll" "$PLUGINSDIR\smtubebak"
+    CopyFiles /SILENT "$SMPlayer_Path\Qt5Qml.dll" "$PLUGINSDIR\smtubebak"
+    CopyFiles /SILENT "$SMPlayer_Path\Qt5Quick.dll" "$PLUGINSDIR\smtubebak"
+    CopyFiles /SILENT "$SMPlayer_Path\Qt5Positioning.dll" "$PLUGINSDIR\smtubebak"
+    CopyFiles /SILENT "$SMPlayer_Path\Qt5Multimedia.dll" "$PLUGINSDIR\smtubebak"
+    CopyFiles /SILENT "$SMPlayer_Path\Qt5Sensors.dll" "$PLUGINSDIR\smtubebak"
+    CopyFiles /SILENT "$SMPlayer_Path\Qt5WebChannel.dll" "$PLUGINSDIR\smtubebak"
+    CopyFiles /SILENT "$SMPlayer_Path\Qt5WebKitWidgets.dll" "$PLUGINSDIR\smtubebak"
+    CopyFiles /SILENT "$SMPlayer_Path\Qt5OpenGL.dll" "$PLUGINSDIR\smtubebak"
+    CopyFiles /SILENT "$SMPlayer_Path\Qt5PrintSupport.dll" "$PLUGINSDIR\smtubebak"
+    CopyFiles /SILENT "$SMPlayer_Path\Qt5MultimediaWidgets.dll" "$PLUGINSDIR\smtubebak"
     StrCpy $Restore_SMTube 1
     Return
+
+
+
+
   NoBackup:
     StrCpy $Restore_SMTube 0
@@ -1112 +1141 @@
 FunctionEnd
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 Function RegisterDefaultPrograms