averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[build-script] Change the default SWIFT_SOURCE_ROOT and SWIFT_BUILD_ROOT.

Browse Source 
SWIFT_SOURCE_ROOT is now auto-detected from the location of the build script
files. It looks for the following layouts:

$SWIFT_SOURCE_ROOT/<LLVM_CHECKOUT>/tools/<SWIFT_CHECKOUT>/utils/build-script
$SWIFT_SOURCE_ROOT/<SWIFT_CHECKOUT>/utils/build-script

and defaults back to ~/src/s (as before) if neither of those matches.

SWIFT_BUILD_ROOT now defaults to $SWIFT_SOURCE_ROOT/build, rather than
~/build/swift.

Swift SVN r24194
This commit is contained in:
Jordan Rose
2015-01-05 23:58:57 +00:00
parent 7dea958826
commit 5f766b07ca
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
utils/SwiftBuildSupport.py
View File

@@ -22,16 +22,38 @@ import sys
HOME = os.environ["HOME"]
def _get_default_source_root():
# Default to ~/src/s for historical reasons.
result = os.path.join(HOME, "src", "s")
# Are we in a Swift checkout? $SWIFT_SOURCE_ROOT/swift/utils/
(swift_path, parent_dirname) = os.path.split(os.path.dirname(__file__))
if parent_dirname != "utils":
return result
if not os.path.exists(os.path.join(swift_path, 'CMakeLists.txt')):
return result
result = os.path.dirname(swift_path)
# Are we in an LLVM checkout? $SWIFT_SOURCE_ROOT/llvm/tools/swift/utils/
(llvm_path, root_dirname) = os.path.split(result)
if root_dirname != "tools":
return result
if not os.path.exists(os.path.join(llvm_path, 'CMakeLists.txt')):
return result
result = os.path.dirname(llvm_path)
return result
# Set SWIFT_SOURCE_ROOT in your environment to control where the sources
# are found.
SWIFT_SOURCE_ROOT = os.environ.get(
"SWIFT_SOURCE_ROOT", os.path.join(HOME, "src", "s"))
"SWIFT_SOURCE_ROOT", _get_default_source_root())
# Set SWIFT_BUILD_ROOT to a directory that will contain a subdirectory
# for each build configuration
SWIFT_BUILD_ROOT = os.environ.get(
"SWIFT_BUILD_ROOT", os.path.join(HOME, "build", "swift"))
"SWIFT_BUILD_ROOT", os.path.join(SWIFT_SOURCE_ROOT, "build"))
def print_with_argv0(message):