Merge pull request swiftlang#29243 from Rostepher/reorganize-build-swift-module

Rostepher · web-flow · commit a8e5a04fff08 · 2020-01-15T23:11:57.000-08:00
[NFC][Build System: build-script] Re-organized the build_swift module
diff --git a/utils/build-parser-lib b/utils/build-parser-lib
@@ -30,7 +30,7 @@ import os
 import platform
 import sys
 
-from build_swift import argparse, defaults
+from build_swift.build_swift import argparse, defaults
 from swift_build_support.swift_build_support import (
     shell,
     xcrun,
diff --git a/utils/build-script b/utils/build-script
@@ -19,10 +19,10 @@ import platform
 import sys
 import time
 
-from build_swift import defaults
-from build_swift import driver_arguments
-from build_swift import presets
-from build_swift.migration import migrate_swift_sdks
+from build_swift.build_swift import defaults
+from build_swift.build_swift import driver_arguments
+from build_swift.build_swift import presets
+from build_swift.build_swift.migration import migrate_swift_sdks
 
 from swift_build_support.swift_build_support import (
     arguments,
diff --git a/utils/build_swift/__init__.py b/utils/build_swift/__init__.py
@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See https://swift.org/LICENSE.txt for license information
diff --git a/utils/build_swift/build_swift/__init__.py b/utils/build_swift/build_swift/__init__.py
@@ -0,0 +1,7 @@
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See https://swift.org/LICENSE.txt for license information
+# See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
diff --git a/utils/build_swift/build_swift/argparse/__init__.py b/utils/build_swift/build_swift/argparse/__init__.py
@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See https://swift.org/LICENSE.txt for license information
diff --git a/utils/build_swift/build_swift/argparse/actions.py b/utils/build_swift/build_swift/argparse/actions.py
@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See https://swift.org/LICENSE.txt for license information
diff --git a/utils/build_swift/build_swift/argparse/parser.py b/utils/build_swift/build_swift/argparse/parser.py
diff --git a/utils/build_swift/build_swift/argparse/types.py b/utils/build_swift/build_swift/argparse/types.py
diff --git a/utils/build_swift/build_swift/defaults.py b/utils/build_swift/build_swift/defaults.py
@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See http://swift.org/LICENSE.txt for license information
diff --git a/utils/build_swift/build_swift/driver_arguments.py b/utils/build_swift/build_swift/driver_arguments.py
@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See https://swift.org/LICENSE.txt for license information
diff --git a/utils/build_swift/build_swift/migration.py b/utils/build_swift/build_swift/migration.py
@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See https://swift.org/LICENSE.txt for license information
diff --git a/utils/build_swift/build_swift/presets.py b/utils/build_swift/build_swift/presets.py
@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See https://swift.org/LICENSE.txt for license information
diff --git a/utils/build_swift/tests/__init__.py b/utils/build_swift/tests/__init__.py
@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See https://swift.org/LICENSE.txt for license information
diff --git a/utils/build_swift/tests/argparse/__init__.py b/utils/build_swift/tests/argparse/__init__.py
@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See https://swift.org/LICENSE.txt for license information
diff --git a/utils/build_swift/tests/argparse/test_actions.py b/utils/build_swift/tests/argparse/test_actions.py
@@ -1,15 +1,15 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See https://swift.org/LICENSE.txt for license information
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
 from ..utils import TestCase, redirect_stderr
-from ...argparse import (ArgumentParser, BoolType, Nargs, PathType, SUPPRESS,
-                         actions)
+from ...build_swift.argparse import (
+    ArgumentParser, BoolType, Nargs, PathType, SUPPRESS, actions)
 
 
 # -----------------------------------------------------------------------------
diff --git a/utils/build_swift/tests/argparse/test_parser.py b/utils/build_swift/tests/argparse/test_parser.py
@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See https://swift.org/LICENSE.txt for license information
@@ -10,7 +10,7 @@
 from argparse import _ArgumentGroup, _MutuallyExclusiveGroup
 
 from ..utils import TestCase
-from ...argparse import ArgumentParser, actions
+from ...build_swift.argparse import ArgumentParser, actions
 
 
 # -----------------------------------------------------------------------------
diff --git a/utils/build_swift/tests/argparse/test_types.py b/utils/build_swift/tests/argparse/test_types.py
@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See https://swift.org/LICENSE.txt for license information
@@ -11,7 +11,7 @@
 import platform
 
 from ..utils import TestCase
-from ...argparse import ArgumentTypeError, types
+from ...build_swift.argparse import ArgumentTypeError, types
 
 
 # -----------------------------------------------------------------------------
diff --git a/utils/build_swift/tests/expected_options.py b/utils/build_swift/tests/expected_options.py
@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See https://swift.org/LICENSE.txt for license information
@@ -12,8 +12,8 @@
 from swift_build_support.swift_build_support import host
 from swift_build_support.swift_build_support import targets
 
-from .. import argparse
-from .. import defaults
+from ..build_swift import argparse
+from ..build_swift import defaults
 
 
 __all__ = [
diff --git a/utils/build_swift/tests/test_driver_arguments.py b/utils/build_swift/tests/test_driver_arguments.py
@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See https://swift.org/LICENSE.txt for license information
@@ -16,13 +16,11 @@
 
 from swift_build_support.swift_build_support import migration
 from swift_build_support.swift_build_support.SwiftBuildSupport import (
-    get_all_preset_names,
-    get_preset_options,
-)
+    get_all_preset_names, get_preset_options)
 
 from . import expected_options as eo
-from .. import argparse
-from .. import driver_arguments
+from ..build_swift import argparse
+from ..build_swift import driver_arguments
 
 
 FILE_PATH = os.path.abspath(__file__)
diff --git a/utils/build_swift/tests/test_migration.py b/utils/build_swift/tests/test_migration.py
@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See https://swift.org/LICENSE.txt for license information
@@ -10,7 +10,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from .utils import TestCase, add_metaclass
-from .. import migration
+from ..build_swift import migration
 
 
 def _get_sdk_targets(sdk_names):
diff --git a/utils/build_swift/tests/test_presets.py b/utils/build_swift/tests/test_presets.py
@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See https://swift.org/LICENSE.txt for license information
@@ -12,8 +12,8 @@
 import os
 
 from .utils import TestCase, UTILS_PATH, add_metaclass
-from .. import presets
-from ..presets import Preset, PresetParser
+from ..build_swift import presets
+from ..build_swift.presets import Preset, PresetParser
 
 try:
     # Python 2
diff --git a/utils/build_swift/tests/utils.py b/utils/build_swift/tests/utils.py
@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See https://swift.org/LICENSE.txt for license information

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# This source file is part of the Swift.org open source project`
`2`	`2`	`#`
`3`		`-# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors`
	`3`	`+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors`
`4`	`4`	`# Licensed under Apache License v2.0 with Runtime Library Exception`
`5`	`5`	`#`
`6`	`6`	`# See https://swift.org/LICENSE.txt for license information`