Skip to content

Commit fd51353

Browse files
authored
Fix usage of IRenderable arguments within UnifiedTreeBuilder.getCmakeExBuildFactory factory. (#229)
The IRenderable objects could be passed through the factory arguments. Do not wrap them in IRenderable (Interpolate) directly inside of the factory. Leave them 'as is' or use "%(kw:val)s" (or util.Transform) if it is necessary to do something with that kind of arguments.
1 parent ae2c242 commit fd51353

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

zorg/buildbot/builders/UnifiedTreeBuilder.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -891,18 +891,18 @@ def norm_target_list_arg(lst):
891891
"depends_on_projects" : ";".join(sorted(f.depends_on_projects)),
892892
"enable_projects" : ";".join(sorted(f.enable_projects)),
893893
"enable_runtimes" : ";".join(sorted(f.enable_runtimes)),
894-
"srcdir" : util.Interpolate(f.monorepo_dir),
895-
"srcdir_relative" : util.Interpolate(LLVMBuildFactory.pathRelativeTo(f.monorepo_dir, f.obj_dir)),
896-
"objdir" : util.Interpolate(f.obj_dir),
894+
"srcdir" : f.monorepo_dir,
895+
"srcdir_relative" : LLVMBuildFactory.pathRelativeTo(f.monorepo_dir, f.obj_dir),
896+
"objdir" : f.obj_dir,
897897
}
898898
),
899899

900900
# This is an incremental build, unless otherwise has been requested.
901901
# Remove obj dirs for a clean build.
902902
steps.RemoveDirectory(
903903
name = f.makeStepName('clean-obj-dir'),
904-
dir = util.Interpolate(f.obj_dir),
905-
description = ["Remove", util.Interpolate(f.obj_dir), "directory"],
904+
dir = f.obj_dir,
905+
description = ["Remove", f.obj_dir, "directory"],
906906
haltOnFailure = False,
907907
flunkOnFailure = False,
908908
doStepIf = lambda step, clean = clean: clean or step.getProperty("clean_obj") == True
@@ -964,8 +964,8 @@ def norm_target_list_arg(lst):
964964
f.addSteps([
965965
steps.RemoveDirectory(
966966
name = f.makeStepName("clean-install-dir"),
967-
dir = util.Interpolate(f.install_dir),
968-
description = ["Remove", util.Interpolate(f.install_dir), "directory"],
967+
dir = f.install_dir,
968+
description = ["Remove", f.install_dir, "directory"],
969969
haltOnFailure = False,
970970
flunkOnFailure = False,
971971
doStepIf = lambda step, clean = clean: clean or step.getProperty("clean_obj") == True

0 commit comments

Comments
 (0)