Skip to content

Add merge modules for the runtime. #217

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
Aug 5, 2023
Merged

Add merge modules for the runtime. #217

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions platforms/Windows/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<ItemGroup Condition="'$(MSBuildProjectName)' != 'shared'">
<ProjectReference Include="..\shared\shared.wixproj" />
<ItemGroup Condition="'$(MSBuildProjectName)' != 'shared' AND '$(MSBuildProjectName)' != 'runtimelib'">
<ProjectReference Include="$(MSBuildThisFileDirectory)shared\shared.wixproj" />
</ItemGroup>

<Import Project="WiXCodeSigning.targets" />
Expand Down
146 changes: 73 additions & 73 deletions platforms/Windows/bld/bld.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Package
Language="1033"
Manufacturer="swift.org"
Name="!(loc.Bld_ProductName)"
UpgradeCode="7e95dc06-7f84-4e8e-a038-8304af0468fb"
Version="$(var.ProductVersion)"
Version="$(ProductVersion)"
Scope="$(PackageScope)">

<Media Id="1" Cabinet="bld.cab" EmbedCab="yes" />
Expand All @@ -28,20 +28,20 @@
<ComponentGroup Id="binutils" Directory="_usr_bin">
<!-- TODO(compnerd) can we use symbolic links to llvm-ar.exe instead? -->
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-dlltool.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-dlltool.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-lib.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-lib.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-ranlib.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-ranlib.exe" />
</Component>
<!-- TODO(compnerd) can we use symbolic links to llvm-objdump.exe instead? -->
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-readelf.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-readelf.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-strip.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-strip.exe" />
</Component>
<!--
TODO(compnerd) we should symlink:
Expand All @@ -59,94 +59,94 @@
-->

<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\dsymutil.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\dsymutil.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-ar.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-ar.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-cov.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-cov.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-cvtres.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-cvtres.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-cxxfilt.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-cxxfilt.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-dwarfdump.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-dwarfdump.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-dwp.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-dwp.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-lipo.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-lipo.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-mt.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-mt.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-nm.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-nm.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-objcopy.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-objcopy.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-objdump.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-objdump.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-pdbutil.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-pdbutil.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-profdata.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-profdata.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-rc.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-rc.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-readobj.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-readobj.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-size.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-size.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-strings.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-strings.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-symbolizer.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-symbolizer.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-undname.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-undname.exe" />
</Component>
</ComponentGroup>

<ComponentGroup Id="lto">
<Component Directory="_usr_bin">
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\LTO.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\LTO.dll" />
</Component>

<Component Directory="_usr_lib">
<File Source="$(var.TOOLCHAIN_ROOT)\usr\lib\LTO.lib" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\LTO.lib" />
</Component>

<Component Directory="_usr_include_llvm_c">
<File Source="$(var.TOOLCHAIN_ROOT)\usr\include\llvm-c\lto.h" />
<File Source="$(TOOLCHAIN_ROOT)\usr\include\llvm-c\lto.h" />
</Component>
</ComponentGroup>

<ComponentGroup Id="clang" Directory="_usr_bin">
<!-- TODO(compnerd) can we use symbolic links to clang.exe instead? -->
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang-cl.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\clang-cl.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang-cpp.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\clang-cpp.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang++.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\clang++.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\clang.exe" />
</Component>
<!--
TODO(compnerd) we should include:
Expand All @@ -160,103 +160,103 @@
<ComponentGroup Id="lld" Directory="_usr_bin">
<!-- TODO(compnerd) can we use symbolic links to lld.exe instead? -->
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\ld.lld.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\ld.lld.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\ld64.lld.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\ld64.lld.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\lld-link.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\lld-link.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\wasm-ld.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\wasm-ld.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\lld.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\lld.exe" />
</Component>
</ComponentGroup>

<ComponentGroup Id="BlocksRuntime">
<Component Directory="_usr_bin">
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\BlocksRuntime.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\BlocksRuntime.dll" />
</Component>

<Component Directory="_usr_lib">
<File Source="$(var.TOOLCHAIN_ROOT)\usr\lib\BlocksRuntime.lib" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\BlocksRuntime.lib" />
</Component>

<!-- TODO(compnerd) should we install the block headers? -->
</ComponentGroup>

<ComponentGroup Id="libdispatch">
<Component Directory="_usr_bin">
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\dispatch.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\dispatch.dll" />
</Component>

<Component Directory="_usr_lib">
<File Source="$(var.TOOLCHAIN_ROOT)\usr\lib\dispatch.lib" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\dispatch.lib" />
</Component>

