diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-02-10 01:56:59 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-02-10 01:56:59 +0200 |
| commit | ed53c4f5acea9f4134985ffa81d72aec0ec7a18c (patch) | |
| tree | efce8f985ec16ca0cde8ec75d3f28288067d7822 | |
| parent | 128547b1ecd00bfe83596a53b0be8dd5ab1830eb (diff) | |
| download | meson-ed53c4f5acea9f4134985ffa81d72aec0ec7a18c.zip meson-ed53c4f5acea9f4134985ffa81d72aec0ec7a18c.tar.gz meson-ed53c4f5acea9f4134985ffa81d72aec0ec7a18c.tar.bz2 | |
Removed install method from BuildTarget.
| -rwxr-xr-x | interpreter.py | 7 | ||||
| -rw-r--r-- | test cases/8 install/builder.txt | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/interpreter.py b/interpreter.py index d90c287..7e5a36c 100755 --- a/interpreter.py +++ b/interpreter.py @@ -152,7 +152,6 @@ class BuildTarget(InterpreterObject): self.include_dirs = [] self.methods.update({'add_dep': self.add_dep_method, 'link' : self.link_method, - 'install': self.install_method, 'pch' : self.pch_method, 'add_include_dirs': self.add_include_dirs_method, 'add_compiler_args' : self.add_compiler_args_method, @@ -218,11 +217,6 @@ class BuildTarget(InterpreterObject): raise InvalidArguments('Link target is not library.') self.link_targets.append(target) - def install_method(self, args, kwargs): - if len(args) != 0 or len(kwargs) != 0: - raise InvalidArguments('Install() takes no arguments.') - self.need_install = True - def pch_method(self, args): if len(args) == 0: raise InvalidArguments('Pch requires arguments.') @@ -265,7 +259,6 @@ class StaticLibrary(BuildTarget): suffix = environment.get_static_lib_suffix() self.filename = prefix + self.name + '.' + suffix - class SharedLibrary(BuildTarget): def __init__(self, name, subdir, sources, environment, kwargs): BuildTarget.__init__(self, name, subdir, sources, kwargs) diff --git a/test cases/8 install/builder.txt b/test cases/8 install/builder.txt index 22efa5f..677a2ee 100644 --- a/test cases/8 install/builder.txt +++ b/test cases/8 install/builder.txt @@ -1,8 +1,5 @@ project('install test', 'c') -stlib = static_library('stat', 'stat.c') -shlib = shared_library('shar', 'shar.c') +stlib = static_library('stat', 'stat.c', install : true) +shlib = shared_library('shar', 'shar.c', install : true) exe = executable('prog', 'prog.c', install : true) - -stlib.install() -shlib.install() |