codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-01-12 20:44:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[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
parent 3b1cb0f58e
commit 53caeb4565
3 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
setup.py
View File

@ -487,9 +487,11 @@ cmdclass = {
'egg_info_plugins': egg_info_plugins
}
# Data files to be installed to the system
# Data files to be installed to the system.
_data_files = []
if not windows_check():
_data_files = [
('share/icons/hicolor/scalable/apps', ['deluge/data/icons/scalable/apps/deluge.svg']),
('share/icons/hicolor/scalable/apps', ['deluge/data/icons/hicolor/scalable/apps/deluge.svg']),
('share/icons/hicolor/128x128/apps', ['deluge/data/icons/hicolor/128x128/apps/deluge.png']),
('share/icons/hicolor/16x16/apps', ['deluge/data/icons/hicolor/16x16/apps/deluge.png']),
('share/icons/hicolor/192x192/apps', ['deluge/data/icons/hicolor/192x192/apps/deluge.png']),
@ -502,7 +504,7 @@ _data_files = [
('share/icons/hicolor/64x64/apps', ['deluge/data/icons/hicolor/64x64/apps/deluge.png']),
('share/icons/hicolor/72x72/apps', ['deluge/data/icons/hicolor/72x72/apps/deluge.png']),
('share/icons/hicolor/96x96/apps', ['deluge/data/icons/hicolor/96x96/apps/deluge.png']),
('share/pixmaps', ['deluge/data/pixmaps/deluge.png', 'deluge/data/pixmaps/deluge.xpm']),
('share/pixmaps', ['deluge/ui/data/pixmaps/deluge.png', 'deluge/data/pixmaps/deluge.xpm']),
('share/man/man1', [
'docs/man/deluge.1',
'docs/man/deluged.1',
@ -511,7 +513,7 @@ _data_files = [
'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]))
entry_points = {

7
win32/deluge-bbfreeze.py
View File

@ -55,9 +55,8 @@ build_version = deluge.common.get_version()
python_path = os.path.dirname(sys.executable)
if python_path.endswith("Scripts"):
python_path = python_path[:-8]
python_path += os.path.sep
gtk_root = os.path.join(gtk.__path__[0], "..", "runtime") + os.path.sep
build_dir = "..\\build-win32\\deluge-bbfreeze-" + build_version + "\\"
gtk_root = os.path.join(gtk.__path__[0], "..", "runtime")
build_dir = os.path.join("build-win32", "deluge-bbfreeze-" + build_version)
if DEBUG:
print("Python Path: %s" % python_path)
@ -90,7 +89,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.
force_gui = ["deluge-web", "deluged", "deluge-console"]
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.
new_script = script.replace("-script", "")
shutil.copy(script, new_script)

2
win32/deluge-win32-installer.nsi
View File

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