aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/build.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-11-16 22:03:26 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2016-11-18 17:37:35 -0500
commita01919976eb08277bad78bb22937601cf5a862e0 (patch)
treee366cba35d5e16664c5e3557fd44eb5f17149b07 /mesonbuild/build.py
parent996f4d89f3d60731306a6a72b339eb5c2dbb5020 (diff)
downloadmeson-a01919976eb08277bad78bb22937601cf5a862e0.zip
meson-a01919976eb08277bad78bb22937601cf5a862e0.tar.gz
meson-a01919976eb08277bad78bb22937601cf5a862e0.tar.bz2
Always specify installed data with a File object. Closes #858.
Diffstat (limited to 'mesonbuild/build.py')
-rw-r--r--mesonbuild/build.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index 42cdc57..0e23777 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -1393,11 +1393,13 @@ class ConfigurationData():
# A bit poorly named, but this represents plain data files to copy
# during install.
class Data():
- def __init__(self, in_sourcetree, source_subdir, sources, install_dir):
- self.in_sourcetree = in_sourcetree
- self.source_subdir = source_subdir
+ def __init__(self, sources, install_dir):
self.sources = sources
self.install_dir = install_dir
+ if not isinstance(self.sources, list):
+ self.sources = [self.sources]
+ for s in self.sources:
+ assert(isinstance(s, File))
class InstallScript:
def __init__(self, cmd_arr):