Skip to content

WiX: remove references to DEVTOOLS_ROOT #347

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
Nov 20, 2024
Merged

WiX: remove references to DEVTOOLS_ROOT #347

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
1 change: 0 additions & 1 deletion platforms/Windows/bld/bld.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<PropertyGroup>
<DefineConstants>
$(DefineConstants);
DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;
TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\swift\clang;
Expand Down
18 changes: 9 additions & 9 deletions platforms/Windows/bld/bld.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,40 +352,40 @@

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

<ComponentGroup Id="tools_support_core" Directory="_usr_bin">
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\TSCBasic.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\TSCBasic.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\TSCUtility.dll" />
<File Source="$(TOOLCHAIN_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="$(DEVTOOLS_ROOT)\usr\bin\swift-driver.exe" />
<File Name="swiftc.exe" Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-driver.exe" />
</Component>

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

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

Expand Down
1 change: 0 additions & 1 deletion platforms/Windows/cli/cli.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<PropertyGroup>
<DefineConstants>
$(DefineConstants);
DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
SWIFT_DOCC_BUILD=$(SWIFT_DOCC_BUILD);
INCLUDE_SWIFT_DOCC=$(INCLUDE_SWIFT_DOCC);
Expand Down
66 changes: 33 additions & 33 deletions platforms/Windows/cli/cli.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,73 +112,73 @@

<ComponentGroup Id="collections" Directory="_usr_bin">
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\Collections.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\Collections.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\DequeModule.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\DequeModule.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\InternalCollectionsUtilities.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\InternalCollectionsUtilities.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\OrderedCollections.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\OrderedCollections.dll" />
</Component>
</ComponentGroup>

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

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

<ComponentGroup Id="CompilerPluginSupport" Directory="_usr_lib_swift_pm_ManifestAPI">
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.lib" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.lib" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftdoc" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftdoc" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftmodule" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftmodule" />
</Component>
</ComponentGroup>

<ComponentGroup Id="PackageDescription" Directory="_usr_lib_swift_pm_ManifestAPI">
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.lib" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.lib" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftdoc" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftdoc" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftmodule" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftmodule" />
</Component>
</ComponentGroup>

<ComponentGroup Id="PackagePlugin" Directory="_usr_lib_swift_pm_PluginAPI">
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.lib" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.lib" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftdoc" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftdoc" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftmodule" />
<File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftmodule" />
</Component>
</ComponentGroup>

Expand All @@ -188,50 +188,50 @@
<ComponentGroupRef Id="PackagePlugin" />

<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\swift-build.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-build.exe" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\swift-package.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-package.exe" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\swift-run.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-run.exe" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\swift-test.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-test.exe" />
</Component>

<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\Basics.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\Basics.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\Build.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\Build.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\Commands.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\Commands.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\CoreCommands.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\CoreCommands.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\DriverSupport.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\DriverSupport.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\PackageGraph.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\PackageGraph.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\PackageLoading.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\PackageLoading.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\PackageModel.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\PackageModel.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\PackageModelSyntax.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\PackageModelSyntax.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\SPMBuildCore.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SPMBuildCore.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\Workspace.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\Workspace.dll" />
</Component>

<!-- FIXME(compnerd) we should include the SPM import libraries -->
Expand Down
1 change: 0 additions & 1 deletion platforms/Windows/dbg/dbg.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<PropertyGroup>
<DefineConstants>
$(DefineConstants);
DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
SWIFT_INSPECT_BUILD=$(SWIFT_INSPECT_BUILD);
INCLUDE_SWIFT_INSPECT=$(INCLUDE_SWIFT_INSPECT);
Expand Down
1 change: 0 additions & 1 deletion platforms/Windows/ide/ide.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<PropertyGroup>
<DefineConstants>
$(DefineConstants);
DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT)
</DefineConstants>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion platforms/Windows/ide/ide.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

<ComponentGroup Id="lsp" Directory="_usr_bin">
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\sourcekit-lsp.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\sourcekit-lsp.exe" />
</Component>
</ComponentGroup>

Expand Down
1 change: 0 additions & 1 deletion platforms/Windows/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\bundle\installer.
-p:BaseReleaseDownloadUrl=todo://base/release/download/url ^
-p:Configuration=Release ^
-p:BaseOutputPath=%PackageRoot%\online\ ^
-p:DEVTOOLS_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
-p:TOOLCHAIN_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
-p:PLATFORM_ROOT_X86=path\to\x86\platform ^
-p:PLATFORM_ROOT_AMD64=path\to\amd64\platform ^
Expand Down