Skip to content

Fix build-script --dump-config #29337

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
Jan 22, 2020
Merged

Fix build-script --dump-config #29337

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
11 changes: 8 additions & 3 deletions utils/build-script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ from build_swift.build_swift import driver_arguments
from build_swift.build_swift import migration
from build_swift.build_swift import presets

import six

from swift_build_support.swift_build_support import (
debug,
diagnostics,
Expand Down Expand Up @@ -59,11 +61,14 @@ def exit_rejecting_arguments(message, parser=None):

class JSONDumper(json.JSONEncoder):
def __init__(self, *args, **kwargs):
json.JSONEncoder.__init__(self, indent=2, separators=(',', ': '),
*args, **kwargs)
json.JSONEncoder.__init__(
self, indent=2, separators=(',', ': '), sort_keys=True,
*args, **kwargs)

def default(self, o):
return vars(o)
if hasattr(o, '__dict__'):
return vars(o)
return six.text_type(o)


class BuildScriptInvocation(object):
Expand Down