Skip to content

swift_build_sdk_interfaces.py: adjust output directory path to an SDK-versioned directory #33691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 29, 2020
Merged

swift_build_sdk_interfaces.py: adjust output directory path to an SDK-versioned directory #33691

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions utils/swift_build_sdk_interfaces.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,14 @@ def process_module_files(pool, module_files):
return overall_exit_status


def getSDKVersion(sdkroot):
settingPath = os.path.join(sdkroot, 'SDKSettings.json')
with open(settingPath) as json_file:
data = json.load(json_file)
return data['Version']
fatal("Failed to get SDK version from: " + settingPath)


def main():
global args, shared_output_lock
parser = create_parser()
Expand All @@ -373,6 +381,12 @@ def main():
if not os.path.isdir(args.sdk):
fatal("invalid SDK: " + args.sdk)

# if the given output dir ends with 'prebuilt-modules', we should
# append the SDK version number so all modules will built into
# the SDK-versioned sub-directory.
if os.path.basename(args.output_dir) == 'prebuilt-modules':
args.output_dir = os.path.join(args.output_dir, getSDKVersion(args.sdk))

xfails = ()
if args.ignore_non_stdlib_failures:
if args.xfails:
Expand Down