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

Timestamp:

Jan 24, 2017, 12:41:54 PM (8 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to version 17.1.0

Location:

smplayer/trunk

Files:

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

smplayer/trunk/setup/smplayer.nsi

@@ -1 +1 @@
 ;Installer script for win32/win64 SMPlayer
 ;Written by redxii (redxii@users.sourceforge.net)
-;Tested/Developed with Unicode NSIS 2.46.5/3.0rc1
+;Tested/Developed with Unicode NSIS 2.46.5/3.01
+
+; See http://nsis.sourceforge.net/Check_if_a_file_exists_at_compile_time for documentation
+!macro !defineifexist _VAR_NAME _FILE_NAME
+  !tempfile _TEMPFILE
+  !ifdef NSIS_WIN32_MAKENSIS
+    ; Windows - cmd.exe
+    !system 'if exist "${_FILE_NAME}" echo !define ${_VAR_NAME} > "${_TEMPFILE}"'
+  !else
+    ; Posix - sh
+    !system 'if [ -e "${_FILE_NAME}" ]; then echo "!define ${_VAR_NAME}" > "${_TEMPFILE}"; fi'
+  !endif
+  !include '${_TEMPFILE}'
+  !delfile '${_TEMPFILE}'
+  !undef _TEMPFILE
+!macroend
+!define !defineifexist "!insertmacro !defineifexist"
 
 !ifndef VER_MAJOR | VER_MINOR | VER_BUILD
@@ -52 +68 @@
   !define SMPLAYER_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\SMPlayer"
 
+  !define STATUS_DLL_NOT_FOUND "-1073741515"
+
+  ${!defineifexist} COMPILED_WITH_QT4 ${SMPLAYER_BUILD_DIR}\QtCore4.dll
+
   ; Not the same as Qt, check file properties of the webkit dll if unsure
 !ifndef QT_WEBKIT_VERSION
-  !define QT_WEBKIT_VERSION "5.6.1.0"
-!endif
-
-  !define STATUS_DLL_NOT_FOUND "-1073741515"
+  !ifdef COMPILED_WITH_QT4
+    ; Qt Webkit version in 4.8.7
+    !define QT_WEBKIT_VERSION "4.9.4.0"
+  !else
+    !define QT_WEBKIT_VERSION "5.6.1.0"
+  !endif
+!endif
 
 ;--------------------------------
@@ -66 +89 @@
   BrandingText "SMPlayer for Windows v${SMPLAYER_VERSION}"
 !ifdef WIN64
-  OutFile "output\smplayer-${SMPLAYER_VERSION}-x64.exe"
+  !ifdef COMPILED_WITH_QT4
+    OutFile "output\smplayer-${SMPLAYER_VERSION}-x64-Qt4.exe"
+  !else
+    OutFile "output\smplayer-${SMPLAYER_VERSION}-x64.exe"
+  !endif
 !else
-  OutFile "output\smplayer-${SMPLAYER_VERSION}-win32.exe"
+  !ifdef COMPILED_WITH_QT4
+    OutFile "output\smplayer-${SMPLAYER_VERSION}-win32-Qt4.exe"
+  !else
+    OutFile "output\smplayer-${SMPLAYER_VERSION}-win32.exe"
+  !endif
 !endif
 
@@ -375 +406 @@
 
   ;Qt platforms (Qt 5+)
+!ifndef COMPILED_WITH_QT4
   SetOutPath "$INSTDIR\platforms"
   File /nonfatal /r "${SMPLAYER_BUILD_DIR}\platforms\*.*"
+!endif
 
   ;SMPlayer key shortcuts
@@ -437 +470 @@
   File /oname=mpv.com "${SMPLAYER_BUILD_DIR}\mpv\mpv64.com"
 !else
-  File /r /x mpv64.exe /x mpv64.com "${SMPLAYER_BUILD_DIR}\mpv\*.*"
+  File /r /x mpv64.exe /x mpv64.com /x d3dcompiler_43.dll "${SMPLAYER_BUILD_DIR}\mpv\*.*"
 !endif
 
@@ -501 +534 @@
     CopyFiles /SILENT "$PLUGINSDIR\smtubebak\docs\smtube\*" "$INSTDIR\docs\smtube"
     CopyFiles /SILENT "$PLUGINSDIR\smtubebak\translations\*" "$INSTDIR\translations"
+!ifdef COMPILED_WITH_QT4
+    CopyFiles /SILENT "$PLUGINSDIR\smtubebak\QtWebKit4.dll" "$INSTDIR"
+!else
     CopyFiles /SILENT "$PLUGINSDIR\smtubebak\icuin*.dll" "$INSTDIR"
     CopyFiles /SILENT "$PLUGINSDIR\smtubebak\icuuc*.dll" "$INSTDIR"
@@ -516 +552 @@
     CopyFiles /SILENT "$PLUGINSDIR\smtubebak\Qt5PrintSupport.dll" "$INSTDIR"
     CopyFiles /SILENT "$PLUGINSDIR\smtubebak\Qt5MultimediaWidgets.dll" "$INSTDIR"
+!endif
   ${EndIf}
 
@@ -549 +586 @@
   ;Registry Uninstall information
 !ifdef WIN64
-  WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "DisplayName" "$(^Name) (x64)"
+  !ifdef COMPILED_WITH_QT4
+    WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "DisplayName" "$(^Name) (x64) (Qt4)"
+  !else
+    WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "DisplayName" "$(^Name) (x64)"
+  !endif
 !else
-  WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "DisplayName" "$(^Name)"
+  !ifdef COMPILED_WITH_QT4
+    WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "DisplayName" "$(^Name) (Qt4)"
+  !else
+    WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "DisplayName" "$(^Name)"
+  !endif
 !endif
   WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "DisplayIcon" "$INSTDIR\smplayer.exe"
@@ -720 +765 @@
   Delete "$INSTDIR\smtube.exe"
   Delete "$INSTDIR\dxlist.exe"
+  Delete "$INSTDIR\simple_web_server.exe"
   Delete "$INSTDIR\icudt*.dll"
   Delete "$INSTDIR\icuin*.dll"
@@ -773 +819 @@
 Function .onInit
 
+!ifdef COMPILED_WITH_QT4
+  MessageBox MB_OK|MB_ICONEXCLAMATION "This build is provided for legacy CPUs (those without SSE2 or later instruction set support). Please do not use if you do not know what you are doing."
+!endif
+
 !ifdef WIN64
   ${Unless} ${AtLeastWinVista}
@@ -961 +1011 @@
     CopyFiles /SILENT "$SMPlayer_Path\docs\smtube\*" "$PLUGINSDIR\smtubebak\docs\smtube"
     CopyFiles /SILENT "$SMPlayer_Path\translations\smtube*.qm" "$PLUGINSDIR\smtubebak\translations"
+!ifdef COMPILED_WITH_QT4
+    CopyFiles /SILENT "$SMPlayer_Path\QtWebKit4.dll" "$PLUGINSDIR\smtubebak"
+!else
     CopyFiles /SILENT "$SMPlayer_Path\icuin*.dll" "$PLUGINSDIR\smtubebak"
     CopyFiles /SILENT "$SMPlayer_Path\icuuc*.dll" "$PLUGINSDIR\smtubebak"
@@ -976 +1029 @@
     CopyFiles /SILENT "$SMPlayer_Path\Qt5PrintSupport.dll" "$PLUGINSDIR\smtubebak"
     CopyFiles /SILENT "$SMPlayer_Path\Qt5MultimediaWidgets.dll" "$PLUGINSDIR\smtubebak"
+!endif
     StrCpy $Restore_SMTube 1
     Return
   QtVerMismatch:
     DetailPrint $(SMTube_Incompatible_Msg1)
-    DetailPrint $(SMTube_Incompatible_Msg2)
-    Sleep 5000
+    ;DetailPrint $(SMTube_Incompatible_Msg2)
+    Sleep 15000
   NoBackup:
     StrCpy $Restore_SMTube 0
@@ -1145 +1199 @@
   ; Get version of Qt5Core.dll from the build sources (smplayer-build/smplayer-build64)
   ClearErrors
+!ifdef COMPILED_WITH_QT4
+  GetDLLVersionLocal ${SMPLAYER_BUILD_DIR}\QtCore4.dll $R0 $R1
+!else
   GetDLLVersionLocal ${SMPLAYER_BUILD_DIR}\Qt5Core.dll $R0 $R1
+!endif
   IntOp $R2 $R0 / 0x00010000
   IntOp $R3 $R0 & 0x0000FFFF