<!-- TODO(compnerd) should we install the dispatch headers? -->
</ComponentGroup>

<ComponentGroup Id="SwiftCxx" Directory="_usr_lib_swift_swiftToCxx">
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftStdlibCxxOverlay.h" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftStdlibCxxOverlay.h" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\experimental-interoperability-version.json" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\experimental-interoperability-version.json" />
</Component>
</ComponentGroup>

<ComponentGroup Id="SwiftDemangle">
<Component Directory="_usr_bin">
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swiftDemangle.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\swiftDemangle.dll" />
</Component>
<Component Directory="_usr_lib">
<File Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swiftDemangle.lib" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swiftDemangle.lib" />
</Component>
</ComponentGroup>

<ComponentGroup Id="SwiftFeatures" Directory="_usr_share_swift">
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\share\swift\features.json" />
<File Source="$(TOOLCHAIN_ROOT)\usr\share\swift\features.json" />
</Component>
</ComponentGroup>

<ComponentGroup Id="SwiftMigrator" Directory="_usr_lib_swift_migrator">
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\ios4.json" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\ios4.json" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\ios42.json" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\ios42.json" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\macos4.json" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\macos4.json" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\macos42.json" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\macos42.json" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\overlay4.json" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\overlay4.json" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\overlay42.json" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\overlay42.json" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\tvos4.json" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\tvos4.json" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\tvos42.json" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\tvos42.json" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\watchos4.json" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\watchos4.json" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\watchos42.json" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\watchos42.json" />
</Component>
</ComponentGroup>

Expand All @@ -268,58 +268,58 @@

<!-- TODO(compnerd) can we use symbolic links to swift-frontend.exe instead? -->
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-api-digester.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-api-digester.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-autolink-extract.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-autolink-extract.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-symbolgraph-extract.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-symbolgraph-extract.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-demangle.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-demangle.exe" />
</Component>
<Component>
<File Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-frontend.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-frontend.exe" />
</Component>
</ComponentGroup>

<ComponentGroup Id="argument_parser" Directory="_usr_bin">
<Component>
<File Source="$(var.DEVTOOLS_ROOT)\usr\bin\ArgumentParser.dll" />
<File Source="$(DEVTOOLS_ROOT)\usr\bin\ArgumentParser.dll" />
</Component>
</ComponentGroup>

<ComponentGroup Id="tools_support_core" Directory="_usr_bin">
<Component>
<File Source="$(var.DEVTOOLS_ROOT)\usr\bin\TSCBasic.dll" />
<File Source="$(DEVTOOLS_ROOT)\usr\bin\TSCBasic.dll" />
</Component>
<Component>
<File Source="$(var.DEVTOOLS_ROOT)\usr\bin\TSCUtility.dll" />
<File Source="$(DEVTOOLS_ROOT)\usr\bin\TSCUtility.dll" />
</Component>
</ComponentGroup>

<ComponentGroup Id="swift_driver" Directory="_usr_bin">
<!-- TODO(compnerd) can we use symbolic links to swift.exe instead? -->
<Component>
<File Name="swiftc.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-driver.exe" />
<File Name="swiftc.exe" Source="$(DEVTOOLS_ROOT)\usr\bin\swift-driver.exe" />
</Component>

<Component>
<File Name="swift.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-driver.exe" />
<File Name="swift.exe" Source="$(DEVTOOLS_ROOT)\usr\bin\swift-driver.exe" />
</Component>
<Component>
<File Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-help.exe" />
<File Source="$(DEVTOOLS_ROOT)\usr\bin\swift-help.exe" />
</Component>

<Component>
<File Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftOptions.dll" />
<File Source="$(DEVTOOLS_ROOT)\usr\bin\SwiftOptions.dll" />
</Component>
<Component>
<File Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftDriver.dll" />
<File Source="$(DEVTOOLS_ROOT)\usr\bin\SwiftDriver.dll" />
</Component>
<Component>
<File Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftDriverExecution.dll" />
<File Source="$(DEVTOOLS_ROOT)\usr\bin\SwiftDriverExecution.dll" />
</Component>
</ComponentGroup>

Expand Down
2 changes: 1 addition & 1 deletion platforms/Windows/bundle/installer.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
<Bundle
Name="!(loc.BundleName)"
Version="$(var.ProductVersion)"
Version="$(ProductVersion)"
Manufacturer="swift.org"
Compressed="$(IsBundleCompressed)"
UpgradeCode="710F1827-DA4A-4BF4-BDCE-D5F2D7C0DEF2">
Expand Down
Loading