From 78805e5cd467c38bf847e470d1fb551ea3ec1aee Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 9 Jul 2009 19:08:37 +0100 Subject: [PATCH] Don't build Desktop file on Win32 --- wscript | 65 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/wscript b/wscript index 3462244a..b429214b 100644 --- a/wscript +++ b/wscript @@ -400,39 +400,40 @@ def build (bld): bld.add_subdirs ('docs/api') bld.install_files ('${DOCDIR}/midori/api/', blddir + '/docs/api/*') - if bld.env['HAVE_HILDON']: - appdir = '${MDATADIR}/applications/hildon' - bld.install_files ('${MDATADIR}/dbus-1/services', - 'data/com.nokia.' + APPNAME + '.service') - else: - appdir = '${MDATADIR}/applications' - if bld.env['INTLTOOL']: - obj = bld.new_task_gen ('intltool_in') - obj.source = 'data/' + APPNAME + '.desktop.in' - obj.install_path = appdir - obj.flags = ['-d', '-c'] - bld.install_files (appdir, 'data/' + APPNAME + '.desktop') - else: - folder = os.path.abspath (blddir + '/default/data') - Utils.check_dir (folder) - desktop = APPNAME + '.desktop' - pre = open ('data/' + desktop + '.in') - after = open (folder + '/' + desktop, 'w') - try: + if not is_mingw (bld.env) and Options.platform != 'win32': + if bld.env['HAVE_HILDON']: + appdir = '${MDATADIR}/applications/hildon' + bld.install_files ('${MDATADIR}/dbus-1/services', + 'data/com.nokia.' + APPNAME + '.service') + else: + appdir = '${MDATADIR}/applications' + if bld.env['INTLTOOL']: + obj = bld.new_task_gen ('intltool_in') + obj.source = 'data/' + APPNAME + '.desktop.in' + obj.install_path = appdir + obj.flags = ['-d', '-c'] + bld.install_files (appdir, 'data/' + APPNAME + '.desktop') + else: + folder = os.path.abspath (blddir + '/default/data') + Utils.check_dir (folder) + desktop = APPNAME + '.desktop' + pre = open ('data/' + desktop + '.in') + after = open (folder + '/' + desktop, 'w') try: - for line in pre: - if line != '': - if line[0] == '_': - after.write (line[1:]) - else: - after.write (line) - after.close () - Utils.pprint ('BLUE', desktop + '.in -> ' + desktop) - bld.install_files (appdir, folder + '/' + desktop) - except: - Utils.pprint ('BLUE', 'File ' + desktop + ' not generated') - finally: - pre.close () + try: + for line in pre: + if line != '': + if line[0] == '_': + after.write (line[1:]) + else: + after.write (line) + after.close () + Utils.pprint ('BLUE', desktop + '.in -> ' + desktop) + bld.install_files (appdir, folder + '/' + desktop) + except: + Utils.pprint ('BLUE', 'File ' + desktop + ' not generated') + finally: + pre.close () if bld.env['RSVG_CONVERT']: Utils.check_dir (blddir + '/data')