aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2014-10-11 20:56:32 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2014-10-11 20:56:32 +0300
commit8aa45655b767a9ebf4028c3e7a4d17a0d777c44b (patch)
tree58d2c0d58fd343caf9148b26f7456dfc9d64d462
parent97303b1783e3be567172143b6eabf7cb76191d66 (diff)
downloadmeson-8aa45655b767a9ebf4028c3e7a4d17a0d777c44b.zip
meson-8aa45655b767a9ebf4028c3e7a4d17a0d777c44b.tar.gz
meson-8aa45655b767a9ebf4028c3e7a4d17a0d777c44b.tar.bz2
Renamed data() to install_data().
-rw-r--r--interpreter.py5
-rw-r--r--test cases/common/12 data/meson.build2
-rw-r--r--test cases/common/52 custom install dirs/meson.build2
3 files changed, 7 insertions, 2 deletions
diff --git a/interpreter.py b/interpreter.py
index 60903f6..8b121f2 100644
--- a/interpreter.py
+++ b/interpreter.py
@@ -694,6 +694,7 @@ class Interpreter():
'install_man' : self.func_install_man,
'man' : self.func_man,
'subdir' : self.func_subdir,
+ 'install_data' : self.func_install_data,
'data' : self.func_data,
'configure_file' : self.func_configure_file,
'include_directories' : self.func_include_directories,
@@ -1207,6 +1208,10 @@ class Interpreter():
self.subdir = prev_subdir
def func_data(self, node, args, kwargs):
+ mlog.log(mlog.bold('Warning! '), 'Function data() is deprecated, please use install_data() instead.')
+ return self.func_install_data(node, args, kwargs)
+
+ def func_install_data(self, node, args, kwargs):
if len(args ) < 1:
raise InvalidArguments('Data function must have at least one argument: the subdirectory.')
for a in args:
diff --git a/test cases/common/12 data/meson.build b/test cases/common/12 data/meson.build
index f529bac..ea9cfd7 100644
--- a/test cases/common/12 data/meson.build
+++ b/test cases/common/12 data/meson.build
@@ -1,2 +1,2 @@
project('data install test', 'c')
-data('progname', sources : 'datafile.dat')
+install_data('progname', sources : 'datafile.dat')
diff --git a/test cases/common/52 custom install dirs/meson.build b/test cases/common/52 custom install dirs/meson.build
index dd88ce8..8f929b8 100644
--- a/test cases/common/52 custom install dirs/meson.build
+++ b/test cases/common/52 custom install dirs/meson.build
@@ -3,4 +3,4 @@ project('custom install dirs', 'c')
executable('prog', 'prog.c', install : true, install_dir : 'dib/dab/dub')
install_headers('sample.h', install_dir : 'some/dir')
install_man('prog.1', install_dir : 'woman')
-data('foobar', 'datafile.cat', install_dir : 'meow')
+install_data('foobar', 'datafile.cat', install_dir : 'meow')