Fix portable nsis script.

This commit is contained in:
Andreas 2013-10-09 18:19:35 +02:00
parent 526dd25c01
commit a8e8898111
2 changed files with 14 additions and 13 deletions

View File

@ -1,14 +1,15 @@
;!define PRODUCT_NAME "Clementine" ;!define PRODUCT_NAME "Clementine"
!define PRODUCT_NAME "Clementine Portable" !define PRODUCT_NAME "Clementine-Portable"
!define PRODUCT_PUBLISHER "Clementine" !define PRODUCT_PUBLISHER "Clementine"
!define PRODUCT_VERSION_MAJOR !define PRODUCT_VERSION_MAJOR 1
!define PRODUCT_VERSION_MINOR !define PRODUCT_VERSION_MINOR 2
!define PRODUCT_DISPLAY_VERSION "" !define PRODUCT_DISPLAY_VERSION "1.2 p"
!define PRODUCT_DISPLAY_VERSION_SHORT "" !define PRODUCT_DISPLAY_VERSION_SHORT "1.2 p"
!define PRODUCT_WEB_SITE "http://www.clementine-player.org/" !define PRODUCT_WEB_SITE "http://www.clementine-player.org/"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM" !define PRODUCT_UNINST_ROOT_KEY "HKLM"
!define PRODUCT_INSTALL_DIR "$PROGRAMFILES\Clementine" ;!define PRODUCT_INSTALL_DIR "$PROGRAMFILES\Clementine"
!define PRODUCT_INSTALL_DIR "C:\Clementine"
; Set Application Capabilities info ; Set Application Capabilities info
!define CAPABILITIES_NAME "Clementine" !define CAPABILITIES_NAME "Clementine"
@ -48,7 +49,7 @@ SetCompressor /SOLID lzma
!insertmacro MUI_LANGUAGE "English" !insertmacro MUI_LANGUAGE "English"
Name "${PRODUCT_NAME}" Name "${PRODUCT_NAME}"
OutFile "${PRODUCT_NAME}Setup-.exe" OutFile "${PRODUCT_NAME}Setup-1.2.0p.exe"
InstallDir "${PRODUCT_INSTALL_DIR}" InstallDir "${PRODUCT_INSTALL_DIR}"
ShowInstDetails show ShowInstDetails show
ShowUnInstDetails show ShowUnInstDetails show

View File

@ -207,9 +207,9 @@ Section "Clementine" Clementine
@PORTABLE@ CreateDirectory $INSTDIR\data @PORTABLE@ CreateDirectory $INSTDIR\data
; Check the OS. If Vista or newer, use Default Programs ; Check the OS. If Vista or newer, use Default Programs
nsisos::osversion @NORMAL@ nsisos::osversion
StrCpy $R0 $0 @NORMAL@ StrCpy $R0 $0
IntCmp $R0 6 HasDefaultPrograms NoDefaultPrograms HasDefaultPrograms @NORMAL@ IntCmp $R0 6 HasDefaultPrograms NoDefaultPrograms HasDefaultPrograms
@NORMAL@ HasDefaultPrograms: @NORMAL@ HasDefaultPrograms:
@NORMAL@ ; Register Clementine with Default Programs @NORMAL@ ; Register Clementine with Default Programs
@ -1654,9 +1654,9 @@ Section "Uninstall"
@NORMAL@ DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" @NORMAL@ DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
; Check the OS. If Vista or newer, use Default Programs ; Check the OS. If Vista or newer, use Default Programs
nsisos::osversion @NORMAL@ nsisos::osversion
StrCpy $R0 $0 @NORMAL@ StrCpy $R0 $0
IntCmp $R0 6 HasDefaultPrograms NoDefaultPrograms HasDefaultPrograms @NORMAL@ IntCmp $R0 6 HasDefaultPrograms NoDefaultPrograms HasDefaultPrograms
@NORMAL@ HasDefaultPrograms: @NORMAL@ HasDefaultPrograms:
; Unregister from Default Programs ; Unregister from Default Programs