diff options
-rw-r--r-- | .gitignore | 5 | ||||
-rw-r--r-- | src/wscript | 6 | ||||
-rw-r--r-- | test/README | 4 | ||||
-rwxr-xr-x | waf | bin | 0 -> 83005 bytes | |||
-rw-r--r-- | wscript | 37 |
5 files changed, 23 insertions, 29 deletions
@@ -1,11 +1,13 @@ # top-level .gitignore *~ + .*.sw? .deps .libs -.lock-wscript +.lock* .perf .waf* + *.la *.lo *.orig @@ -51,4 +53,3 @@ releases stamp-h stamp-h1 stamp-h.in -waf diff --git a/src/wscript b/src/wscript index 9994780..69c6322 100644 --- a/src/wscript +++ b/src/wscript @@ -11,15 +11,15 @@ def build(ctx): 'python'+ctx.env['PYTHON_VERSION'], 'site-packages', 'cairo') # .py files - ctx.new_task_gen( + ctx( features = 'py', source = '__init__.py', install_path = pycairoLibDir, ) # C extension module - ctx.new_task_gen( - features = 'cc cshlib pyext', + ctx( + features = 'c cshlib pyext', source = ['cairomodule.c', 'context.c', 'font.c', diff --git a/test/README b/test/README index 15a9b7d..799fcb7 100644 --- a/test/README +++ b/test/README @@ -2,8 +2,8 @@ pycairo tests ------------- The main test files are the '*_test.py' files. -They use py.test from pylib. -http://codespeak.net/py/dist/ +They use py.test. +http://pytest.org/ $ cd test $ py.test Binary files differ@@ -8,29 +8,21 @@ d = top APPNAME='py2cairo' VERSION='1.8.11' -cairo_version_required = '1.8.10' +cairo_version_required = '1.10.0' -def set_options(ctx): - print(' %s/set_options()' %d) +def options(ctx): + print(' %s/options()' %d) ctx.tool_options('gnu_dirs') ctx.tool_options('compiler_cc') ctx.tool_options('python') # options for disabling pyc or pyo compilation -def init(): - print(' %s/init()' %d) - -def shutdown(): - print(' %s/shutdown()' %d) - - def configure(ctx): print(' %s/configure()' %d) env = ctx.env ctx.check_tool('gnu_dirs') - ctx.check_tool('misc') ctx.check_tool('compiler_cc') ctx.check_tool('python') ctx.check_python_version((2,6,0)) @@ -57,18 +49,20 @@ def configure(ctx): def build(ctx): print(' %s/build()' %d) - ctx.add_subdirs('src') + ctx.recurse('src') # generate and install the .pc file - obj = ctx.new_task_gen('subst') - obj.source = 'pycairo.pc.in' - obj.target = 'pycairo.pc' - obj.dict = { - 'VERSION' : VERSION, - 'prefix' : ctx.env['PREFIX'], - 'includedir': os.path.join(ctx.env['PREFIX'], 'include'), - } - obj.install_path = os.path.join(ctx.env['LIBDIR'], 'pkgconfig') + ctx( + features = 'subst', + source = 'pycairo.pc.in', + target = 'pycairo.pc', + dct = { + 'VERSION' : VERSION, + 'prefix' : ctx.env['PREFIX'], + 'includedir': os.path.join(ctx.env['PREFIX'], 'include'), + }, + install_path = os.path.join(ctx.env['LIBDIR'], 'pkgconfig'), + ) def dist_hook(): @@ -93,4 +87,3 @@ def dist_hook(): for f in os.listdir(D): if f.endswith(('.pdf', '.png', '.ps', '.svg')): os.remove(os.path.join(D, f)) - |