From 97303b1783e3be567172143b6eabf7cb76191d66 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sat, 11 Oct 2014 20:48:05 +0300 Subject: [PATCH] Renamed man() to install_man(). --- interpreter.py | 5 +++++ test cases/common/10 man install/meson.build | 4 ++-- test cases/common/52 custom install dirs/meson.build | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/interpreter.py b/interpreter.py index af4b9c091..60903f68c 100644 --- a/interpreter.py +++ b/interpreter.py @@ -691,6 +691,7 @@ class Interpreter(): 'test' : self.func_test, 'install_headers' : self.func_install_headers, 'headers' : self.func_headers, + 'install_man' : self.func_install_man, 'man' : self.func_man, 'subdir' : self.func_subdir, 'data' : self.func_data, @@ -1160,6 +1161,10 @@ class Interpreter(): return h def func_man(self, node, args, kwargs): + mlog.log(mlog.bold('Warning! '), 'Function man() is deprecated, please use install_man() instead.') + return self.func_install_man(node, args, kwargs) + + def func_install_man(self, node, args, kwargs): for a in args: if not isinstance(a, str): raise InvalidArguments('Argument %s is not a string.' % str(a)) diff --git a/test cases/common/10 man install/meson.build b/test cases/common/10 man install/meson.build index 107f8b5aa..bf22c8d63 100644 --- a/test cases/common/10 man install/meson.build +++ b/test cases/common/10 man install/meson.build @@ -1,3 +1,3 @@ project('man install', 'c') -m1 = man('foo.1') -m2 = man('bar.2') \ No newline at end of file +m1 = install_man('foo.1') +m2 = install_man('bar.2') \ No newline at end of file diff --git a/test cases/common/52 custom install dirs/meson.build b/test cases/common/52 custom install dirs/meson.build index 4a5372467..dd88ce84b 100644 --- a/test cases/common/52 custom install dirs/meson.build +++ b/test cases/common/52 custom install dirs/meson.build @@ -2,5 +2,5 @@ project('custom install dirs', 'c') executable('prog', 'prog.c', install : true, install_dir : 'dib/dab/dub') install_headers('sample.h', install_dir : 'some/dir') -man('prog.1', install_dir : 'woman') +install_man('prog.1', install_dir : 'woman') data('foobar', 'datafile.cat', install_dir : 'meow')