Skip to content

WiX: adjust for versioning #402

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
Mar 20, 2025
Merged

WiX: adjust for versioning #402

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
24 changes: 10 additions & 14 deletions platforms/Windows/sdk/drd/sdk.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
├─ Library
│ ├─ ds2
│ │ └─ ...
│ ├─ XCTest-development
│ ├─ XCTest-$ProductVersion
│ │ └─ ...
│ └─ Testing-development
│ └─ Testing-$ProductVersion
│ └─ ...
└─ SDKs
└─ Android.sdk
Expand All @@ -60,12 +60,8 @@
<Directory Id="AndroidPlatform" Name="Android.platform">
<Directory Name="Developer">
<Directory Name="Library">
<!--
FIXME(compnerd) this should actually be the proper version
of XCTest and Testing, and needs to be reflected in the plist as well.
-->
<!-- XCTest -->
<Directory Name="XCTest-development">
<Directory Name="XCTest-$(ProductVersion)">
<Directory Name="usr">
<Directory Name="lib">
<Directory Name="swift">
Expand All @@ -78,7 +74,7 @@
</Directory>
</Directory>
<!-- Testing -->
<Directory Name="Testing-development">
<Directory Name="Testing-$(ProductVersion)">
<Directory Name="usr">
<Directory Name="lib">
<Directory Name="swift">
Expand Down Expand Up @@ -151,25 +147,25 @@

<ComponentGroup Id="XCTest">
<Component Directory="XCTest_usr_lib_swift_android_ARCH">
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\android\$(Architecture)\libXCTest.so" />
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\$(Architecture)\libXCTest.so" />
</Component>
<Component Directory="XCTest.swiftmodule">
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\android\XCTest.swiftmodule\$(SwiftModuleTriple).swiftdoc" />
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\XCTest.swiftmodule\$(SwiftModuleTriple).swiftdoc" />
</Component>
<Component Directory="XCTest.swiftmodule">
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\android\XCTest.swiftmodule\$(SwiftModuleTriple).swiftmodule" />
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\XCTest.swiftmodule\$(SwiftModuleTriple).swiftmodule" />
</Component>
</ComponentGroup>

<ComponentGroup Id="Testing">
<Component Directory="Testing_usr_lib_swift_android_ARCH">
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\android\$(Architecture)\libTesting.so" />
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVerison)\usr\lib\swift\android\$(Architecture)\libTesting.so" />
</Component>
<Component Directory="Testing.swiftmodule">
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\android\Testing.swiftmodule\$(Triple).swiftdoc" />
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\$(Triple).swiftdoc" />
</Component>
<Component Directory="Testing.swiftmodule">
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\android\Testing.swiftmodule\$(Triple).swiftinterface" />
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\$(Triple).swiftinterface" />
</Component>
</ComponentGroup>

Expand Down
28 changes: 12 additions & 16 deletions platforms/Windows/sdk/win/sdk.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
└─ Windows.platform
└─ Developer
├─ Library
│ ├─ XCTest-development
│ ├─ XCTest-$ProductVersion
│ │ └─ ...
│ └─ Testing-development
│ └─ Testing-$ProductVersion
│ └─ ...
└─ SDKs
└─ Windows.sdk
Expand All @@ -46,12 +46,8 @@
<Directory Id="WindowsPlatform" Name="Windows.platform">
<Directory Name="Developer">
<Directory Name="Library">
<!--
FIXME(compnerd) this should actually be the proper version
of XCTest and Testing, and needs to be reflected in the plist as well.
-->
<!-- XCTest -->
<Directory Name="XCTest-development">
<Directory Name="XCTest-$(ProductVersion)">
<Directory Name="usr">
<Directory Id="XCTest_usr_bin" Name="$(ArchitectureBinaryDir)" />
<Directory Name="lib">
Expand All @@ -65,7 +61,7 @@
</Directory>
</Directory>
<!-- Testing -->
<Directory Name="Testing-development">
<Directory Name="Testing-$(ProductVersion)">
<Directory Name="usr">
<Directory Id="Testing_usr_bin" Name="$(ArchitectureBinaryDir)" />
<Directory Name="lib">
Expand Down Expand Up @@ -133,31 +129,31 @@

<ComponentGroup Id="XCTest">
<Component Directory="XCTest_usr_bin">
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\$(ArchitectureBinaryDir)\XCTest.dll" />
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\$(ArchitectureBinaryDir)\XCTest.dll" />
</Component>
<Component Directory="XCTest_usr_lib_swift_windows_ARCH">
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\$(Architecture)\XCTest.lib" />
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\$(Architecture)\XCTest.lib" />
</Component>
<Component Directory="XCTest.swiftmodule">
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\XCTest.swiftmodule\$(Triple).swiftdoc" />
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\XCTest.swiftmodule\$(Triple).swiftdoc" />
</Component>
<Component Directory="XCTest.swiftmodule">
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\XCTest.swiftmodule\$(Triple).swiftmodule" />
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\XCTest.swiftmodule\$(Triple).swiftmodule" />
</Component>
</ComponentGroup>

<ComponentGroup Id="Testing">
<Component Directory="Testing_usr_bin">
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\$(ArchitectureBinaryDir)\Testing.dll" />
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\$(ArchitectureBinaryDir)\Testing.dll" />
</Component>
<Component Directory="Testing_usr_lib_swift_windows_ARCH">
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\windows\$(Architecture)\Testing.lib" />
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\$(Architecture)\Testing.lib" />
</Component>
<Component Directory="Testing.swiftmodule">
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\windows\Testing.swiftmodule\$(Triple).swiftdoc" />
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\$(Triple).swiftdoc" />
</Component>
<Component Directory="Testing.swiftmodule">
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\windows\Testing.swiftmodule\$(Triple).swiftinterface" />
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\$(Triple).swiftinterface" />
</Component>
</ComponentGroup>

Expand Down