Changeset 128 for smplayer/trunk/setup

Timestamp:

Mar 29, 2012, 4:53:15 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: trunk update to latest svn

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• setup/scripts/make_pkgs.cmd (modified) (4 diffs)
• setup/smplayer.win32.nsi (modified) (9 diffs)

smplayer/trunk/setup/scripts/make_pkgs.cmd

@@ -30 +30 @@
 set OUTPUT_DIR=%TOP_LEVEL_DIR%\output
 set PORTABLE_EXE_DIR=%TOP_LEVEL_DIR%\portable
-set QT_DIR=C:\Qt\%QTVER%
+set QT_DIR=E:\Buildsys\Qt\%QTVER%
 
 :reask
@@ -44 +44 @@
 
 :portable
-echo.
 echo --- Creating SMPlayer Portable Package ---
 echo.
@@ -124 +123 @@
 
 :nomplayer
-echo.
 echo --- Creating SMPlayer w/o MPlayer Package ---
 echo.
@@ -184 +182 @@
 echo ---  Creating Qt DLL Package  ---
 echo.
-7za a -t7z %OUTPUT_DIR%\qt_%QTVER%_dlls.7z %QT_DIR%\%QTVER%\bin\libgcc_s_dw2-1.dll %QT_DIR%\%QTVER%\bin\mingwm10.dll %QT_DIR%\%QTVER%\bin\QtCore4.dll %QT_DIR%\%QTVER%\bin\QtGui4.dll %QT_DIR%\%QTVER%\bin\QtNetwork4.dll %QT_DIR%\%QTVER%\bin\QtXml4.dll -mx9
+
+mkdir imageformats
+copy %QT_DIR%\%QTVER%\plugins\imageformats\qjpeg4.dll imageformats
+7za a -t7z %OUTPUT_DIR%\qt_%QTVER%_dlls.7z %QT_DIR%\%QTVER%\bin\libgcc_s_dw2-1.dll %QT_DIR%\%QTVER%\bin\mingwm10.dll %QT_DIR%\%QTVER%\bin\QtCore4.dll %QT_DIR%\%QTVER%\bin\QtGui4.dll %QT_DIR%\%QTVER%\bin\QtNetwork4.dll %QT_DIR%\%QTVER%\bin\QtXml4.dll imageformats -mx9
+rd /s /q imageformats
 
 goto end

smplayer/trunk/setup/smplayer.win32.nsi

@@ -30 +30 @@
 !endif
 
+  !define SMPLAYER_REG_KEY "Software\SMPlayer"
   !define SMPLAYER_APP_PATHS_KEY "Software\Microsoft\Windows\CurrentVersion\App Paths\smplayer.exe"
-  !define SMPLAYER_REG_KEY "Software\SMPlayer"
+  !define SMPLAYER_DEF_PROGS_KEY "Software\Clients\Media\SMPlayer"
 
   !define SMPLAYER_UNINST_EXE "uninst.exe"
@@ -327 +328 @@
 SectionGroup $(ShortcutGroupTitle)
 
-  ${MementoSection} $(Section_DesktopShortcut) SecDesktopShortcut
+  ${MementoUnselectedSection} $(Section_DesktopShortcut) SecDesktopShortcut
 
     SetOutPath "$INSTDIR"
@@ -583 +584 @@
 
 !macro WriteRegStrSupportedTypes EXT
-  WriteRegStr HKLM  "${SMPLAYER_REG_KEY}\Capabilities\FileAssociations" ${EXT} "MPlayerFileVideo"
+  WriteRegStr HKLM  "${SMPLAYER_DEF_PROGS_KEY}\Capabilities\FileAssociations" ${EXT} "MPlayerFileVideo"
 !macroend
 
@@ -616 +617 @@
   Delete "$INSTDIR\mingwm10.dll"
   Delete "$INSTDIR\zlib1.dll"
-  Delete "$INSTDIR\Q*.dll"
+  Delete "$INSTDIR\Qt*.dll"
   Delete "$INSTDIR\smplayer.exe"
   Delete "$INSTDIR\smtube.exe"
@@ -628 +629 @@
   DeleteRegKey HKLM "${SMPLAYER_REG_KEY}"
   DeleteRegKey HKLM "${SMPLAYER_APP_PATHS_KEY}"
+  DeleteRegKey HKLM "${SMPLAYER_DEF_PROGS_KEY}"
   DeleteRegKey HKLM "${SMPLAYER_UNINST_KEY}"
   DeleteRegKey HKCR "MPlayerFileVideo"
@@ -637 +639 @@
 ;--------------------------------
 ;Shared functions
-
-!macro CheckUserRightsMacro UN
-Function ${UN}CheckUserRights
-
-  ClearErrors
-  UserInfo::GetName
-  ${If} ${Errors}
-    StrCpy $Is_Admin 1
-    Return
-  ${EndIf}
-
-  Pop $UserName
-  UserInfo::GetAccountType
-  Pop $R0
-  ${Switch} $R0
-    ${Case} "Admin"
-    ${Case} "Power"
-      StrCpy $Is_Admin 1
-      ${Break}
-    ${Default}
-      StrCpy $Is_Admin 0
-      ${Break}
-  ${EndSwitch}
-
-FunctionEnd
-!macroend
-!insertmacro CheckUserRightsMacro ""
-!insertmacro CheckUserRightsMacro "un."
 
 !macro RunCheckMacro UN
@@ -700 +674 @@
   Call RunCheck
 
-  ;Check for admin on older OSes
-  Call CheckUserRights
-
-  ${If} $Is_Admin == 0
+  ;Check for admin on < Vista
+  UserInfo::GetAccountType
+  Pop $R0
+  ${If} $R0 != "admin"
     MessageBox MB_OK|MB_ICONSTOP $(Installer_No_Admin)
     Abort
@@ -921 +895 @@
 
   ;Modify the list of extensions added in the MacroAllExtensions macro
-  WriteRegStr HKLM "${SMPLAYER_REG_KEY}\Capabilities" "ApplicationDescription" $(Application_Description)
-  WriteRegStr HKLM "${SMPLAYER_REG_KEY}\Capabilities" "ApplicationName" "SMPlayer"
-  WriteRegStr HKLM "Software\RegisteredApplications" "SMPlayer" "${SMPLAYER_REG_KEY}\Capabilities"
+  WriteRegStr HKLM "${SMPLAYER_DEF_PROGS_KEY}" "" "SMPlayer"
+  WriteRegStr HKLM "${SMPLAYER_DEF_PROGS_KEY}\Capabilities" "ApplicationDescription" $(Application_Description)
+  WriteRegStr HKLM "${SMPLAYER_DEF_PROGS_KEY}\Capabilities" "ApplicationName" "SMPlayer"
+  WriteRegStr HKLM "Software\RegisteredApplications" "SMPlayer" "${SMPLAYER_DEF_PROGS_KEY}\Capabilities"
   !insertmacro MacroAllExtensions WriteRegStrSupportedTypes
 
@@ -968 +943 @@
 Function un.onInit
 
-  ;Check for admin (mimic old Inno Setup behavior)
-  Call un.CheckUserRights
-
-  ${If} $Is_Admin == 0
+  ;Check for admin on < Vista
+  UserInfo::GetAccountType
+  Pop $R0
+  ${If} $R0 != "admin"
     MessageBox MB_OK|MB_ICONSTOP $(Uninstaller_No_Admin)
     Abort