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
parent bdd9bd11b5
commit 4234583fc7

View File

@ -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",