mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-07 08:58:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Packaging] bbfreeze updates

Browse source 
* No need for data_files to be installed on windows
This commit is contained in:
Calum Lind 2015-08-27 11:27:37 +01:00
commit 8345237dcc
3 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packaging/win32/deluge-bbfreeze.py
View file

@ -54,9 +54,8 @@ build_version = deluge.common.get_version()
python_path = os.path.dirname(sys.executable) python_path = os.path.dirname(sys.executable)
if python_path.endswith("Scripts"): if python_path.endswith("Scripts"):
python_path = python_path[:-8] python_path = python_path[:-8]
python_path += os.path.sep gtk_root = os.path.join(gtk.__path__[0], "..", "runtime")
gtk_root = os.path.join(gtk.__path__[0], "..", "runtime") + os.path.sep build_dir = os.path.join("build-win32", "deluge-bbfreeze-" + build_version)
build_dir = "..\\build-win32\\deluge-bbfreeze-" + build_version + "\\"
if DEBUG: if DEBUG:
print("Python Path: %s" % python_path) print("Python Path: %s" % python_path)
@ -89,7 +88,7 @@ fzr.setIcon(os.path.join(os.path.dirname(deluge.common.__file__), "ui", "data",
# Hide cmd console popup for these console entries force gui_script True. # Hide cmd console popup for these console entries force gui_script True.
force_gui = ["deluge-web", "deluged", "deluge-console"] force_gui = ["deluge-web", "deluged", "deluge-console"]
script_list = [] script_list = []
for script in glob.glob(python_path + "Scripts\\deluge*-script.py*"): for script in glob.glob(os.path.join(python_path, "Scripts\\deluge*-script.py*")):
# Copy the scripts to remove the '-script' suffix before adding to freezer. # Copy the scripts to remove the '-script' suffix before adding to freezer.
new_script = script.replace("-script", "") new_script = script.replace("-script", "")
shutil.copy(script, new_script) shutil.copy(script, new_script)

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

@ -25,7 +25,7 @@ SetCompressorDictSize 64
!define PROGRAM_WEB_SITE "http://deluge-torrent.org" !define PROGRAM_WEB_SITE "http://deluge-torrent.org"
# Python files generated with bbfreeze # Python files generated with bbfreeze
!define BUILD_DIR "..\build-win32" !define BUILD_DIR "build-win32"
!define BBFREEZE_DIR "${BUILD_DIR}\deluge-bbfreeze-${PROGRAM_VERSION}" !define BBFREEZE_DIR "${BUILD_DIR}\deluge-bbfreeze-${PROGRAM_VERSION}"
# --- Interface settings --- # --- Interface settings ---

10
setup.py
View file

@ -266,8 +266,10 @@ cmdclass = {
'test': PyTest, 'test': PyTest,
} }
# Data files to be installed to the system # Data files to be installed to the system.
_data_files = [ _data_files = []
if not windows_check():
_data_files = [
('share/icons/hicolor/scalable/apps', ['deluge/ui/data/icons/hicolor/scalable/apps/deluge.svg']), ('share/icons/hicolor/scalable/apps', ['deluge/ui/data/icons/hicolor/scalable/apps/deluge.svg']),
('share/icons/hicolor/128x128/apps', ['deluge/ui/data/icons/hicolor/128x128/apps/deluge.png']), ('share/icons/hicolor/128x128/apps', ['deluge/ui/data/icons/hicolor/128x128/apps/deluge.png']),
('share/icons/hicolor/16x16/apps', ['deluge/ui/data/icons/hicolor/16x16/apps/deluge.png']), ('share/icons/hicolor/16x16/apps', ['deluge/ui/data/icons/hicolor/16x16/apps/deluge.png']),
@ -288,9 +290,9 @@ _data_files = [
'docs/man/deluge-gtk.1', 'docs/man/deluge-gtk.1',
'docs/man/deluge-web.1', 'docs/man/deluge-web.1',
'docs/man/deluge-console.1']) 'docs/man/deluge-console.1'])
] ]
if not windows_check() and os.path.exists(desktop_data): if os.path.exists(desktop_data):
_data_files.append(('share/applications', [desktop_data])) _data_files.append(('share/applications', [desktop_data]))
entry_points = { entry_points = {