Skip to content

Bootstrap script needs to build PackageDescription and PackagePlugin universal #3431

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
Jun 3, 2021
Merged

Bootstrap script needs to build PackageDescription and PackagePlugin universal #3431

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afd4c04
Bootstrap script needs to build PackageDescription and PackagePlugin …
abertelrud Apr 23, 2021
a9a42ca
Applied suggested Linux rpath workaround from PR
abertelrud May 10, 2021
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
98 changes: 43 additions & 55 deletions Utilities/bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ from helpers import note, error, symlink_force, mkdir_p, call, call_output

g_macos_deployment_target = '10.15'

g_shared_lib_prefix = "lib"
if platform.system() == 'Darwin':
g_shared_lib_ext = ".dylib"
g_shared_lib_suffix = ".dylib"
else:
g_shared_lib_ext = ".so"
g_shared_lib_suffix = ".so"

def main():
parser = argparse.ArgumentParser(description="""
Expand Down Expand Up @@ -366,7 +367,7 @@ def install(args):
"PackageGraph", "SPMBuildCore", "Build",
"Xcodeproj", "Workspace"
]
install_libswiftpm_dylib(args, "SwiftPM", args.libswiftpm_install_dir, libswiftpm_modules)
install_dylib(args, "SwiftPM", args.libswiftpm_install_dir, libswiftpm_modules)

# Install libSwiftPMDataModel if an install directory was provided.
if args.libswiftpmdatamodel_install_dir:
Expand All @@ -377,10 +378,11 @@ def install(args):
"PackageGraph", "SPMBuildCore",
"Xcodeproj", "Workspace"
]
install_libswiftpm_dylib(args, "SwiftPMDataModel", args.libswiftpmdatamodel_install_dir, libswiftpmdatamodel_modules)
install_dylib(args, "SwiftPMDataModel", args.libswiftpmdatamodel_install_dir, libswiftpmdatamodel_modules)

# Installs the SwiftPM tools and runtime support libraries.
def install_swiftpm(prefix, args):
# Install swiftpm binary and create tool symlinks.
# Install the swift-package tool and create symlinks to it.
cli_tool_dest = os.path.join(prefix, "bin")
install_binary(args, "swift-package", cli_tool_dest)
for tool in ["swift-build", "swift-test", "swift-run", "swift-package-collection"]:
Expand All @@ -389,74 +391,50 @@ def install_swiftpm(prefix, args):
note("Creating tool symlink from %s to %s" % (src, dest))
symlink_force(src, dest)

# On Darwin, also install the swiftpm-xctest-helper tool.
if platform.system() == 'Darwin':
dest = os.path.join(prefix, "libexec", "swift", "pm")
install_binary(args, "swiftpm-xctest-helper", dest)

# Install PackageDescription runtime libraries.
runtime_lib_dest = os.path.join(prefix, "lib", "swift", "pm")
runtime_lib_src = os.path.join(args.bootstrap_dir, "pm")
# Install the PackageDescription library and associated modules.
dest = os.path.join(prefix, "lib", "swift", "pm", "ManifestAPI")
install_dylib(args, "PackageDescription", dest, ["PackageDescription"])

files_to_install = ["libPackageDescription" + g_shared_lib_ext]
if platform.system() == 'Darwin':
files_to_install.append("PackageDescription.swiftinterface")
else:
files_to_install.append("PackageDescription.swiftmodule")
files_to_install.append("PackageDescription.swiftdoc")

for file in files_to_install:
src = os.path.join(runtime_lib_src, "ManifestAPI", file)
dest = os.path.join(runtime_lib_dest, "ManifestAPI", file)
mkdir_p(os.path.dirname(dest))

note("Installing %s to %s" % (src, dest))

file_util.copy_file(src, dest, update=1)

files_to_install = ["libPackagePlugin" + g_shared_lib_ext]
if platform.system() == 'Darwin':
files_to_install.append("PackagePlugin.swiftinterface")
else:
files_to_install.append("PackagePlugin.swiftmodule")
files_to_install.append("PackagePlugin.swiftdoc")

for file in files_to_install:
src = os.path.join(runtime_lib_src, "PluginAPI", file)
dest = os.path.join(runtime_lib_dest, "PluginAPI", file)
mkdir_p(os.path.dirname(dest))

note("Installing %s to %s" % (src, dest))

file_util.copy_file(src, dest, update=1)
# Install the PackagePlugin library and associated modules.
dest = os.path.join(prefix, "lib", "swift", "pm", "PluginAPI")
install_dylib(args, "PackagePlugin", dest, ["PackagePlugin"])


def install_libswiftpm_dylib(args, library_name, install_dir, module_names):
# FIXME: Don't hardcode the prefix and suffix.
install_binary(args, "lib" + library_name + ".dylib", install_dir)
# Helper function that installs a dynamic library and a set of modules to a particular directory.
def install_dylib(args, library_name, install_dir, module_names):
# Install the dynamic library itself.
install_binary(args, g_shared_lib_prefix + library_name + g_shared_lib_suffix, install_dir)

# Install the swiftmodule and swiftdoc files.
# Install the swiftmodule/swiftinterface and swiftdoc files for all the modules.
for module in module_names:
install_binary(args, module + ".swiftmodule", install_dir)
if not args.cross_compile_hosts: # When compiling for multiple arches, swiftdoc is part of the swiftmodule directory
# If we're cross-compiling, we expect the .swiftmodule to be a directory that contains everything.
if args.cross_compile_hosts:
install_binary(args, module + ".swiftmodule", install_dir)
else:
# Otherwise we have either a .swiftinterface or a .swiftmodule, plus a .swiftdoc.
if os.path.exists(os.path.join(args.bin_dir, module + ".swiftinterface")):
install_binary(args, module + ".swiftinterface", install_dir)
else:
install_binary(args, module + ".swiftmodule", install_dir)
install_binary(args, module + ".swiftdoc", install_dir)

# Install the C headers.
tscclibc_include_dir = os.path.join(args.tsc_source_dir, "Sources/TSCclibc/include")
tscclibc_include_dir_dest = os.path.join(install_dir, "TSCclibc")
dir_util.copy_tree(tscclibc_include_dir, tscclibc_include_dir_dest)


# Helper function that installs a single built artifact to a particular directory. The source may be either a file or a directory.
def install_binary(args, binary, dest_dir):
src = os.path.join(args.bin_dir, binary)
dest = os.path.join(dest_dir, binary)

note("Installing %s to %s" % (src, dest))

mkdir_p(os.path.dirname(dest))
if os.path.isdir(src) and args.cross_compile_hosts: # Handle swiftmodule directories if compiling for multiple arches.
dir_util.copy_tree(src, dest)
if os.path.isdir(src):
dir_util.copy_tree(src, dest, update=1, verbose=1)
else:
file_util.copy_file(src, dest, update=1)
file_util.copy_file(src, dest, update=1, verbose=1)

# -----------------------------------------------------------
# Build functions
Expand Down Expand Up @@ -651,6 +629,7 @@ def build_swiftpm_with_swiftpm(args, integrated_swift_driver):
if integrated_swift_driver:
swiftpm_args.append("--use-integrated-swift-driver")

# Build SwiftPM, including libSwiftPM, all the command line tools, and the current variant of PackageDescription.
call_swiftpm(args, swiftpm_args)

# Setup symlinks that'll allow using swiftpm from the build directory.
Expand Down Expand Up @@ -776,7 +755,7 @@ def get_swiftpm_flags(args):
swift_library_rpath_prefix = "$ORIGIN/../"
platform_path = None
for path in args.target_info["paths"]["runtimeLibraryPaths"]:
platform_path = re.search(r"(lib/swift/[^/]+)$", path)
platform_path = re.search(r"(lib/swift/([^/]+))$", path)
if platform_path:
build_flags.extend(
[
Expand All @@ -786,6 +765,15 @@ def get_swiftpm_flags(args):
swift_library_rpath_prefix + platform_path.group(1),
]
)
if platform.system() == 'Linux':
build_flags.extend(
[
"-Xlinker",
"-rpath",
"-Xlinker",
swift_library_rpath_prefix + '../' + platform_path.group(2),
]
)
break

if not platform_path:
Expand Down