summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorCalum Lind <calumlind+deluge@gmail.com>2015-08-23 12:34:19 +0100
committerCalum Lind <calumlind+deluge@gmail.com>2015-08-24 14:56:53 +0100
commita4844f7b77cc358c919501b6ee7d2f1ed9f2115e (patch)
tree65f08ac704bc0676843a521b4d19f22f31954b11 /packaging
parentf4cb062380165f392241000ebf1000a5ed8c2982 (diff)
downloaddeluge-a4844f7b77cc358c919501b6ee7d2f1ed9f2115e.tar.gz
deluge-a4844f7b77cc358c919501b6ee7d2f1ed9f2115e.tar.bz2
deluge-a4844f7b77cc358c919501b6ee7d2f1ed9f2115e.zip
[win32] Update packaging scripts
* Update directory paths.
Diffstat (limited to 'packaging')
-rw-r--r--packaging/win32/deluge-win32-installer.nsi15
1 files changed, 8 insertions, 7 deletions
diff --git a/packaging/win32/deluge-win32-installer.nsi b/packaging/win32/deluge-win32-installer.nsi
index 82f9e66c8..b78e8836e 100644
--- a/packaging/win32/deluge-win32-installer.nsi
+++ b/packaging/win32/deluge-win32-installer.nsi
@@ -13,7 +13,7 @@ SetCompressor /FINAL /SOLID lzma
SetCompressorDictSize 64
# Script version; displayed when running the installer
-!define DELUGE_INSTALLER_VERSION "0.6"
+!define DELUGE_INSTALLER_VERSION "0.7"
# Deluge program information
!define PROGRAM_NAME "Deluge"
@@ -25,7 +25,8 @@ SetCompressorDictSize 64
!define PROGRAM_WEB_SITE "http://deluge-torrent.org"
# Python files generated with bbfreeze
-!define DELUGE_PYTHON_BBFREEZE_OUTPUT_DIR "..\build-win32\deluge-bbfreeze-${PROGRAM_VERSION}"
+!define BUILD_DIR "..\build-win32"
+!define BBFREEZE_DIR "${BUILD_DIR}\deluge-bbfreeze-${PROGRAM_VERSION}"
# --- Interface settings ---
@@ -33,7 +34,7 @@ SetCompressorDictSize 64
!include MUI2.nsh
# Installer
-!define MUI_ICON "deluge.ico"
+!define MUI_ICON "..\..\deluge\ui\data\pixmaps\deluge.ico"
!define MUI_HEADERIMAGE
!define MUI_HEADERIMAGE_RIGHT
!define MUI_HEADERIMAGE_BITMAP "installer-top.bmp"
@@ -54,7 +55,7 @@ SetCompressorDictSize 64
!insertmacro MUI_PAGE_WELCOME
# License page
-!insertmacro MUI_PAGE_LICENSE "..\LICENSE"
+!insertmacro MUI_PAGE_LICENSE "..\..\LICENSE"
# Components page
!insertmacro MUI_PAGE_COMPONENTS
@@ -108,7 +109,7 @@ FunctionEnd
BrandingText "Deluge Windows Installer v${DELUGE_INSTALLER_VERSION}"
Name "${PROGRAM_NAME} ${PROGRAM_VERSION}"
-OutFile "..\build-win32\deluge-${PROGRAM_VERSION}-win32-setup.exe"
+OutFile "${BUILD_DIR}\deluge-${PROGRAM_VERSION}-win32-setup.exe"
InstallDir "$PROGRAMFILES\Deluge"
@@ -120,10 +121,10 @@ Section "Deluge Bittorrent Client" Section1
SectionIn RO
SetOutPath $INSTDIR
- File /r "${DELUGE_PYTHON_BBFREEZE_OUTPUT_DIR}\*.*"
+ File /r "${BBFREEZE_DIR}\*.*"
SetOverwrite ifnewer
- File "..\LICENSE"
+ File "..\..\LICENSE"
SectionEnd
Section -StartMenu_Desktop_Links