Removed install method from BuildTarget.

pull/15/head
Jussi Pakkanen 12 years ago
parent 128547b1ec
commit ed53c4f5ac
  1. 7
      interpreter.py
  2. 7
      test cases/8 install/builder.txt

@ -152,7 +152,6 @@ class BuildTarget(InterpreterObject):
self.include_dirs = [] self.include_dirs = []
self.methods.update({'add_dep': self.add_dep_method, self.methods.update({'add_dep': self.add_dep_method,
'link' : self.link_method, 'link' : self.link_method,
'install': self.install_method,
'pch' : self.pch_method, 'pch' : self.pch_method,
'add_include_dirs': self.add_include_dirs_method, 'add_include_dirs': self.add_include_dirs_method,
'add_compiler_args' : self.add_compiler_args_method, 'add_compiler_args' : self.add_compiler_args_method,
@ -218,11 +217,6 @@ class BuildTarget(InterpreterObject):
raise InvalidArguments('Link target is not library.') raise InvalidArguments('Link target is not library.')
self.link_targets.append(target) 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): def pch_method(self, args):
if len(args) == 0: if len(args) == 0:
raise InvalidArguments('Pch requires arguments.') raise InvalidArguments('Pch requires arguments.')
@ -265,7 +259,6 @@ class StaticLibrary(BuildTarget):
suffix = environment.get_static_lib_suffix() suffix = environment.get_static_lib_suffix()
self.filename = prefix + self.name + '.' + suffix self.filename = prefix + self.name + '.' + suffix
class SharedLibrary(BuildTarget): class SharedLibrary(BuildTarget):
def __init__(self, name, subdir, sources, environment, kwargs): def __init__(self, name, subdir, sources, environment, kwargs):
BuildTarget.__init__(self, name, subdir, sources, kwargs) BuildTarget.__init__(self, name, subdir, sources, kwargs)

@ -1,8 +1,5 @@
project('install test', 'c') project('install test', 'c')
stlib = static_library('stat', 'stat.c') stlib = static_library('stat', 'stat.c', install : true)
shlib = shared_library('shar', 'shar.c') shlib = shared_library('shar', 'shar.c', install : true)
exe = executable('prog', 'prog.c', install : true) exe = executable('prog', 'prog.c', install : true)
stlib.install()
shlib.install()

Loading…
Cancel
Save