From 9ac15d7a4ba348f271fcb88c2fb836c688d6c653 Mon Sep 17 00:00:00 2001 From: Uleat Date: Wed, 24 Jul 2019 22:48:51 -0400 Subject: [PATCH] Fix for false elevation of priority in 'vcxproj_dependencies' [skip ci] --- utils/scripts/vcxproj_dependencies.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/utils/scripts/vcxproj_dependencies.py b/utils/scripts/vcxproj_dependencies.py index ff53b70f7..c7bcf0e00 100644 --- a/utils/scripts/vcxproj_dependencies.py +++ b/utils/scripts/vcxproj_dependencies.py @@ -555,18 +555,22 @@ def check_for_version_discrepancies(): for priority in priorities: if hints[library][reference][priority] == '': continue + hint_found = False for hint in hints[library][reference][priority].split('|'): if not find_hint_in_path(hint, path) == -1: - if priority > context_tree[project][build][resource][library][reference]: - context_tree[project][build][resource][library][reference] = priority - if context_tree[project][build][resource][library][reference] >\ - build_priorities[build][library]: - build_priorities[build][library] =\ - context_tree[project][build][resource][library][reference] - if context_tree[project][build][resource][library][reference] >\ - global_priorities[library]: - global_priorities[library] =\ - context_tree[project][build][resource][library][reference] + context_tree[project][build][resource][library][reference] = priority + if context_tree[project][build][resource][library][reference] >\ + build_priorities[build][library]: + build_priorities[build][library] =\ + context_tree[project][build][resource][library][reference] + if context_tree[project][build][resource][library][reference] >\ + global_priorities[library]: + global_priorities[library] =\ + context_tree[project][build][resource][library][reference] + hint_found = True + break + if hint_found is True: + break # loop for dumping 'global_priorities' twrite('{0}'.format(col1)) for library in libraries: