Renamed headers() to install_headers().

pull/15/head
Jussi Pakkanen 11 years ago
parent 56fba53130
commit 65974b4dad
  1. 5
      interpreter.py
  2. 2
      test cases/common/51 pkgconfig-gen/meson.build
  3. 2
      test cases/common/52 custom install dirs/meson.build
  4. 4
      test cases/common/9 header install/meson.build

@ -689,6 +689,7 @@ class Interpreter():
'run_target' : self.func_run_target,
'generator' : self.func_generator,
'test' : self.func_test,
'install_headers' : self.func_install_headers,
'headers' : self.func_headers,
'man' : self.func_man,
'subdir' : self.func_subdir,
@ -1146,6 +1147,10 @@ class Interpreter():
mlog.debug('Adding test "', mlog.bold(args[0]), '".', sep='')
def func_headers(self, node, args, kwargs):
mlog.log(mlog.bold('Warning! '), 'Function headers() is deprecated, please use install_headers() instead.')
return self.func_install_headers(node, args, kwargs)
def func_install_headers(self, node, args, kwargs):
args = self.flatten(args)
for a in args:
if not isinstance(a, str):

@ -2,7 +2,7 @@ project('pkgconfig-gen', 'c')
lib = shared_library('simple', 'simple.c', install : true)
libver = '1.0'
h = headers('simple.h')
h = install_headers('simple.h')
pkgconfig_gen(libraries : lib, subdirs : '.', version : libver,
name : 'libsimple', filebase : 'simple', description : 'A simple demo library.')

@ -1,6 +1,6 @@
project('custom install dirs', 'c')
executable('prog', 'prog.c', install : true, install_dir : 'dib/dab/dub')
headers('sample.h', install_dir : 'some/dir')
install_headers('sample.h', install_dir : 'some/dir')
man('prog.1', install_dir : 'woman')
data('foobar', 'datafile.cat', install_dir : 'meow')

@ -2,5 +2,5 @@ project('header install', 'c')
as_array = ['subdir.h']
h1 = headers('rootdir.h')
h2 = headers(as_array, subdir : 'subdir')
h1 = install_headers('rootdir.h')
h2 = install_headers(as_array, subdir : 'subdir')

Loading…
Cancel
Save