mirror of
https://github.com/codex-storage/deluge.git
synced 2025-01-12 20:44:50 +00:00
Update win32 build files
This commit is contained in:
Andrew Resch
parent
3e68733cfd
commit
6402634ec1
@ -1,19 +1,35 @@
|
||||
build_version = "1.3.0-rc2"
|
||||
build_version = "1.3.0"
|
||||
python_path = "C:\\Python26\\"
|
||||
|
||||
import shutil
|
||||
shutil.copy(python_path + "Scripts\deluge-script.py", python_path + "Scripts\deluge.py")
|
||||
shutil.copy(python_path + "Scripts\deluge-script.py", python_path + "Scripts\deluge-debug.py")
|
||||
shutil.copy(python_path + "Scripts\deluged-script.py", python_path + "Scripts\deluged.py")
|
||||
shutil.copy(python_path + "Scripts\deluge-web-script.py", python_path + "Scripts\deluge-web.py")
|
||||
shutil.copy(python_path + "Scripts\deluge-gtk-script.py", python_path + "Scripts\deluge-gtk.py")
|
||||
shutil.copy(python_path + "Scripts\deluge-console-script.py", python_path + "Scripts\deluge-console.py")
|
||||
|
||||
includes=("libtorrent", "gzip", "zipfile", "re", "socket", "struct", "cairo", "pangocairo", "atk", "pango", "wsgiref.handlers", "twisted.internet.utils", "gio", "gtk.glade")
|
||||
excludes=("numpy", "OpenGL", "psyco")
|
||||
|
||||
dst = "..\\build-win32\\deluge-bbfreeze-" + build_version
|
||||
|
||||
from bbfreeze import Freezer
|
||||
f = Freezer("..\\build-win32\\deluge-bbfreeze-" + build_version, includes=("libtorrent", "gzip", "zipfile", "re", "socket", "struct", "cairo", "pangocairo", "atk", "pango", "wsgiref.handlers", "twisted.internet.utils", "gio", "gtk.glade"))
|
||||
f.addScript(python_path + "Scripts\deluge.py", gui_only=False)
|
||||
f = Freezer(dst, includes=includes, excludes=excludes)
|
||||
f.include_py = False
|
||||
f.addScript(python_path + "Scripts\deluge.py", gui_only=True)
|
||||
f.addScript(python_path + "Scripts\deluge-debug.py", gui_only=False)
|
||||
f.addScript(python_path + "Scripts\deluged.py", gui_only=False)
|
||||
f.addScript(python_path + "Scripts\deluge-web.py", gui_only=False)
|
||||
f.addScript(python_path + "Scripts\deluge-gtk.py", gui_only=False)
|
||||
f.addScript(python_path + "Scripts\deluge-gtk.py", gui_only=True)
|
||||
f.addScript(python_path + "Scripts\deluge-console.py", gui_only=False)
|
||||
f() # starts the freezing process
|
||||
|
||||
|
||||
import icon
|
||||
icon.CopyIcons(dst+"\\deluge.exe", "deluge.ico")
|
||||
icon.CopyIcons(dst+"\\deluge-debug.exe", "deluge.ico")
|
||||
icon.CopyIcons(dst+"\\deluged.exe", "deluge.ico")
|
||||
icon.CopyIcons(dst+"\\deluge-web.exe", "deluge.ico")
|
||||
icon.CopyIcons(dst+"\\deluge-gtk.exe", "deluge.ico")
|
||||
icon.CopyIcons(dst+"\\deluge-console.exe", "deluge.ico")
|
||||
|
||||
@ -122,9 +122,6 @@ BrandingText "Deluge Windows Installer v${DELUGE_INSTALLER_VERSION}"
|
||||
Name "${PROGRAM_NAME} ${PROGRAM_VERSION}"
|
||||
OutFile "..\build-win32\deluge-${PROGRAM_VERSION}-win32-setup.exe"
|
||||
|
||||
# The Python bbfreeze files will be placed here
|
||||
!define DELUGE_PYTHON_SUBDIR "$INSTDIR\Deluge-Python"
|
||||
|
||||
InstallDir "$PROGRAMFILES\Deluge"
|
||||
|
||||
ShowInstDetails show
|
||||
@ -134,68 +131,30 @@ ShowUnInstDetails show
|
||||
Section "Deluge Bittorrent Client" Section1
|
||||
SectionIn RO
|
||||
|
||||
Rmdir /r "${DELUGE_PYTHON_SUBDIR}"
|
||||
SetOutPath "${DELUGE_PYTHON_SUBDIR}"
|
||||
SetOutPath $INSTDIR
|
||||
File /r "${DELUGE_PYTHON_BBFREEZE_OUTPUT_DIR}\*.*"
|
||||
|
||||
# Clean up previous confusion between Deluge.ico and deluge.ico (seems to matter on Vista registry settings?)
|
||||
Delete "$INSTDIR\Deluge.ico"
|
||||
|
||||
SetOverwrite ifnewer
|
||||
SetOutPath $INSTDIR
|
||||
File "..\LICENSE"
|
||||
File "StartX.exe"
|
||||
File "deluge.ico"
|
||||
|
||||
# Create deluge.cmd file
|
||||
fileOpen $0 "$INSTDIR\deluge.cmd" w
|
||||
fileWrite $0 '@ECHO OFF$\r$\n'
|
||||
fileWrite $0 'SET DELUGEFOLDER="$INSTDIR"$\r$\n'
|
||||
fileWrite $0 'SET STARTX_APP="$INSTDIR\StartX.exe"$\r$\n'
|
||||
fileWrite $0 '$\r$\n'
|
||||
fileWrite $0 'IF ""%1"" == """" ( $\r$\n'
|
||||
fileWrite $0 ' %STARTX_APP% /B /D%DELUGEFOLDER% "$INSTDIR\Deluge-Python\deluge.exe"$\r$\n'
|
||||
fileWrite $0 ') ELSE ( $\r$\n'
|
||||
fileWrite $0 ' %STARTX_APP% /B /D%DELUGEFOLDER% "$INSTDIR\Deluge-Python\deluge.exe "%1" "%2" "%3" "%4""$\r$\n'
|
||||
fileWrite $0 ')$\r$\n'
|
||||
fileClose $0
|
||||
|
||||
# Create deluged.cmd file
|
||||
fileOpen $0 "$INSTDIR\deluged.cmd" w
|
||||
fileWrite $0 '@ECHO OFF$\r$\n'
|
||||
fileWrite $0 'SET DELUGEFOLDER="$INSTDIR"$\r$\n'
|
||||
fileWrite $0 '"$INSTDIR\StartX.exe" /B /D%DELUGEFOLDER% "$INSTDIR\Deluge-Python\deluged.exe "%1" "%2" "%3" "%4""$\r$\n'
|
||||
fileClose $0
|
||||
|
||||
# Create deluge-webui.cmd file
|
||||
fileOpen $0 "$INSTDIR\deluge-webui.cmd" w
|
||||
fileWrite $0 '@ECHO OFF$\r$\n'
|
||||
fileWrite $0 'SET DELUGEFOLDER="$INSTDIR"$\r$\n'
|
||||
fileWrite $0 '"$INSTDIR\StartX.exe" /B /D%DELUGEFOLDER% "$INSTDIR\Deluge-Python\deluge.exe --ui web"$\r$\n'
|
||||
fileWrite $0 "ECHO Deluge WebUI started and is running at http://localhost:8112 by default$\r$\n"
|
||||
fileWrite $0 "ECHO NOTE: The Deluge WebUI process can only be stopped in the Windows Task Manager$\r$\n"
|
||||
fileWrite $0 "ECHO.$\r$\n"
|
||||
fileWrite $0 PAUSE
|
||||
fileClose $0
|
||||
SectionEnd
|
||||
|
||||
Section -StartMenu_Desktop_Links
|
||||
WriteIniStr "$INSTDIR\homepage.url" "InternetShortcut" "URL" "${PROGRAM_WEB_SITE}"
|
||||
|
||||
# create shortcuts for all users
|
||||
SetShellVarContext all
|
||||
CreateDirectory "$SMPROGRAMS\Deluge"
|
||||
CreateShortCut "$SMPROGRAMS\Deluge\Deluge.lnk" "$INSTDIR\deluge.cmd" "" "$INSTDIR\deluge.ico"
|
||||
CreateShortCut "$SMPROGRAMS\Deluge\Deluge daemon.lnk" "$INSTDIR\deluged.cmd" "" "$INSTDIR\deluge.ico"
|
||||
CreateShortCut "$SMPROGRAMS\Deluge\Deluge webUI.lnk" "$INSTDIR\deluge-webui.cmd" "" "$INSTDIR\deluge.ico"
|
||||
CreateShortCut "$SMPROGRAMS\Deluge\Deluge.lnk" "$INSTDIR\deluge.exe"
|
||||
CreateShortCut "$SMPROGRAMS\Deluge\Deluge daemon.lnk" "$INSTDIR\deluged.exe"
|
||||
CreateShortCut "$SMPROGRAMS\Deluge\Deluge webUI.lnk" "$INSTDIR\deluge-web.exe"
|
||||
CreateShortCut "$SMPROGRAMS\Deluge\Project homepage.lnk" "$INSTDIR\Homepage.url"
|
||||
CreateShortCut "$SMPROGRAMS\Deluge\Uninstall Deluge.lnk" "$INSTDIR\Deluge-uninst.exe"
|
||||
CreateShortCut "$DESKTOP\Deluge.lnk" "$INSTDIR\deluge.cmd" "" "$INSTDIR\deluge.ico"
|
||||
CreateShortCut "$DESKTOP\Deluge.lnk" "$INSTDIR\deluge.exe"
|
||||
SectionEnd
|
||||
|
||||
Section -Uninstaller
|
||||
WriteUninstaller "$INSTDIR\Deluge-uninst.exe"
|
||||
WriteRegStr ${PROGRAM_UNINST_ROOT_KEY} "${PROGRAM_UNINST_KEY}" "DisplayName" "$(^Name)"
|
||||
WriteRegStr ${PROGRAM_UNINST_ROOT_KEY} "${PROGRAM_UNINST_KEY}" "UninstallString" "$INSTDIR\Deluge-uninst.exe"
|
||||
WriteRegStr ${PROGRAM_UNINST_ROOT_KEY} "${PROGRAM_UNINST_KEY}" "DisplayIcon" "$INSTDIR\deluge.ico"
|
||||
SectionEnd
|
||||
|
||||
# Create file association for .torrent
|
||||
@ -208,9 +167,9 @@ Section "Create .torrent file association for Deluge" Section2
|
||||
DeleteRegKey HKCR "Deluge"
|
||||
WriteRegStr HKCR "Deluge" "" "Deluge"
|
||||
WriteRegStr HKCR "Deluge\Content Type" "" "application/x-bittorrent"
|
||||
WriteRegStr HKCR "Deluge\DefaultIcon" "" '"$INSTDIR\deluge.ico"'
|
||||
WriteRegStr HKCR "Deluge\DefaultIcon" "" "$INSTDIR\deluge.exe,0"
|
||||
WriteRegStr HKCR "Deluge\shell" "" "open"
|
||||
WriteRegStr HKCR "Deluge\shell\open\command" "" '"$INSTDIR\deluge.cmd" "%1"'
|
||||
WriteRegStr HKCR "Deluge\shell\open\command" "" '"$INSTDIR\deluge.exe" "%1"'
|
||||
SectionEnd
|
||||
|
||||
|
||||
@ -220,7 +179,7 @@ Section "Create magnet uri link association for Deluge" Section3
|
||||
WriteRegStr HKCR "magnet" "" "URL:magnet protocol"
|
||||
WriteRegStr HKCR "magnet" "URL Protocol" ""
|
||||
|
||||
WriteRegStr HKCR "magnet\shell\open\command" "" '"$INSTDIR\deluge.cmd" "%1"'
|
||||
WriteRegStr HKCR "magnet\shell\open\command" "" '"$INSTDIR\deluge.exe" "%1"'
|
||||
SectionEnd
|
||||
|
||||
# Install GTK+ 2.16
|
||||
@ -267,17 +226,9 @@ LangString DESC_Section4 ${LANG_ENGLISH} "Download and install the GTK+ 2.16 run
|
||||
# --- Uninstallation section(s) ---
|
||||
|
||||
Section Uninstall
|
||||
Rmdir /r "${DELUGE_PYTHON_SUBDIR}"
|
||||
|
||||
Delete "$INSTDIR\Deluge-uninst.exe"
|
||||
Delete "$INSTDIR\LICENSE"
|
||||
Delete "$INSTDIR\deluge.cmd"
|
||||
Delete "$INSTDIR\deluged.cmd"
|
||||
Delete "$INSTDIR\deluge-webui.cmd"
|
||||
Delete "$INSTDIR\StartX.exe"
|
||||
Delete "$INSTDIR\Homepage.url"
|
||||
Delete "$INSTDIR\deluge.ico"
|
||||
RmDir /r "$INSTDIR"
|
||||
|
||||
SetShellVarContext all
|
||||
Delete "$SMPROGRAMS\Deluge\Deluge.lnk"
|
||||
Delete "$SMPROGRAMS\Deluge\Deluge daemon.lnk"
|
||||
Delete "$SMPROGRAMS\Deluge\Deluge webUI.lnk"
|
||||
@ -286,7 +237,6 @@ Section Uninstall
|
||||
Delete "$DESKTOP\Deluge.lnk"
|
||||
|
||||
RmDir "$SMPROGRAMS\Deluge"
|
||||
RmDir "$INSTDIR"
|
||||
|
||||
DeleteRegKey ${PROGRAM_UNINST_ROOT_KEY} "${PROGRAM_UNINST_KEY}"
|
||||
|
||||
|
||||
191
win32/icon.py
Normal file
191
win32/icon.py
Normal file
@ -0,0 +1,191 @@
|
||||
#! /usr/bin/env python
|
||||
# Copyright (C) 2005, Giovanni Bajo
|
||||
# Based on previous work under copyright (c) 2002 McMillan Enterprises, Inc.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
|
||||
# This code is courtesy of Thomas Heller, who
|
||||
# has kindly donated it to this project.
|
||||
RT_ICON = 3
|
||||
RT_GROUP_ICON = 14
|
||||
LOAD_LIBRARY_AS_DATAFILE = 2
|
||||
|
||||
import struct
|
||||
import types
|
||||
try:
|
||||
StringTypes = types.StringTypes
|
||||
except AttributeError:
|
||||
StringTypes = [ type("") ]
|
||||
|
||||
class Structure:
|
||||
def __init__ (self):
|
||||
size = self._sizeInBytes = struct.calcsize (self._format_)
|
||||
self._fields_ = list (struct.unpack (self._format_, '\000' * size))
|
||||
indexes = self._indexes_ = {}
|
||||
for i in range (len (self._names_)):
|
||||
indexes[self._names_[i]] = i
|
||||
def dump (self):
|
||||
print "I: DUMP of", self
|
||||
for name in self._names_:
|
||||
if name[0] != '_':
|
||||
print "I: %20s = %s" % (name, getattr (self, name))
|
||||
print
|
||||
def __getattr__ (self, name):
|
||||
if name in self._names_:
|
||||
index = self._indexes_[name]
|
||||
return self._fields_[index]
|
||||
try:
|
||||
return self.__dict__[name]
|
||||
except KeyError:
|
||||
raise AttributeError, name
|
||||
def __setattr__ (self, name, value):
|
||||
if name in self._names_:
|
||||
index = self._indexes_[name]
|
||||
self._fields_[index] = value
|
||||
else:
|
||||
self.__dict__[name] = value
|
||||
def tostring (self):
|
||||
return apply (struct.pack, [self._format_,] + self._fields_)
|
||||
def fromfile (self, file):
|
||||
data = file.read (self._sizeInBytes)
|
||||
self._fields_ = list (struct.unpack (self._format_, data))
|
||||
|
||||
class ICONDIRHEADER (Structure):
|
||||
_names_ = "idReserved", "idType", "idCount"
|
||||
_format_ = "hhh"
|
||||
|
||||
class ICONDIRENTRY (Structure):
|
||||
_names_ = "bWidth", "bHeight", "bColorCount", "bReserved", "wPlanes", "wBitCount", "dwBytesInRes", "dwImageOffset"
|
||||
_format_ = "bbbbhhii"
|
||||
|
||||
class GRPICONDIR (Structure):
|
||||
_names_ = "idReserved", "idType", "idCount"
|
||||
_format_ = "hhh"
|
||||
|
||||
class GRPICONDIRENTRY (Structure):
|
||||
_names_ = "bWidth", "bHeight", "bColorCount", "bReserved", "wPlanes", "wBitCount", "dwBytesInRes", "nID"
|
||||
_format_ = "bbbbhhih"
|
||||
|
||||
class IconFile:
|
||||
def __init__ (self, path):
|
||||
self.path = path
|
||||
file = open (path, "rb")
|
||||
self.entries = []
|
||||
self.images = []
|
||||
header = self.header = ICONDIRHEADER()
|
||||
header.fromfile (file)
|
||||
for i in range (header.idCount):
|
||||
entry = ICONDIRENTRY()
|
||||
entry.fromfile (file)
|
||||
self.entries.append (entry)
|
||||
for e in self.entries:
|
||||
file.seek (e.dwImageOffset, 0)
|
||||
self.images.append (file.read (e.dwBytesInRes))
|
||||
|
||||
def grp_icon_dir (self):
|
||||
return self.header.tostring()
|
||||
|
||||
def grp_icondir_entries (self, id=1):
|
||||
data = ""
|
||||
for entry in self.entries:
|
||||
e = GRPICONDIRENTRY()
|
||||
for n in e._names_[:-1]:
|
||||
setattr(e, n, getattr (entry, n))
|
||||
e.nID = id
|
||||
id = id + 1
|
||||
data = data + e.tostring()
|
||||
return data
|
||||
|
||||
|
||||
def CopyIcons_FromIco (dstpath, srcpath, id=1):
|
||||
import win32api #, win32con
|
||||
icons = map(IconFile, srcpath)
|
||||
print "I: Updating icons from", srcpath, "to", dstpath
|
||||
|
||||
hdst = win32api.BeginUpdateResource (dstpath, 0)
|
||||
|
||||
iconid = 1
|
||||
for i in range(len(icons)):
|
||||
f = icons[i]
|
||||
data = f.grp_icon_dir()
|
||||
data = data + f.grp_icondir_entries(iconid)
|
||||
win32api.UpdateResource (hdst, RT_GROUP_ICON, i, data)
|
||||
print "I: Writing RT_GROUP_ICON %d resource with %d bytes" % (i, len(data))
|
||||
for data in f.images:
|
||||
win32api.UpdateResource (hdst, RT_ICON, iconid, data)
|
||||
print "I: Writing RT_ICON %d resource with %d bytes" % (iconid, len (data))
|
||||
iconid = iconid + 1
|
||||
|
||||
win32api.EndUpdateResource (hdst, 0)
|
||||
|
||||
def CopyIcons (dstpath, srcpath):
|
||||
import os.path, string
|
||||
|
||||
if type(srcpath) in StringTypes:
|
||||
srcpath = [ srcpath ]
|
||||
|
||||
def splitter(s):
|
||||
try:
|
||||
srcpath, index = map(string.strip, string.split(s, ','))
|
||||
return srcpath, int(index)
|
||||
except ValueError:
|
||||
return s, None
|
||||
|
||||
srcpath = map(splitter, srcpath)
|
||||
print "I: SRCPATH", srcpath
|
||||
|
||||
if len(srcpath) > 1:
|
||||
# At the moment, we support multiple icons only from .ico files
|
||||
srcs = []
|
||||
for s in srcpath:
|
||||
e = os.path.splitext(s[0])[1]
|
||||
if string.lower(e) != '.ico':
|
||||
raise ValueError, "multiple icons supported only from .ico files"
|
||||
if s[1] is not None:
|
||||
raise ValueError, "index not allowed for .ico files"
|
||||
srcs.append(s[0])
|
||||
return CopyIcons_FromIco(dstpath, srcs)
|
||||
|
||||
srcpath,index = srcpath[0]
|
||||
srcext = os.path.splitext(srcpath)[1]
|
||||
if string.lower (srcext) == '.ico':
|
||||
return CopyIcons_FromIco (dstpath, [srcpath])
|
||||
if index is not None:
|
||||
print "I: Updating icons from", srcpath, ", %d to" % index, dstpath
|
||||
else:
|
||||
print "I: Updating icons from", srcpath, "to", dstpath
|
||||
import win32api #, win32con
|
||||
hdst = win32api.BeginUpdateResource (dstpath, 0)
|
||||
hsrc = win32api.LoadLibraryEx (srcpath, 0, LOAD_LIBRARY_AS_DATAFILE)
|
||||
if index is None:
|
||||
grpname = win32api.EnumResourceNames (hsrc, RT_GROUP_ICON)[0]
|
||||
elif index >= 0:
|
||||
grpname = win32api.EnumResourceNames (hsrc, RT_GROUP_ICON)[index]
|
||||
else:
|
||||
grpname = -index
|
||||
data = win32api.LoadResource (hsrc, RT_GROUP_ICON, grpname)
|
||||
win32api.UpdateResource (hdst, RT_GROUP_ICON, grpname, data)
|
||||
for iconname in win32api.EnumResourceNames (hsrc, RT_ICON):
|
||||
data = win32api.LoadResource (hsrc, RT_ICON, iconname)
|
||||
win32api.UpdateResource (hdst, RT_ICON, iconname, data)
|
||||
win32api.FreeLibrary (hsrc)
|
||||
win32api.EndUpdateResource (hdst, 0)
|
||||
|
||||
if __name__ == "__main__":
|
||||
import sys
|
||||
|
||||
dstpath = sys.argv[1]
|
||||
srcpath = sys.argv[2:]
|
||||
CopyIcons(dstpath, srcpath)
|
||||
Loading…
x
Reference in New Issue
Block a user