Skip to content

Commit

Permalink
Include the CoreFoundation unicode mapping tables in every AppX packa…
Browse files Browse the repository at this point in the history
…ge. (#647)

Fixes #643.

This was caught by neither functional tests _nor_ unit tests, as the
CoreFoundation unicode mapping tables were unequivocally copied into the
test library directory. The only place this failed, therefore, was in a
real AppX deployment scenario.

This fixes, among other things, `-[NSString lowercaseString]`.
  • Loading branch information
DHowett authored and Ramu-msft committed Jul 14, 2016
1 parent 3ce30c2 commit a82beab
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions build/Package/Package.nativeproj
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
<SBLibsWin10Win32 Include="..\Win32\$(Configuration)\Universal Windows\*.winmd" />
<SBLibsWin10Win32 Include="..\Win32\$(Configuration)\Universal Windows\*.bitmap" />
<SBLibsWin10Win32 Include="..\Win32\$(Configuration)\Universal Windows\*.data" />
<SBLibsWin10Win32 Include="..\Win32\$(Configuration)\Universal Windows\*.mapping" />

<!-- Files in these directories ship both Debug and Release varieties -->
<SBLibsWin10Win32 Include="..\Win32\Debug\Universal Windows\Debug\*.lib">
Expand Down Expand Up @@ -105,6 +106,7 @@
<SBLibsWin10ARM Include="..\ARM\$(Configuration)\Universal Windows\*.winmd" />
<SBLibsWin10ARM Include="..\ARM\$(Configuration)\Universal Windows\*.bitmap" />
<SBLibsWin10ARM Include="..\ARM\$(Configuration)\Universal Windows\*.data" />
<SBLibsWin10ARM Include="..\ARM\$(Configuration)\Universal Windows\*.mapping" />

<!-- Files in these directories ship both Debug and Release varieties -->
<SBLibsWin10ARM Include="..\ARM\Debug\Universal Windows\Debug\*.lib">
Expand Down
2 changes: 2 additions & 0 deletions msvc/sbclang.targets
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@
<!-- CoreFoundation resource files -->
<SBResourceCopy Include="$(StarboardLibDirs)\CFCharacterSetBitmaps.bitmap" />
<SBResourceCopy Include="$(StarboardLibDirs)\CFUniCharPropertyDatabase.data" />
<SBResourceCopy Include="$(StarboardLibDirs)\CFUnicodeData-B.mapping" />
<SBResourceCopy Include="$(StarboardLibDirs)\CFUnicodeData-L.mapping" />
</ItemGroup>
</Target>

Expand Down

0 comments on commit a82beab

Please sign in to comment.