Attachment 22267 Details for Bug 19759 – as committed into openbsd

[patch] as committed into openbsd

patch-butterfly_wscript (text/plain), 2.15 KB, created by Jasper Lievisse Adriaanse on 2009-01-27 00:23:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jasper Lievisse Adriaanse

Created: 2009-01-27 00:23:42 UTC

Size: 2.15 KB

patch

obsolete

>--- wscript.orig	Tue Jan  6 13:46:52 2009
>+++ wscript	Fri Jan 23 00:27:35 2009
>@@ -6,26 +6,23 @@ APPNAME = 'telepathy-butterfly'
> srcdir = '.'
> blddir = '_build_'
> 
>-import Scripting
>-
>-Scripting.g_gz = 'gz'
>-Scripting.g_excludes.extend(['pymsn', 'telepathy', 'dist'])
>-
>-
> def set_options(opt):
>     opt.tool_options('python')
>-    opt.tool_options('gnu_dirs', 'tools')
>+    opt.tool_options('gnu_dirs')
>+    opt.tool_options ('compiler_cc')
> 
> def configure(conf):
>     conf.check_tool('python misc')
>-    conf.check_tool('gnu_dirs', 'tools')
>+    conf.check_tool('gnu_dirs')
> 
>     conf.check_python_version()
> 
>+    conf.check_tool ('compiler_cc')
>+
>     conf.define('VERSION', VERSION)
>     conf.define('PACKAGE', APPNAME)
> 
> def build(bld):
>     bld.add_subdirs('butterfly data')
>-    install_files('LIBEXECDIR', '', 'telepathy-butterfly', chmod=0755)
>+    bld.install_files('${LIBEXECDIR}', 'telepathy-butterfly', chmod=0755)
>
>--- butterfly/wscript.orig	Fri Dec 19 18:52:53 2008
>+++ butterfly/wscript	Fri Jan 23 00:54:26 2009
>@@ -5,7 +5,7 @@ import os.path
> def build(bld):
>     src_loc = ['.', 'util', 'channel']
>     for loc in src_loc:
>-        obj = bld.create_obj('py')
>-        obj.find_sources_in_dirs(loc)
>-        obj.inst_dir = os.path.join('butterfly', loc)
>+        obj = bld.new_task_gen('py')
>+        obj.find_sources_in_dirs(loc, exts=['.py'])
>+        obj.install_path = os.path.join('/usr/local/lib/python2.5/site-packages/butterfly', loc)
> 
>--- data/wscript.orig	Fri Dec 19 18:52:53 2008
>+++ data/wscript	Fri Jan 23 00:28:05 2009
>@@ -1,12 +1,11 @@
> #!/usr/bin/env python
> 
> def build(bld):
>-	import Common
>-	obj_rep = bld.create_obj('subst')
>+	obj_rep = bld.new_task_gen('subst')
> 	obj_rep.source = 'org.freedesktop.Telepathy.ConnectionManager.butterfly.service.in'
> 	obj_rep.target = 'org.freedesktop.Telepathy.ConnectionManager.butterfly.service'
> 
>-	Common.install_files('DATADIR', 'telepathy/managers/', 'butterfly.manager')
>-	Common.install_files('DATADIR', 'dbus-1/services/',
>+	bld.install_files('DATADIR/telepathy/managers/', 'butterfly.manager')
>+	bld.install_files('DATADIR/dbus-1/services/',
> 	        'org.freedesktop.Telepathy.ConnectionManager.butterfly.service')
>

Actions: View | Splinter Review

Attachments on bug 19759: 22267

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.