StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr2682'

Browse Source
This commit is contained in:
tux3 2015-12-17 19:07:49 +01:00
commit 3b82e73c85
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
windows/qtox.nsi
View File

@ -9,7 +9,6 @@
!define COPYRIGHT "The Tox Project" !define COPYRIGHT "The Tox Project"
!define INSTALLER_NAME "setup-qtox.exe" !define INSTALLER_NAME "setup-qtox.exe"
!define MAIN_APP_EXE "bin\qtox.exe" !define MAIN_APP_EXE "bin\qtox.exe"
!define INSTALL_TYPE "SetShellVarContext current"
!define REG_ROOT "HKLM" !define REG_ROOT "HKLM"
!define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\qtox.exe" !define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\qtox.exe"
!define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" !define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}"
@ -225,11 +224,17 @@ FunctionEnd
!define MUI_FINISHPAGE_SHOWREADME_TEXT "Create Desktop Shortcut" !define MUI_FINISHPAGE_SHOWREADME_TEXT "Create Desktop Shortcut"
!define MUI_FINISHPAGE_SHOWREADME_FUNCTION finishpageaction !define MUI_FINISHPAGE_SHOWREADME_FUNCTION finishpageaction
!define MUI_FINISHPAGE_RUN "$INSTDIR\${MAIN_APP_EXE}" !define MUI_FINISHPAGE_RUN_FUNCTION Launch_qTox_without_Admin
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_LINK "Find qTox on GitHub" !define MUI_FINISHPAGE_LINK "Find qTox on GitHub"
!define MUI_FINISHPAGE_LINK_LOCATION "https://github.com/tux3/qTox" !define MUI_FINISHPAGE_LINK_LOCATION "https://github.com/tux3/qTox"
!insertmacro MUI_PAGE_FINISH !insertmacro MUI_PAGE_FINISH
Function Launch_qTox_without_Admin
SetOutPath $INSTDIR
ShellExecAsUser::ShellExecAsUser "" "$INSTDIR\${MAIN_APP_EXE}" ""
FunctionEnd
!define MUI_UNABORTWARNING !define MUI_UNABORTWARNING
!define MUI_UNFINISHPAGE_NOAUTOCLOSE !define MUI_UNFINISHPAGE_NOAUTOCLOSE
!insertmacro MUI_UNPAGE_WELCOME !insertmacro MUI_UNPAGE_WELCOME
@ -243,25 +248,26 @@ FunctionEnd
#INSTALL #INSTALL
################# #################
Section "Install" Section "Install"
SetShellVarContext all
# Install files # Install files
${SetOutPath} "$INSTDIR" ${SetOutPath} "$INSTDIR"
${WriteUninstaller} "uninstall.exe" ${WriteUninstaller} "uninstall.exe"
${CreateDirectory} "bin" ${CreateDirectory} "$INSTDIR\bin"
${SetOutPath} "$INSTDIR\bin" ${SetOutPath} "$INSTDIR\bin"
${File} "qtox\*.*" ${File} "qtox\*.*"
${CreateDirectory} "imageformats" ${CreateDirectory} "$INSTDIR\bin\imageformats"
${SetOutPath} "$INSTDIR\bin\imageformats" ${SetOutPath} "$INSTDIR\bin\imageformats"
File /nonfatal "qtox\imageformats\*.*" File /nonfatal "qtox\imageformats\*.*"
${SetOutPath} "$INSTDIR\bin" ${SetOutPath} "$INSTDIR\bin"
${CreateDirectory} "platforms" ${CreateDirectory} "$INSTDIR\bin\platforms"
${SetOutPath} "$INSTDIR\bin\platforms" ${SetOutPath} "$INSTDIR\bin\platforms"
File /nonfatal "qtox\platforms\*.*" File /nonfatal "qtox\platforms\*.*"
${SetOutPath} "$INSTDIR\bin" ${SetOutPath} "$INSTDIR\bin"
${CreateDirectory} "sqldrivers" ${CreateDirectory} "$INSTDIR\bin\sqldrivers"
${SetOutPath} "$INSTDIR\bin\sqldrivers" ${SetOutPath} "$INSTDIR\bin\sqldrivers"
File /nonfatal "qtox\sqldrivers\*.*" File /nonfatal "qtox\sqldrivers\*.*"
${SetOutPath} "$INSTDIR\bin" ${SetOutPath} "$INSTDIR\bin"
@ -298,6 +304,7 @@ SectionEnd
#UNINSTALL #UNINSTALL
################ ################
Section Uninstall Section Uninstall
SetShellVarContext all
;If there's no uninstall log, we'll try anyway to clean what we can ;If there's no uninstall log, we'll try anyway to clean what we can
IfFileExists "$INSTDIR\${UninstLog}" +3 IfFileExists "$INSTDIR\${UninstLog}" +3
Goto noLog Goto noLog

