Merge pull request #19076 from Rightpoint:bugfix/colejd/fix-path-resolution-bugs

Fix path resolution bugs for XCFramework builds

* Fix incorrect paths for intermediate frameworks

* Remove unnecessary `./` prepend preventing use of absolute paths
This commit is contained in:
Jonathan Cole 2020-12-11 02:14:28 -05:00 committed by GitHub
parent fce8d8e090
commit 9f52244574
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -74,7 +74,7 @@ if __name__ == "__main__":
build_folders = []
def get_or_create_build_folder(base_dir, platform):
build_folder = "./{}/{}".format(base_dir, platform).replace(" ", "\\ ") # Escape spaces in output path
build_folder = "{}/{}".format(base_dir, platform).replace(" ", "\\ ") # Escape spaces in output path
pathlib.Path(build_folder).mkdir(parents=True, exist_ok=True)
return build_folder
@ -122,7 +122,7 @@ if __name__ == "__main__":
xcframework_path,
]
for folder in build_folders:
xcframework_build_command += ["-framework", xcframework_path]
xcframework_build_command += ["-framework", "{}/{}.framework".format(folder, args.framework_name)]
execute(xcframework_build_command, cwd=os.getcwd())
print("")