Mercurial > hg > truffle
comparison mx/mx_graal_makefile.py @ 21916:3df76a0300f3
jvmci.make remove generated source from search path; export compilers into a different directory when jvmci is disabled: jre/lib/<arch>/(server|client)-nojvmci/
author | Stefan Anzinger <stefan.anzinger@oracle.com> |
---|---|
date | Thu, 11 Jun 2015 11:07:28 +0200 |
parents | 1a6a520af3b5 |
children | 0df6a0cb4b5f |
comparison
equal
deleted
inserted
replaced
21915:3fe55394241c | 21916:3df76a0300f3 |
---|---|
107 if p.definedAnnotationProcessors != None and p.definedAnnotationProcessorsDist != dist: | 107 if p.definedAnnotationProcessors != None and p.definedAnnotationProcessorsDist != dist: |
108 update_list(annotationProcessorDeps, [p]) | 108 update_list(annotationProcessorDeps, [p]) |
109 for p in projects: | 109 for p in projects: |
110 projectDir = path_dist_relative(p.dir) | 110 projectDir = path_dist_relative(p.dir) |
111 if p not in distDepProjects and p not in annotationProcessorDeps: | 111 if p not in distDepProjects and p not in annotationProcessorDeps: |
112 generatedSource = [path_dist_relative(p.source_gen_dir())] if len(annotationProcessorDeps) > 0 else [] | 112 for src in [projectDir + os.path.sep + d for d in p.srcDirs]: |
113 | |
114 for d in p.srcDirs + generatedSource: | |
115 src = projectDir + os.path.sep + d | |
116 sources.append("$(shell find {} -type f 2> /dev/null)".format(src)) | 113 sources.append("$(shell find {} -type f 2> /dev/null)".format(src)) |
117 metaInf = src + os.path.sep + "META-INF" | 114 metaInf = src + os.path.sep + "META-INF" |
118 if os.path.exists(metaInf): | 115 if os.path.exists(metaInf): |
119 resources.append(metaInf) | 116 resources.append(metaInf) |
120 | 117 |