19
windows/qtox64.nsi
View File

@ -9,7 +9,6 @@
!define COPYRIGHT "The Tox Project" !define COPYRIGHT "The Tox Project"
!define INSTALLER_NAME "setup-qtox.exe" !define INSTALLER_NAME "setup-qtox.exe"
!define MAIN_APP_EXE "bin\qtox.exe" !define MAIN_APP_EXE "bin\qtox.exe"
!define INSTALL_TYPE "SetShellVarContext current"
!define REG_ROOT "HKLM" !define REG_ROOT "HKLM"
!define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\qtox.exe" !define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\qtox.exe"
!define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" !define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}"
@ -225,11 +224,17 @@ FunctionEnd
!define MUI_FINISHPAGE_SHOWREADME_TEXT "Create Desktop Shortcut" !define MUI_FINISHPAGE_SHOWREADME_TEXT "Create Desktop Shortcut"
!define MUI_FINISHPAGE_SHOWREADME_FUNCTION finishpageaction !define MUI_FINISHPAGE_SHOWREADME_FUNCTION finishpageaction
!define MUI_FINISHPAGE_RUN "$INSTDIR\${MAIN_APP_EXE}" !define MUI_FINISHPAGE_RUN_FUNCTION Launch_qTox_without_Admin
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_LINK "Find qTox on GitHub" !define MUI_FINISHPAGE_LINK "Find qTox on GitHub"
!define MUI_FINISHPAGE_LINK_LOCATION "https://github.com/tux3/qTox" !define MUI_FINISHPAGE_LINK_LOCATION "https://github.com/tux3/qTox"
!insertmacro MUI_PAGE_FINISH !insertmacro MUI_PAGE_FINISH
Function Launch_qTox_without_Admin
SetOutPath $INSTDIR
ShellExecAsUser::ShellExecAsUser "" "$INSTDIR\${MAIN_APP_EXE}" ""
FunctionEnd
!define MUI_UNABORTWARNING !define MUI_UNABORTWARNING
!define MUI_UNFINISHPAGE_NOAUTOCLOSE !define MUI_UNFINISHPAGE_NOAUTOCLOSE
!insertmacro MUI_UNPAGE_WELCOME !insertmacro MUI_UNPAGE_WELCOME
@ -243,25 +248,26 @@ FunctionEnd
#INSTALL #INSTALL
################# #################
Section "Install" Section "Install"
SetShellVarContext all
# Install files # Install files
${SetOutPath} "$INSTDIR" ${SetOutPath} "$INSTDIR"
${WriteUninstaller} "uninstall.exe" ${WriteUninstaller} "uninstall.exe"
${CreateDirectory} "bin" ${CreateDirectory} "$INSTDIR\bin"
${SetOutPath} "$INSTDIR\bin" ${SetOutPath} "$INSTDIR\bin"
${File} "qtox\*.*" ${File} "qtox\*.*"
${CreateDirectory} "imageformats" ${CreateDirectory} "$INSTDIR\bin\imageformats"
${SetOutPath} "$INSTDIR\bin\imageformats" ${SetOutPath} "$INSTDIR\bin\imageformats"
File /nonfatal "qtox\imageformats\*.*" File /nonfatal "qtox\imageformats\*.*"
${SetOutPath} "$INSTDIR\bin" ${SetOutPath} "$INSTDIR\bin"
${CreateDirectory} "platforms" ${CreateDirectory} "$INSTDIR\bin\platforms"
${SetOutPath} "$INSTDIR\bin\platforms" ${SetOutPath} "$INSTDIR\bin\platforms"
File /nonfatal "qtox\platforms\*.*" File /nonfatal "qtox\platforms\*.*"
${SetOutPath} "$INSTDIR\bin" ${SetOutPath} "$INSTDIR\bin"
${CreateDirectory} "sqldrivers" ${CreateDirectory} "$INSTDIR\bin\sqldrivers"
${SetOutPath} "$INSTDIR\bin\sqldrivers" ${SetOutPath} "$INSTDIR\bin\sqldrivers"
File /nonfatal "qtox\sqldrivers\*.*" File /nonfatal "qtox\sqldrivers\*.*"
${SetOutPath} "$INSTDIR\bin" ${SetOutPath} "$INSTDIR\bin"
@ -298,6 +304,7 @@ SectionEnd
#UNINSTALL #UNINSTALL
################ ################
Section Uninstall Section Uninstall
SetShellVarContext all
;If there's no uninstall log, we'll try anyway to clean what we can ;If there's no uninstall log, we'll try anyway to clean what we can
IfFileExists "$INSTDIR\${UninstLog}" +3 IfFileExists "$INSTDIR\${UninstLog}" +3
Goto noLog Goto noLog