---

yaml
---
r: 323057
b: refs/heads/tensorflow-next
c: 6fef9ed
h: refs/heads/master
i:
  323055: 8151d5a

Author: swift-ci

[refs]

@@ -1461,4 +1461,4 @@ refs/heads/master-rebranch: 86e95c23aa0d37f24ec138b7853146c1cead2e40
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec
-refs/heads/tensorflow-next: f754d30de9fccf1b960f99d4acad9301957ff29d
+refs/heads/tensorflow-next: 6fef9edaaf6b06dc377d9c363dcb85b5e34a070a

branches/tensorflow-next/utils/build-script

@@ -12,6 +12,7 @@
 from __future__ import print_function
 
 import argparse
+import json
 import os
 import pipes
 import platform
@@ -56,6 +57,15 @@ def exit_rejecting_arguments(message, parser=None):
     sys.exit(2)  # 2 is the same as `argparse` error exit code.
 
 
+class JSONDumper(json.JSONEncoder):
+    def __init__(self, *args, **kwargs):
+        json.JSONEncoder.__init__(self, indent=2, separators=(',', ': '),
+                                  *args, **kwargs)
+
+    def default(self, o):
+        return vars(o)
+
+
 class HostSpecificConfiguration(object):
 
     """Configuration information for an individual host."""
@@ -1082,7 +1092,7 @@ def main_preset():
         nargs="*",
         metavar="SUBSTITUTION")
     parser.add_argument(
-        "--expand-build-script-invocation",
+        "--expand-invocation", "--expand-build-script-invocation",
         help="Print the expanded build-script invocation generated "
              "by the preset, but do not run the preset",
         action=arguments.action.optional_bool)
@@ -1092,6 +1102,12 @@ def main_preset():
     parser.add_argument(
         "--build-dir",
         help="specify the directory where build artifact should be stored")
+    parser.add_argument(
+        "--dump-config",
+        help="instead of building, write JSON to stdout containing "
+             "various values used to build in this configuration",
+        action="store_true",
+        default=False)
     args = parser.parse_args()
     if len(args.preset_file_names) == 0:
         args.preset_file_names = [
@@ -1141,6 +1157,8 @@ def main_preset():
     build_script_args = [sys.argv[0]]
     if args.dry_run:
         build_script_args += ["--dry-run"]
+    if args.dump_config:
+        build_script_args += ["--dump-config"]
 
     build_script_args += preset_args
     if args.distcc:
@@ -1158,13 +1176,13 @@ def main_preset():
     if args.cmake_cxx_launcher:
         build_script_args += ["--cmake-cxx-launcher", args.cmake_cxx_launcher]
 
-    diagnostics.note('using preset "{}", which expands to \n\n{}\n'.format(
-        args.preset, shell.quote_command(build_script_args)))
-
-    if args.expand_build_script_invocation:
-        return 0
-
-    shell.call_without_sleeping(build_script_args)
+    printable_command = shell.quote_command(build_script_args)
+    if args.expand_invocation:
+        print(printable_command)
+    else:
+        diagnostics.note('using preset "{}", which expands to \n\n{}\n'.format(
+            args.preset, printable_command))
+        shell.call_without_sleeping(build_script_args)
     return 0
 
 
@@ -1226,6 +1244,10 @@ def main_normal():
     if args.show_sdks:
         debug.print_xcodebuild_versions()
 
+    if args.dump_config:
+        print(JSONDumper().encode(invocation))
+        return 0
+
     # Clean build directory if requested.
     if args.clean:
         clean_delay()

branches/tensorflow-next/utils/build_swift/driver_arguments.py

@@ -287,6 +287,10 @@ def create_argument_parser():
     option(['-n', '--dry-run'], store_true,
            help='print the commands that would be executed, but do not '
                 'execute them')
+    option('--dump-config', toggle_true,
+           help='instead of building, write JSON to stdout containing '
+                'various values used to build in this configuration')
+
     option('--legacy-impl', store_true('legacy_impl'),
            help='use legacy implementation')
 

branches/tensorflow-next/utils/build_swift/tests/expected_options.py

@@ -161,6 +161,7 @@
     'tsan_libdispatch_test': False,
     'long_test': False,
     'lto_type': None,
+    'dump_config': False,
     'show_sdks': False,
     'skip_build': False,
     'stdlib_deployment_targets': None,
@@ -402,6 +403,7 @@ class IgnoreOption(_BaseOption):
     SetTrueOption('--benchmark'),
     SetTrueOption('--clean'),
     SetTrueOption('--dry-run'),
+    SetTrueOption('--dump-config'),
     SetTrueOption('--disable-guaranteed-normal-arguments'),
     SetTrueOption('--enable-stdlibcore-exclusivity-checking'),
     SetTrueOption('--force-optimized-typechecker'),

branches/tensorflow-next/utils/swift_build_support/swift_build_support/diagnostics.py

@@ -19,10 +19,10 @@ def note(message):
     """
     note(message)
 
-    Print a diagnostic notification to the standard output.
+    Print a diagnostic notification to the standard error stream.
     """
-    print(sys.argv[0] + ": note: " + message)
-    sys.stdout.flush()
+    print(sys.argv[0] + ": note: " + message, file=sys.stderr)
+    sys.stderr.flush()
 
 
 def fatal(message):