Module: deluge
Branch: 1.3-stable
Commit: 4234583fc77f07e8faf6704b69457f70685d916d
Author: Andrew Resch <andrewre...@gmail.com>
Date: Fri Jul 22 11:12:47 2011 -0700
Fix .desktop file creation on Windows by just ignoring it
---
setup.py | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/setup.py b/setup.py
index 0a6fdde..6028b9c 100644
--- a/setup.py
+++ b/setup.py
@@ -254,14 +254,15 @@ class build_trans(cmd.Command):
def run(self):
po_dir = os.path.join(os.path.dirname(__file__), 'deluge/i18n/')
- # creates the translated desktop file
- INTLTOOL_MERGE='intltool-merge'
- INTLTOOL_MERGE_OPTS='--utf8 --quiet --desktop-style'
- desktop_in='deluge/data/share/applications/deluge.desktop.in'
- desktop_data='deluge/data/share/applications/deluge.desktop'
- print('Creating desktop file: %s' % desktop_data)
- os.system('C_ALL=C ' + '%s '*5 % (INTLTOOL_MERGE, INTLTOOL_MERGE_OPTS,
\
- po_dir, desktop_in, desktop_data))
+ if not windows_check():
+ # creates the translated desktop file
+ INTLTOOL_MERGE='intltool-merge'
+ INTLTOOL_MERGE_OPTS='--utf8 --quiet --desktop-style'
+ desktop_in='deluge/data/share/applications/deluge.desktop.in'
+ desktop_data='deluge/data/share/applications/deluge.desktop'
+ print('Creating desktop file: %s' % desktop_data)
+ os.system('C_ALL=C ' + '%s '*5 % (INTLTOOL_MERGE,
INTLTOOL_MERGE_OPTS, \
+ po_dir, desktop_in, desktop_data))
print('Compiling po files from %s...' % po_dir),
for path, names, filenames in os.walk(po_dir):
@@ -486,7 +487,6 @@ _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/applications', ['deluge/data/share/applications/deluge.desktop']),
('share/pixmaps', ['deluge/data/pixmaps/deluge.png',
'deluge/data/pixmaps/deluge.xpm']),
('share/man/man1', [
'docs/man/deluge.1',
@@ -496,6 +496,9 @@ _data_files = [
'docs/man/deluge-console.1'])
]
+if not windows_check():
+ _data_files.append(('share/applications',
['deluge/data/share/applications/deluge.desktop']))
+
entry_points = {
"console_scripts": [
"deluge-console = deluge.ui.console:start",
@@ -511,7 +514,7 @@ entry_points = {
if windows_check():
entry_points["console_scripts"].append("deluge-debug =
deluge.main:start_ui")
-
+
# Main setup
setup(
name = "deluge",
--
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to deluge-commit@googlegroups.com.
To unsubscribe from this group, send email to
deluge-commit+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en.
