diff options
| -rw-r--r-- | backends.py | 37 | ||||
| -rw-r--r-- | build.py | 1 | ||||
| -rw-r--r-- | environment.py | 6 |
3 files changed, 40 insertions, 4 deletions
diff --git a/backends.py b/backends.py index 03be9a5..4d497cd 100644 --- a/backends.py +++ b/backends.py @@ -178,6 +178,10 @@ class Backend(): name = target.get_basename() if name in self.processed_targets: return + if isinstance(target, build.Jar): + self.generate_jar_target(target, outfile) + return + # The following deals with C/C++ compilation. (gen_src_deps, gen_other_deps) = self.process_dep_gens(outfile, target) self.process_target_dependencies(target, outfile) self.generate_custom_generator_rules(target, outfile) @@ -237,6 +241,36 @@ class Backend(): self.generate_shlib_aliases(target, self.get_target_dir(target), outfile, elem) self.processed_targets[name] = True + def generate_jar_target(self, target, outfile): + fname = target.get_filename() + subdir = target.get_subdir() + outname_rel = os.path.join(subdir, fname) + src_list = target.get_sources() + obj_list = [] + compiler = self.get_compiler_for_source(src_list[0]) + assert(compiler.get_language() == 'java') + for src in src_list: + obj_list.append(self.generate_single_java_compile(src, target, compiler, outfile)) + jar_rule = 'JAR_LINK' + commands = ['c'] + elem = NinjaBuildElement(outname_rel, jar_rule, obj_list) + elem.add_item('LINK_FLAGS', commands) + return elem + + def generate_single_java_compile(self, src, target, compiler, outfile): + buildtype = self.environment.coredata.buildtype + args = [] + if buildtype == 'debug': + args += compiler.get_debug_flags() + args += compiler.get_output_flags(self.get_target_dir(target)) + rel_src = os.path.join(self.build_to_src, src) + rel_obj = os.path.join(target.get_subdir(), src[:-4] + 'class') + element = NinjaBuildElement(rel_obj, + compiler.get_language() + '_COMPILER', rel_src) + element.add_item('FLAGS', args) + element.write(outfile) + return rel_obj + def determine_linker(self, target, src): if isinstance(target, build.StaticLibrary): return self.build.static_linker @@ -365,6 +399,7 @@ class NinjaBuildElement(): self.outfilenames = [outfilenames] else: self.outfilenames = outfilenames + assert(isinstance(rule, str)) self.rule = rule if isinstance(infilenames, str): self.infilenames = [infilenames] @@ -401,7 +436,7 @@ class NinjaBuildElement(): line += ' || ' + ' '.join([ninja_quote(x) for x in self.orderdeps]) line += '\n' outfile.write(line) - + for e in self.elems: (name, elems) = e should_quote = True @@ -524,6 +524,7 @@ class Jar(BuildTarget): for s in self.sources: if not s.endswith('.java'): raise InvalidArguments('Jar source %s is not a java file.' % s) + self.filename = self.name + '.jar' class ConfigureFile(): diff --git a/environment.py b/environment.py index 90cfad3..b3cbcaf 100644 --- a/environment.py +++ b/environment.py @@ -94,7 +94,7 @@ class CCompiler(): def get_output_flags(self, target): return ['-o', target] - + def get_linker_output_flags(self, outputname): return ['-o', outputname] @@ -436,8 +436,8 @@ class JavaCompiler(): def get_compile_only_flags(self): return [] - def get_output_flags(self, target): - return [] + def get_output_flags(self, subdir): + return ['-d', subdir, '-s', subdir] def get_linker_output_flags(self, outputname): return [] |