Skip to content

Improve native build process + add Nano Server #1040

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 59 commits into from
Dec 4, 2019
Merged

Improve native build process + add Nano Server #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
33a68a5
Add Nano Server to the list
mattleibow Nov 17, 2019
caea808
Merge branch 'master' into dev/nano-server
mattleibow Nov 17, 2019
f6d142e
Merge branch 'master' into dev/nano-server
mattleibow Nov 27, 2019
1576428
Update build.cake
mattleibow Nov 27, 2019
d3592b0
Merge branch 'master' into dev/nano-server
mattleibow Nov 27, 2019
f90befb
Update build.cake
mattleibow Nov 27, 2019
23bef17
Delete HarfbuzzSharp.NativeAssets.NanoServer.nuspec
mattleibow Nov 27, 2019
454dc41
Update VERSIONS.txt
mattleibow Nov 27, 2019
b0cc9ad
Update BuildExternals.cake
mattleibow Nov 27, 2019
226214f
Merge branch 'refs/heads/master' into dev/nano-server
mattleibow Nov 28, 2019
7ca4019
Try making separate cake files for native
mattleibow Nov 30, 2019
c50cb40
Windows
mattleibow Nov 30, 2019
c3ae92a
Things
mattleibow Nov 30, 2019
7e560c1
Path
mattleibow Nov 30, 2019
7e27f39
src
mattleibow Nov 30, 2019
b02fa68
use variable
mattleibow Nov 30, 2019
1ad8e84
Moving files
mattleibow Nov 30, 2019
e0b1edf
Cakes!
mattleibow Nov 30, 2019
a662fe7
I probably need to test this code at some point
mattleibow Nov 30, 2019
c9428b6
Make it compile
mattleibow Nov 30, 2019
b3c0d1c
More changes
mattleibow Nov 30, 2019
1ce407c
Fixes
mattleibow Nov 30, 2019
d8e4760
Fixing Apple builds
mattleibow Dec 1, 2019
1843375
Remove old ignores
mattleibow Dec 1, 2019
095f6f8
Resetting the old cake so we can work
mattleibow Dec 1, 2019
f1b82ed
more things
mattleibow Dec 1, 2019
519aef5
Use the correct path after renaming :)
mattleibow Dec 1, 2019
655bd07
Do it better
mattleibow Dec 1, 2019
e8c691d
add the no deps linux
mattleibow Dec 1, 2019
a5120d3
Fixes!
mattleibow Dec 1, 2019
b4bec63
paths
mattleibow Dec 1, 2019
dcc85a3
Maybe not set?
mattleibow Dec 1, 2019
4c837cd
no deps
mattleibow Dec 1, 2019
25d232b
duh!
mattleibow Dec 1, 2019
1354f71
move more things
mattleibow Dec 1, 2019
1ef9b90
This worked locally...
mattleibow Dec 2, 2019
6d15f16
wow
mattleibow Dec 2, 2019
35f3345
a few tweaks
mattleibow Dec 2, 2019
a6e32ee
Things have changed
mattleibow Dec 2, 2019
c7b66dc
Fix paths for Tizen
mattleibow Dec 2, 2019
7f7aaa6
Merge branch 'master' into dev/better-native
mattleibow Dec 2, 2019
ef94881
Fix the paths
mattleibow Dec 2, 2019
88be032
The case is different?
mattleibow Dec 2, 2019
94d69a6
Merge branch 'master' into dev/better-native
mattleibow Dec 2, 2019
b78ee87
use the correct arch
mattleibow Dec 2, 2019
38e18e1
Things
mattleibow Dec 3, 2019
c35a8ec
Merge branch 'master' into dev/better-native
mattleibow Dec 3, 2019
f97479b
WS
mattleibow Dec 3, 2019
2f8b2ea
tizen is weird - one arch for the CLI vs makefile
mattleibow Dec 3, 2019
dd1b731
nano has no 32-bit
mattleibow Dec 3, 2019
df3072a
naming is hard. harder if they change.
mattleibow Dec 3, 2019
ec004e6
Samples have issues
mattleibow Dec 3, 2019
b55d618
Merge remote-tracking branch 'origin/master' into dev/better-native
mattleibow Dec 3, 2019
5f3bbe3
clean
mattleibow Dec 3, 2019
0a8ce47
ws
mattleibow Dec 3, 2019
45499af
almost thre
mattleibow Dec 3, 2019
5317cad
Last things
mattleibow Dec 3, 2019
ef53ad9
Add docs to nuspec
mattleibow Dec 3, 2019
51ce417
Hideous mistakes were made
mattleibow Dec 3, 2019
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: 1 addition & 0 deletions VERSIONS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ HarfBuzzSharp file 2.6.1.1
SkiaSharp nuget 1.68.1.1
SkiaSharp.NativeAssets.Linux nuget 1.68.1.1
SkiaSharp.NativeAssets.Linux.NoDependencies nuget 1.68.1.1
SkiaSharp.NativeAssets.NanoServer nuget 1.68.1.1
SkiaSharp.Views nuget 1.68.1.1
SkiaSharp.Views.Desktop.Common nuget 1.68.1.1
SkiaSharp.Views.Gtk2 nuget 1.68.1.1
Expand Down
2 changes: 2 additions & 0 deletions binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@
<ItemGroup>
<None Include="..\..\output\native\windows\x64\libHarfBuzzSharp.dll" Link="nuget\runtimes\win-x64\native\libHarfBuzzSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
<None Include="..\..\output\native\windows\x86\libHarfBuzzSharp.dll" Link="nuget\runtimes\win-x86\native\libHarfBuzzSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
<None Include="..\..\output\native\nanoserver\x64\libHarfBuzzSharp.dll" Link="nuget\runtimes\nanoserver-x64\native\libHarfBuzzSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
<None Include="..\..\output\native\osx\libHarfBuzzSharp.dylib" Link="nuget\runtimes\osx\native\libHarfBuzzSharp.dylib" Condition=" '$(IsMacOS)' == 'true' " />
<None Include="..\..\output\native\linux\x64\libHarfBuzzSharp.so" Link="nuget\runtimes\linux-x64\native\libHarfBuzzSharp.so" Condition=" '$(IsLinux)' == 'true' " />
<None Include="..\..\output\native\linuxnodeps\x64\libHarfBuzzSharp.so" Link="nuget\runtimes\linuxnodeps-x64\native\libHarfBuzzSharp.so" Condition=" '$(IsLinux)' == 'true' " />
<None Include="nuget\build\net45\HarfBuzzSharp.targets" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions binding/HarfBuzzSharp.NetStandard/HarfBuzzSharp.NetStandard.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@
<ItemGroup>
<None Include="..\..\output\native\windows\x64\libHarfBuzzSharp.dll" Link="nuget\runtimes\win-x64\native\libHarfBuzzSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
<None Include="..\..\output\native\windows\x86\libHarfBuzzSharp.dll" Link="nuget\runtimes\win-x86\native\libHarfBuzzSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
<None Include="..\..\output\native\nanoserver\x64\libHarfBuzzSharp.dll" Link="nuget\runtimes\nanoserver-x64\native\libHarfBuzzSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
<None Include="..\..\output\native\osx\libHarfBuzzSharp.dylib" Link="nuget\runtimes\osx\native\libHarfBuzzSharp.dylib" Condition=" '$(IsMacOS)' == 'true' " />
<None Include="..\..\output\native\linux\x64\libHarfBuzzSharp.so" Link="nuget\runtimes\linux-x64\native\libHarfBuzzSharp.so" Condition=" '$(IsLinux)' == 'true' " />
<None Include="..\..\output\native\linuxnodeps\x64\libHarfBuzzSharp.so" Link="nuget\runtimes\linuxnodeps-x64\native\libHarfBuzzSharp.so" Condition=" '$(IsLinux)' == 'true' " />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
Expand Down
2 changes: 2 additions & 0 deletions binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@
<ItemGroup>
<None Include="..\..\output\native\windows\x64\libSkiaSharp.dll" Link="nuget\runtimes\win-x64\native\libSkiaSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
<None Include="..\..\output\native\windows\x86\libSkiaSharp.dll" Link="nuget\runtimes\win-x86\native\libSkiaSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
<None Include="..\..\output\native\nanoserver\x64\libSkiaSharp.dll" Link="nuget\runtimes\nanoserver-x64\native\libSkiaSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
<None Include="..\..\output\native\osx\libSkiaSharp.dylib" Link="nuget\runtimes\osx\native\libSkiaSharp.dylib" Condition=" '$(IsMacOS)' == 'true' " />
<None Include="..\..\output\native\linux\x64\libSkiaSharp.so" Link="nuget\runtimes\linux-x64\native\libSkiaSharp.so" Condition=" '$(IsLinux)' == 'true' " />
<None Include="..\..\output\native\linuxnodeps\x64\libSkiaSharp.so" Link="nuget\runtimes\linuxnodeps-x64\native\libSkiaSharp.so" Condition=" '$(IsLinux)' == 'true' " />
<None Include="nuget\build\net45\SkiaSharp.targets" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions binding/SkiaSharp.NetStandard/SkiaSharp.NetStandard.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@
<ItemGroup>
<None Include="..\..\output\native\windows\x64\libSkiaSharp.dll" Link="nuget\runtimes\win-x64\native\libSkiaSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
<None Include="..\..\output\native\windows\x86\libSkiaSharp.dll" Link="nuget\runtimes\win-x86\native\libSkiaSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
<None Include="..\..\output\native\nanoserver\x64\libSkiaSharp.dll" Link="nuget\runtimes\nanoserver-x64\native\libSkiaSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
<None Include="..\..\output\native\osx\libSkiaSharp.dylib" Link="nuget\runtimes\osx\native\libSkiaSharp.dylib" Condition=" '$(IsMacOS)' == 'true' " />
<None Include="..\..\output\native\linux\x64\libSkiaSharp.so" Link="nuget\runtimes\linux-x64\native\libSkiaSharp.so" Condition=" '$(IsLinux)' == 'true' " />
<None Include="..\..\output\native\linuxnodeps\x64\libSkiaSharp.so" Link="nuget\runtimes\linuxnodeps-x64\native\libSkiaSharp.so" Condition=" '$(IsLinux)' == 'true' " />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
Expand Down
Loading