mirrors/deluge
1
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-04-20 03:24:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[win32] Update packaging scripts

Browse source 
* Update directory paths.
This commit is contained in:
Calum Lind 2015-08-23 12:34:19 +01:00
parent f4cb062380
commit a4844f7b77
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packaging/win32/deluge-win32-installer.nsi
View file

@ -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

2
tox.ini
View file

@ -84,7 +84,7 @@ whitelist_externals =
isort
commands =
isort --version
python -c "import subprocess, sys; output = subprocess.check_output('isort --diff --recursive deluge docs win32 *.py', shell=True); print output; sys.exit(len(output) != 0)"
python -c "import subprocess, sys; output = subprocess.check_output('isort --diff --recursive deluge docs packaging *.py', shell=True); print output; sys.exit(len(output) != 0)"
[testenv:flake8]
setenv = {[testenv]setenv}