comparison mxtool/mx.py @ 16670:4ae1d1ed5cc1

fixed regression in use of -f option to 'mx build'
author Doug Simon <doug.simon@oracle.com>
date Fri, 01 Aug 2014 11:36:08 +0200
parents 1d4313c3ab38
children 7cdd7ede912d
comparison
equal deleted inserted replaced
16669:ac6cbf6570dd 16670:4ae1d1ed5cc1
2238 outputDir = prepareOutputDirs(p, args.clean) 2238 outputDir = prepareOutputDirs(p, args.clean)
2239 2239
2240 sourceDirs = p.source_dirs() 2240 sourceDirs = p.source_dirs()
2241 buildReason = 'forced build' if args.force else None 2241 buildReason = 'forced build' if args.force else None
2242 taskDeps = [] 2242 taskDeps = []
2243 if not buildReason: 2243 for dep in p.all_deps([], includeLibs=False, includeAnnotationProcessors=True):
2244 for dep in p.all_deps([], includeLibs=False, includeAnnotationProcessors=True): 2244 taskDep = tasks.get(dep.name)
2245 taskDep = tasks.get(dep.name) 2245 if taskDep:
2246 if taskDep: 2246 if not buildReason:
2247 if not buildReason: 2247 buildReason = dep.name + ' rebuilt'
2248 buildReason = dep.name + ' rebuilt' 2248 taskDeps.append(taskDep)
2249 taskDeps.append(taskDep)
2250 2249
2251 jasminAvailable = None 2250 jasminAvailable = None
2252 javafilelist = [] 2251 javafilelist = []
2253 for sourceDir in sourceDirs: 2252 for sourceDir in sourceDirs:
2254 for root, _, files in os.walk(sourceDir): 2253 for root, _, files in os.walk(sourceDir):