Skip to content

[pull] swiftwasm from main #2023

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 2 commits into from
Oct 17, 2020
Merged

[pull] swiftwasm from main #2023

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9ade70
swift_build_sdk_interfaces.py: create directory under dry-run mode
nkcsgexi Oct 16, 2020
3029ce8
Merge pull request #34336 from nkcsgexi/67951012-2
nkcsgexi Oct 17, 2020
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
10 changes: 4 additions & 6 deletions utils/swift_build_sdk_interfaces.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,7 @@ def run_command(args, dry_run):
raise


def make_dirs_if_needed(path, dry_run):
if dry_run:
return
def make_dirs_if_needed(path):
try:
os.makedirs(path)
except OSError as e:
Expand Down Expand Up @@ -232,7 +230,7 @@ def log_output_to_file(content, module_name, interface_base, label, log_path):
return
if not content:
return
make_dirs_if_needed(log_path, dry_run=False)
make_dirs_if_needed(log_path)
log_name = module_name + "-" + interface_base + "-" + label + ".txt"
with open(os.path.join(log_path, log_name), "w") as output_file:
output_file.write(content)
Expand Down Expand Up @@ -296,7 +294,7 @@ def process_module(module_file):
module_file.name + ".swiftmodule")

if interface_base != module_file.name:
make_dirs_if_needed(output_path, args.dry_run)
make_dirs_if_needed(output_path)
output_path = os.path.join(output_path,
interface_base + ".swiftmodule")

Expand Down Expand Up @@ -408,7 +406,7 @@ def main():
with open(args.xfails) as xfails_file:
xfails = json.load(xfails_file)

make_dirs_if_needed(args.output_dir, args.dry_run)
make_dirs_if_needed(args.output_dir)

# Copy a file containing SDK build version into the prebuilt module dir,
# so we can keep track of the SDK version we built from.
Expand Down