summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsr55 <[email protected]>2016-02-02 20:16:00 +0000
committersr55 <[email protected]>2016-02-02 20:16:00 +0000
commite87459fe6a2c7b7c72f442f4b081903628a50f59 (patch)
tree1444c3a9cc39bfebdb2c3191dbc8d4bb54b5007d
parentc9009243ac3f176c5b6a0e9564b794c487676aa8 (diff)
WinGui: Initial attempt at allowing nightly builds to be installed separately from standard builds.
-rw-r--r--win/CS/HandBrakeWPF/Installer/MakeNightly.nsi22
-rw-r--r--win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi22
2 files changed, 22 insertions, 22 deletions
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
index a39055fe3..2052588e3 100644
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
@@ -7,7 +7,7 @@
; Script generated by the HM NIS Edit Script Wizard.
; HM NIS Edit Wizard helper defines
-!define PRODUCT_NAME "HandBrake"
+!define PRODUCT_NAME "HandBrake Nightly"
!define PRODUCT_VERSION "Nightly"
!define PRODUCT_VERSION_NUMBER "Nightly"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\HandBrake.exe"
@@ -50,14 +50,14 @@ SetCompressor lzma
; MUI end ------
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+Name "${PRODUCT_NAME}"
OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}_i686-Win_GUI.exe"
!include WordFunc.nsh
!insertmacro VersionCompare
!include LogicLib.nsh
-InstallDir "$PROGRAMFILES\HandBrake"
+InstallDir "$PROGRAMFILES\HandBrake Nightly"
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
ShowInstDetails show
ShowUnInstDetails show
@@ -132,9 +132,9 @@ Section "HandBrake" SEC01
; Install Files
File "*.exe"
- CreateDirectory "$SMPROGRAMS\HandBrake"
- CreateShortCut "$SMPROGRAMS\HandBrake\HandBrake.lnk" "$INSTDIR\HandBrake.exe"
- CreateShortCut "$DESKTOP\HandBrake.lnk" "$INSTDIR\HandBrake.exe"
+ CreateDirectory "$SMPROGRAMS\HandBrake Nightly"
+ CreateShortCut "$SMPROGRAMS\HandBrake Nightly\HandBrake.lnk" "$INSTDIR\HandBrake.exe"
+ CreateShortCut "$DESKTOP\HandBrake Nightly.lnk" "$INSTDIR\HandBrake.exe"
File "*.dll"
File "*.config"
File "*.pdb"
@@ -151,7 +151,7 @@ Section "HandBrake" SEC01
SectionEnd
Section -AdditionalIcons
- CreateShortCut "$SMPROGRAMS\HandBrake\Uninstall.lnk" "$INSTDIR\uninst.exe"
+ CreateShortCut "$SMPROGRAMS\HandBrake Nightly\Uninstall.lnk" "$INSTDIR\uninst.exe"
SectionEnd
Section -Post
@@ -186,10 +186,10 @@ Section Uninstall
RMDIR "$INSTDIR\fonts\conf.d"
RMDIR "$INSTDIR\fonts\conf.avail"
RMDIR "$INSTDIR\fonts"
- Delete "$SMPROGRAMS\HandBrake\Uninstall.lnk"
- Delete "$DESKTOP\HandBrake.lnk"
- Delete "$SMPROGRAMS\HandBrake\HandBrake.lnk"
- RMDir "$SMPROGRAMS\HandBrake"
+ Delete "$SMPROGRAMS\HandBrake Nightly\Uninstall.lnk"
+ Delete "$DESKTOP\HandBrake Nightly.lnk"
+ Delete "$SMPROGRAMS\HandBrake Nightly\HandBrake.lnk"
+ RMDir "$SMPROGRAMS\HandBrake Nightly"
RMDir "$INSTDIR"
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
index 76746b032..a57cd3fac 100644
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
@@ -7,7 +7,7 @@
; Script generated by the HM NIS Edit Script Wizard.
; HM NIS Edit Wizard helper defines
-!define PRODUCT_NAME "HandBrake"
+!define PRODUCT_NAME "HandBrake Nightly"
!define PRODUCT_VERSION "Nightly"
!define PRODUCT_VERSION_NUMBER "Nightly"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\HandBrake.exe"
@@ -50,14 +50,14 @@ SetCompressor lzma
; MUI end ------
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+Name "${PRODUCT_NAME}"
OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}_x86_64-Win_GUI.exe"
!include WordFunc.nsh
!insertmacro VersionCompare
!include LogicLib.nsh
-InstallDir "$PROGRAMFILES64\HandBrake"
+InstallDir "$PROGRAMFILES64\HandBrake Nightly"
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
ShowInstDetails show
ShowUnInstDetails show
@@ -132,9 +132,9 @@ Section "HandBrake" SEC01
; Install Files
File "*.exe"
- CreateDirectory "$SMPROGRAMS\HandBrake"
- CreateShortCut "$SMPROGRAMS\HandBrake\HandBrake.lnk" "$INSTDIR\HandBrake.exe"
- CreateShortCut "$DESKTOP\HandBrake.lnk" "$INSTDIR\HandBrake.exe"
+ CreateDirectory "$SMPROGRAMS\HandBrake Nightly"
+ CreateShortCut "$SMPROGRAMS\HandBrake Nightly\HandBrake.lnk" "$INSTDIR\HandBrake.exe"
+ CreateShortCut "$DESKTOP\HandBrake Nightly.lnk" "$INSTDIR\HandBrake.exe"
File "*.dll"
File "*.config"
File "HandBrake*.pdb"
@@ -151,7 +151,7 @@ Section "HandBrake" SEC01
SectionEnd
Section -AdditionalIcons
- CreateShortCut "$SMPROGRAMS\HandBrake\Uninstall.lnk" "$INSTDIR\uninst.exe"
+ CreateShortCut "$SMPROGRAMS\HandBrake Nightly\Uninstall.lnk" "$INSTDIR\uninst.exe"
SectionEnd
Section -Post
@@ -186,10 +186,10 @@ Section Uninstall
RMDIR "$INSTDIR\fonts\conf.d"
RMDIR "$INSTDIR\fonts\conf.avail"
RMDIR "$INSTDIR\fonts"
- Delete "$SMPROGRAMS\HandBrake\Uninstall.lnk"
- Delete "$DESKTOP\HandBrake.lnk"
- Delete "$SMPROGRAMS\HandBrake\HandBrake.lnk"
- RMDir "$SMPROGRAMS\HandBrake"
+ Delete "$SMPROGRAMS\HandBrake Nightly\Uninstall.lnk"
+ Delete "$DESKTOP\HandBrake Nightly.lnk"
+ Delete "$SMPROGRAMS\HandBrake Nightly\HandBrake.lnk"
+ RMDir "$SMPROGRAMS\HandBrake Nightly"
RMDir "$INSTDIR"
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"