Skip to content

Commit 0ffa2f3

Browse files
compnerdcompnerd
committed
WiX: adjust for versioning
Properly version the Testing frameworks. This finally moves the last of the legacy versioning (`development`) to numeric form. The `0.0.0` version is used as a placeholder equivalent for development releases.
1 parent 8140d27 commit 0ffa2f3

File tree

2 files changed

+22
-30
lines changed

2 files changed

+22
-30
lines changed

‎platforms/Windows/sdk/drd/sdk.wxs‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
├─ Library
4949
│ ├─ ds2
5050
│ │ └─ ...
51-
│ ├─ XCTest-development
51+
│ ├─ XCTest-$ProductVersion
5252
│ │ └─ ...
53-
│ └─ Testing-development
53+
│ └─ Testing-$ProductVersion
5454
│ └─ ...
5555
└─ SDKs
5656
└─ Android.sdk
@@ -60,12 +60,8 @@
6060
<Directory Id="AndroidPlatform" Name="Android.platform">
6161
<Directory Name="Developer">
6262
<Directory Name="Library">
63-
<!--
64-
FIXME(compnerd) this should actually be the proper version
65-
of XCTest and Testing, and needs to be reflected in the plist as well.
66-
-->
6763
<!-- XCTest -->
68-
<Directory Name="XCTest-development">
64+
<Directory Name="XCTest-$(ProductVersion)">
6965
<Directory Name="usr">
7066
<Directory Name="lib">
7167
<Directory Name="swift">
@@ -78,7 +74,7 @@
7874
</Directory>
7975
</Directory>
8076
<!-- Testing -->
81-
<Directory Name="Testing-development">
77+
<Directory Name="Testing-$(ProductVersion)">
8278
<Directory Name="usr">
8379
<Directory Name="lib">
8480
<Directory Name="swift">
@@ -151,25 +147,25 @@
151147

152148
<ComponentGroup Id="XCTest">
153149
<Component Directory="XCTest_usr_lib_swift_android_ARCH">
154-
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\android\$(Architecture)\libXCTest.so" />
150+
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\$(Architecture)\libXCTest.so" />
155151
</Component>
156152
<Component Directory="XCTest.swiftmodule">
157-
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\android\XCTest.swiftmodule\$(SwiftModuleTriple).swiftdoc" />
153+
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\XCTest.swiftmodule\$(SwiftModuleTriple).swiftdoc" />
158154
</Component>
159155
<Component Directory="XCTest.swiftmodule">
160-
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\android\XCTest.swiftmodule\$(SwiftModuleTriple).swiftmodule" />
156+
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\XCTest.swiftmodule\$(SwiftModuleTriple).swiftmodule" />
161157
</Component>
162158
</ComponentGroup>
163159

164160
<ComponentGroup Id="Testing">
165161
<Component Directory="Testing_usr_lib_swift_android_ARCH">
166-
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\android\$(Architecture)\libTesting.so" />
162+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVerison)\usr\lib\swift\android\$(Architecture)\libTesting.so" />
167163
</Component>
168164
<Component Directory="Testing.swiftmodule">
169-
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\android\Testing.swiftmodule\$(Triple).swiftdoc" />
165+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\$(Triple).swiftdoc" />
170166
</Component>
171167
<Component Directory="Testing.swiftmodule">
172-
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\android\Testing.swiftmodule\$(Triple).swiftinterface" />
168+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\$(Triple).swiftinterface" />
173169
</Component>
174170
</ComponentGroup>
175171

‎platforms/Windows/sdk/win/sdk.wxs‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
└─ Windows.platform
3535
└─ Developer
3636
├─ Library
37-
│ ├─ XCTest-development
37+
│ ├─ XCTest-$ProductVersion
3838
│ │ └─ ...
39-
│ └─ Testing-development
39+
│ └─ Testing-$ProductVersion
4040
│ └─ ...
4141
└─ SDKs
4242
└─ Windows.sdk
@@ -46,12 +46,8 @@
4646
<Directory Id="WindowsPlatform" Name="Windows.platform">
4747
<Directory Name="Developer">
4848
<Directory Name="Library">
49-
<!--
50-
FIXME(compnerd) this should actually be the proper version
51-
of XCTest and Testing, and needs to be reflected in the plist as well.
52-
-->
5349
<!-- XCTest -->
54-
<Directory Name="XCTest-development">
50+
<Directory Name="XCTest-$(ProductVersion)">
5551
<Directory Name="usr">
5652
<Directory Id="XCTest_usr_bin" Name="$(ArchitectureBinaryDir)" />
5753
<Directory Name="lib">
@@ -65,7 +61,7 @@
6561
</Directory>
6662
</Directory>
6763
<!-- Testing -->
68-
<Directory Name="Testing-development">
64+
<Directory Name="Testing-$(ProductVersion)">
6965
<Directory Name="usr">
7066
<Directory Id="Testing_usr_bin" Name="$(ArchitectureBinaryDir)" />
7167
<Directory Name="lib">
@@ -133,31 +129,31 @@
133129

134130
<ComponentGroup Id="XCTest">
135131
<Component Directory="XCTest_usr_bin">
136-
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\$(ArchitectureBinaryDir)\XCTest.dll" />
132+
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\$(ArchitectureBinaryDir)\XCTest.dll" />
137133
</Component>
138134
<Component Directory="XCTest_usr_lib_swift_windows_ARCH">
139-
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\$(Architecture)\XCTest.lib" />
135+
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\$(Architecture)\XCTest.lib" />
140136
</Component>
141137
<Component Directory="XCTest.swiftmodule">
142-
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\XCTest.swiftmodule\$(Triple).swiftdoc" />
138+
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\XCTest.swiftmodule\$(Triple).swiftdoc" />
143139
</Component>
144140
<Component Directory="XCTest.swiftmodule">
145-
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\XCTest.swiftmodule\$(Triple).swiftmodule" />
141+
<File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\XCTest.swiftmodule\$(Triple).swiftmodule" />
146142
</Component>
147143
</ComponentGroup>
148144

149145
<ComponentGroup Id="Testing">
150146
<Component Directory="Testing_usr_bin">
151-
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\$(ArchitectureBinaryDir)\Testing.dll" />
147+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\$(ArchitectureBinaryDir)\Testing.dll" />
152148
</Component>
153149
<Component Directory="Testing_usr_lib_swift_windows_ARCH">
154-
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\windows\$(Architecture)\Testing.lib" />
150+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\$(Architecture)\Testing.lib" />
155151
</Component>
156152
<Component Directory="Testing.swiftmodule">
157-
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\windows\Testing.swiftmodule\$(Triple).swiftdoc" />
153+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\$(Triple).swiftdoc" />
158154
</Component>
159155
<Component Directory="Testing.swiftmodule">
160-
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\windows\Testing.swiftmodule\$(Triple).swiftinterface" />
156+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\$(Triple).swiftinterface" />
161157
</Component>
162158
</ComponentGroup>
163159

0 commit comments

Comments
 (0)