Addressed review comments to consolidate tbb_root path

erslavin · erslavin · commit f454059f57fe · 2025-08-27T10:44:13.000-04:00
diff --git a/build_scripts/build_usd.py b/build_scripts/build_usd.py
@@ -1037,9 +1037,7 @@ def InstallTBB_Windows(context, force, buildArgs):
                       ),
                       (
                         "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)",
-                        "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)\n" +
-                        "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)\n" +
-                        "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)"
+                        "get_filename_component(_tbb_root \"${_tbb_root}/../..\" ABSOLUTE)"
                       ),
                       (
                         "get_filename_component(_tbb_lib_path \"${_tbb_root}/bin/${_tbb_arch_subdir}/${_tbb_compiler_subdir}\" ABSOLUTE)",
@@ -1180,9 +1178,7 @@ def _RunBuild(arch):
                 ),
                 (
                     "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)",
-                    "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)\n" +
-                    "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)\n" +
-                    "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)"
+                    "get_filename_component(_tbb_root \"${_tbb_root}/../..\" ABSOLUTE)"
                 ),
                 (
                     "get_filename_component(_tbb_lib_path \"${_tbb_root}/lib/${_tbb_arch_subdir}/${_tbb_compiler_subdir}\" ABSOLUTE)",
@@ -1256,9 +1252,7 @@ def InstallTBB_Linux(context, force, buildArgs):
                 ),
                 (
                     "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)",
-                    "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)\n" +
-                    "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)\n" +
-                    "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)"
+                    "get_filename_component(_tbb_root \"${_tbb_root}/../..\" ABSOLUTE)"
                 ),
                 (
                     "get_filename_component(_tbb_lib_path \"${_tbb_root}/lib/${_tbb_arch_subdir}/${_tbb_compiler_subdir}\" ABSOLUTE)",

Original file line number	Diff line number	Diff line change
`@@ -1037,9 +1037,7 @@ def InstallTBB_Windows(context, force, buildArgs):`
`1037`	`1037`	`),`
`1038`	`1038`	`(`
`1039`	`1039`	`"get_filename_component(_tbb_root \"${_tbb_root}\" PATH)",`
`1040`		`- "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)\n" +`
`1041`		`- "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)\n" +`
`1042`		`- "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)"`
	`1040`	`+ "get_filename_component(_tbb_root \"${_tbb_root}/../..\" ABSOLUTE)"`
`1043`	`1041`	`),`
`1044`	`1042`	`(`
`1045`	`1043`	`"get_filename_component(_tbb_lib_path \"${_tbb_root}/bin/${_tbb_arch_subdir}/${_tbb_compiler_subdir}\" ABSOLUTE)",`
`@@ -1180,9 +1178,7 @@ def _RunBuild(arch):`
`1180`	`1178`	`),`
`1181`	`1179`	`(`
`1182`	`1180`	`"get_filename_component(_tbb_root \"${_tbb_root}\" PATH)",`
`1183`		`- "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)\n" +`
`1184`		`- "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)\n" +`
`1185`		`- "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)"`
	`1181`	`+ "get_filename_component(_tbb_root \"${_tbb_root}/../..\" ABSOLUTE)"`
`1186`	`1182`	`),`
`1187`	`1183`	`(`
`1188`	`1184`	`"get_filename_component(_tbb_lib_path \"${_tbb_root}/lib/${_tbb_arch_subdir}/${_tbb_compiler_subdir}\" ABSOLUTE)",`
`@@ -1256,9 +1252,7 @@ def InstallTBB_Linux(context, force, buildArgs):`
`1256`	`1252`	`),`
`1257`	`1253`	`(`
`1258`	`1254`	`"get_filename_component(_tbb_root \"${_tbb_root}\" PATH)",`
`1259`		`- "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)\n" +`
`1260`		`- "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)\n" +`
`1261`		`- "get_filename_component(_tbb_root \"${_tbb_root}\" PATH)"`
	`1255`	`+ "get_filename_component(_tbb_root \"${_tbb_root}/../..\" ABSOLUTE)"`
`1262`	`1256`	`),`
`1263`	`1257`	`(`
`1264`	`1258`	`"get_filename_component(_tbb_lib_path \"${_tbb_root}/lib/${_tbb_arch_subdir}/${_tbb_compiler_subdir}\" ABSOLUTE)",`