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

Timestamp:

Dec 3, 2012, 7:05:11 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to 0.8.2

Location:

smplayer/trunk

Files:

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

smplayer/trunk/setup/smplayer.nsi

@@ -1 @@
-; Installer script for win32/win64 SMPlayer
-; Written by redxii ([email protected])
-; Tested/Developed with Unicode NSIS 2.46.5
+;Installer script for win32/win64 SMPlayer
+;Written by redxii ([email protected])
+;Tested/Developed with Unicode NSIS 2.46.5
 
 !ifndef VER_MAJOR | VER_MINOR | VER_BUILD
@@ -62 +62 @@
   BrandingText "SMPlayer for Windows v${SMPLAYER_VERSION}"
 !ifdef WIN64
-  OutFile "output\smplayer-${SMPLAYER_VERSION}-x86_64.exe"
+  OutFile "output\smplayer-${SMPLAYER_VERSION}-x64.exe"
 !else
-  OutFile "output\smplayer-${SMPLAYER_VERSION}-x86.exe"
+  OutFile "output\smplayer-${SMPLAYER_VERSION}-.exe"
 !endif
 
@@ -121 +121 @@
   !define MUI_UNICON "smplayer-orange-uninstaller.ico"
 
-  ; Misc
+  ;Misc
   !define MUI_WELCOMEFINISHPAGE_BITMAP "smplayer-orange-wizard.bmp"
   !define MUI_UNWELCOMEFINISHPAGE_BITMAP "smplayer-orange-wizard-un.bmp"
   !define MUI_ABORTWARNING
 
-  ; License page
+  ;Welcome page
+  !define MUI_WELCOMEPAGE_TITLE $(WelcomePage_Title)
+  !define MUI_WELCOMEPAGE_TEXT $(WelcomePage_Text)
+
+  ;License page
   !define MUI_LICENSEPAGE_RADIOBUTTONS
 
-  ; Components page
+  ;Components page
   !define MUI_COMPONENTSPAGE_SMALLDESC
 
-  ; Finish page
+  ;Finish page
   !define MUI_FINISHPAGE_LINK "http://smplayer.sourceforge.net"
   !define MUI_FINISHPAGE_LINK_LOCATION "http://smplayer.sourceforge.net"
@@ -173 +177 @@
 
   ;Install pages
+
   !insertmacro MUI_PAGE_WELCOME
-  !insertmacro MUI_PAGE_LICENSE "${SMPLAYER_BUILD_DIR}\Copying.txt"
+
+  #License
+  !insertmacro MUI_PAGE_LICENSE "license.txt"
 
   #Upgrade/Reinstall
@@ -198 +205 @@
   !insertmacro MUI_UNPAGE_CONFIRM
   !insertmacro MUI_UNPAGE_INSTFILES
-  !define MUI_PAGE_CUSTOMFUNCTION_PRE un.FinishPagePre
   !insertmacro MUI_UNPAGE_FINISH
 
@@ -229 +235 @@
   !insertmacro MUI_LANGUAGE "TradChinese"
 
-; Custom translations for setup
+;Custom translations for setup
 
   !insertmacro LANGFILE_INCLUDE "translations\english.nsh"
@@ -413 +419 @@
     done:
 
-        SectionEnd
+SectionEnd
 
 SectionGroupEnd
@@ -448 +454 @@
   ;Allows user to use 'start smplayer.exe'
   WriteRegStr HKLM "${SMPLAYER_APP_PATHS_KEY}" "" "$INSTDIR\smplayer.exe"
+
 
   ;Default Programs Registration (Vista & later)
@@ -610 +617 @@
 
   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
+FindProcDLL::FindProc "smplayer.exe"
+IntCmp $R0 1 0 +3
+MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(SMPlayer_Is_Running) /SD IDCANCEL IDRETRY retry_runcheck
+Abort
 
 FunctionEnd
@@ -628 +635 @@
     MessageBox MB_YESNO|MB_ICONSTOP $(OS_Not_Supported) /SD IDNO IDYES installonoldwindows
     Abort
-        installonoldwindows:
+installonoldwindows:
   ${EndIf}
 
@@ -644 +651 @@
     MessageBox MB_OK|MB_ICONSTOP $(Existing_32bitInst)
     Abort
-  
+
   SetRegView 64
 !else
@@ -655 +662 @@
       MessageBox MB_OK|MB_ICONSTOP $(Existing_64bitInst)
       Abort
-    
+
     SetRegView 32
   ${EndIf}
@@ -669 +676 @@
 
   ;Check if SMPlayer is running
-  Call RunCheck
+  ;Allow skipping check using /NORUNCHECK
+  ${GetParameters} $R0
+  ${GetOptions} $R0 "/NORUNCHECK" $R1
+  IfErrors 0 +2
+    Call RunCheck
 
   ;Check for admin on < Vista
@@ -959 +970 @@
 
   ;Check if SMPlayer is running
-  Call un.RunCheck
+  ;Allow skipping check using /NORUNCHECK
+  ${un.GetParameters} $R0
+  ${un.GetOptions} $R0 "/NORUNCHECK" $R1
+  IfErrors 0 +2
+    Call un.RunCheck
 
   ;Gets start menu folder name
@@ -979 +994 @@
 
 FunctionEnd
-
-Function un.FinishPagePre
-
-  ${un.GetParameters} $R0
-
-  ${un.GetOptionsS} $R0 "/X" $R1
-  ${Unless} ${Errors}
-    Abort
-  ${EndUnless}
-
-FunctionEnd