Skip to content

Commit 4105823

Browse files
authored
Merge pull request #321 from swiftlang/eng/fix-icu-installer
[windows] installer script: add new foundation ICU headers to SDKs
2 parents 3bdd128 + 4b53132 commit 4105823

File tree

2 files changed

+42
-0
lines changed

2 files changed

+42
-0
lines changed

platforms/Windows/android_sdk/android_sdk.wxs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,9 @@
346346
<Component>
347347
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\formattedvalue.h" />
348348
</Component>
349+
<Component>
350+
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\formattednumber.h" />
351+
</Component>
349352
<Component>
350353
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\fpositer.h" />
351354
</Component>
@@ -481,6 +484,9 @@
481484
<Component>
482485
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\simpleformatter.h" />
483486
</Component>
487+
<Component>
488+
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\simplenumberformatter.h" />
489+
</Component>
484490
<Component>
485491
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\simpletz.h" />
486492
</Component>
@@ -652,6 +658,9 @@
652658
<Component>
653659
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\uformattedvalue.h" />
654660
</Component>
661+
<Component>
662+
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\uformattednumber.h" />
663+
</Component>
655664
<Component>
656665
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\ugender.h" />
657666
</Component>
@@ -670,6 +679,12 @@
670679
<Component>
671680
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\uloc.h" />
672681
</Component>
682+
<Component>
683+
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\ulocale.h" />
684+
</Component>
685+
<Component>
686+
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\ulocbuilder.h" />
687+
</Component>
673688
<Component>
674689
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\ulocdata.h" />
675690
</Component>
@@ -715,6 +730,9 @@
715730
<Component>
716731
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\unumberformatter.h" />
717732
</Component>
733+
<Component>
734+
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\unumberoptions.h" />
735+
</Component>
718736
<Component>
719737
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\unumberrangeformatter.h" />
720738
</Component>
@@ -766,6 +784,9 @@
766784
<Component>
767785
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\ushape.h" />
768786
</Component>
787+
<Component>
788+
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\usimplenumberformatter.h" />
789+
</Component>
769790
<Component>
770791
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\uspoof.h" />
771792
</Component>

platforms/Windows/sdk/sdk.wxs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,9 @@
347347
<Component>
348348
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\formattedvalue.h" />
349349
</Component>
350+
<Component>
351+
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\formattednumber.h" />
352+
</Component>
350353
<Component>
351354
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\fpositer.h" />
352355
</Component>
@@ -482,6 +485,9 @@
482485
<Component>
483486
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\simpleformatter.h" />
484487
</Component>
488+
<Component>
489+
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\simplenumberformatter.h" />
490+
</Component>
485491
<Component>
486492
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\simpletz.h" />
487493
</Component>
@@ -653,6 +659,9 @@
653659
<Component>
654660
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\uformattedvalue.h" />
655661
</Component>
662+
<Component>
663+
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\uformattednumber.h" />
664+
</Component>
656665
<Component>
657666
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\ugender.h" />
658667
</Component>
@@ -671,6 +680,12 @@
671680
<Component>
672681
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\uloc.h" />
673682
</Component>
683+
<Component>
684+
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\ulocale.h" />
685+
</Component>
686+
<Component>
687+
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\ulocbuilder.h" />
688+
</Component>
674689
<Component>
675690
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\ulocdata.h" />
676691
</Component>
@@ -716,6 +731,9 @@
716731
<Component>
717732
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\unumberformatter.h" />
718733
</Component>
734+
<Component>
735+
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\unumberoptions.h" />
736+
</Component>
719737
<Component>
720738
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\unumberrangeformatter.h" />
721739
</Component>
@@ -767,6 +785,9 @@
767785
<Component>
768786
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\ushape.h" />
769787
</Component>
788+
<Component>
789+
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\usimplenumberformatter.h" />
790+
</Component>
770791
<Component>
771792
<File Source="$(SDK_ROOT)\usr\lib\swift\_foundation_unicode\uspoof.h" />
772793
</Component>

0 commit comments

Comments
 (0)