Fix .desktop file creation on Windows by just ignoring it

This commit is contained in:
Andrew Resch 2011-07-22 11:12:47 -07:00 committed by Calum Lind
commit fd56ccaabf

View file

@ -262,14 +262,15 @@ class build_trans(cmd.Command):
else: else:
basedir = os.path.join(self.build_lib, 'deluge', 'i18n') basedir = os.path.join(self.build_lib, 'deluge', 'i18n')
# creates the translated desktop file if not windows_check():
INTLTOOL_MERGE='intltool-merge' # creates the translated desktop file
INTLTOOL_MERGE_OPTS='--utf8 --quiet --desktop-style' INTLTOOL_MERGE='intltool-merge'
desktop_in='deluge/ui/data/share/applications/deluge.desktop.in' INTLTOOL_MERGE_OPTS='--utf8 --quiet --desktop-style'
desktop_data='deluge/ui/data/share/applications/deluge.desktop' desktop_in='deluge/ui/data/share/applications/deluge.desktop.in'
print('Creating desktop file: %s' % desktop_data) desktop_data='deluge/ui/data/share/applications/deluge.desktop'
os.system('C_ALL=C ' + '%s '*5 % (INTLTOOL_MERGE, INTLTOOL_MERGE_OPTS, \ print('Creating desktop file: %s' % desktop_data)
po_dir, desktop_in, 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), print('Compiling po files from %s...' % po_dir),
for path, names, filenames in os.walk(po_dir): for path, names, filenames in os.walk(po_dir):
@ -493,7 +494,6 @@ _data_files = [
('share/icons/hicolor/64x64/apps', ['deluge/ui/data/icons/hicolor/64x64/apps/deluge.png']), ('share/icons/hicolor/64x64/apps', ['deluge/ui/data/icons/hicolor/64x64/apps/deluge.png']),
('share/icons/hicolor/72x72/apps', ['deluge/ui/data/icons/hicolor/72x72/apps/deluge.png']), ('share/icons/hicolor/72x72/apps', ['deluge/ui/data/icons/hicolor/72x72/apps/deluge.png']),
('share/icons/hicolor/96x96/apps', ['deluge/ui/data/icons/hicolor/96x96/apps/deluge.png']), ('share/icons/hicolor/96x96/apps', ['deluge/ui/data/icons/hicolor/96x96/apps/deluge.png']),
('share/applications', ['deluge/ui/data/share/applications/deluge.desktop']),
('share/pixmaps', ['deluge/ui/data/pixmaps/deluge.png', 'deluge/ui/data/pixmaps/deluge.xpm']), ('share/pixmaps', ['deluge/ui/data/pixmaps/deluge.png', 'deluge/ui/data/pixmaps/deluge.xpm']),
('share/man/man1', [ ('share/man/man1', [
'docs/man/deluge.1', 'docs/man/deluge.1',
@ -503,6 +503,9 @@ _data_files = [
'docs/man/deluge-console.1']) 'docs/man/deluge-console.1'])
] ]
if not windows_check():
_data_files.append(('share/applications', ['deluge/data/share/applications/deluge.desktop']))
entry_points = { entry_points = {
"console_scripts": [ "console_scripts": [
"deluge-console = deluge.ui.console:start", "deluge-console = deluge.ui.console:start",