From 509f13fe3a0aeeea93856e220249278f451d3e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Sun, 17 Apr 2016 19:39:21 +0200 Subject: [PATCH 1/3] Updated Perspex.Skia.Desktop nuget --- nuget/build-version.ps1 | 6 ------ .../build/net45/Perspex.Skia.Desktop.targets | 10 ---------- nuget/template/Perspex.Skia.Desktop.nuspec | 1 + src/Skia/getnatives.ps1 | 16 ---------------- src/Skia/getnatives.sh | 13 ------------- src/Skia/native.url | 1 - 6 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 nuget/skia/build/net45/Perspex.Skia.Desktop.targets delete mode 100644 src/Skia/getnatives.ps1 delete mode 100755 src/Skia/getnatives.sh delete mode 100644 src/Skia/native.url diff --git a/nuget/build-version.ps1 b/nuget/build-version.ps1 index d2de767786..480d532f7f 100644 --- a/nuget/build-version.ps1 +++ b/nuget/build-version.ps1 @@ -14,7 +14,6 @@ sv build "Perspex.Desktop\lib\net45" sv skia_root "Perspex.Skia.Desktop" sv skia_lib "Perspex.Skia.Desktop\lib\net45" -sv skia_native "Perspex.Skia.Desktop\build\net45\native" sv android "Perspex.Android\lib\MonoAndroid10" sv ios "Perspex.iOS\lib\Xamarin.iOS10" @@ -61,13 +60,8 @@ Copy-Item ..\src\Windows\Perspex.Win32\bin\Release\Perspex.Win32.dll $build Copy-Item ..\src\Gtk\Perspex.Gtk\bin\Release\Perspex.Gtk.dll $build Copy-Item ..\src\Gtk\Perspex.Cairo\bin\Release\Perspex.Cairo.dll $build -Copy-Item skia\build $skia_root -recurse -mkdir $skia_native -Copy-Item ..\src\Skia\native\Windows $skia_native -recurse -Copy-Item ..\src\Skia\native\Linux $skia_native -recurse Copy-Item ..\src\Skia\Perspex.Skia.Desktop\bin\x86\Release\Perspex.Skia.Desktop.dll $skia_lib - Copy-Item ..\src\Android\Perspex.Android\bin\Release\Perspex.Android.dll $android Copy-Item ..\src\Skia\Perspex.Skia.Android\bin\Release\Perspex.Skia.Android.dll $android diff --git a/nuget/skia/build/net45/Perspex.Skia.Desktop.targets b/nuget/skia/build/net45/Perspex.Skia.Desktop.targets deleted file mode 100644 index 41bfe91a99..0000000000 --- a/nuget/skia/build/net45/Perspex.Skia.Desktop.targets +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - native\%(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - - - \ No newline at end of file diff --git a/nuget/template/Perspex.Skia.Desktop.nuspec b/nuget/template/Perspex.Skia.Desktop.nuspec index 5203cd1409..59616049fa 100644 --- a/nuget/template/Perspex.Skia.Desktop.nuspec +++ b/nuget/template/Perspex.Skia.Desktop.nuspec @@ -13,6 +13,7 @@ Copyright 2015 Perspex + diff --git a/src/Skia/getnatives.ps1 b/src/Skia/getnatives.ps1 deleted file mode 100644 index a2606b5228..0000000000 --- a/src/Skia/getnatives.ps1 +++ /dev/null @@ -1,16 +0,0 @@ -$scriptpath = $MyInvocation.MyCommand.Path -$dir = Split-Path $scriptpath -Push-Location $dir - -Add-Type -AssemblyName System.IO.Compression.FileSystem - -rm -Force -Recurse .\native -ErrorAction SilentlyContinue -mkdir native -$url = cat native.url - -$nativedir = join-path $dir "native" -$nativezip = join-path $nativedir "native.zip" - -Invoke-WebRequest $url -OutFile $nativezip -[System.IO.Compression.ZipFile]::ExtractToDirectory(($nativezip), ($nativedir)) -Pop-Location \ No newline at end of file diff --git a/src/Skia/getnatives.sh b/src/Skia/getnatives.sh deleted file mode 100755 index 7486b35f80..0000000000 --- a/src/Skia/getnatives.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -rm -rf native native.zip -mkdir -p native -cd native -if which curl -then -curl `cat ../native.url` -o native.zip -else -wget `cat ../native.url` -O native.zip -fi - -unzip native.zip -chmod -R +x . diff --git a/src/Skia/native.url b/src/Skia/native.url deleted file mode 100644 index 737e1d3d06..0000000000 --- a/src/Skia/native.url +++ /dev/null @@ -1 +0,0 @@ -https://dl.dropboxusercontent.com/u/18301199/Perspex.Skia/abi-0003.zip From edb17e96b0cef5800bb778f9f9612bf4384df534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Sun, 17 Apr 2016 19:45:07 +0200 Subject: [PATCH 2/3] Updated appveyor --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 67367d8641..1aee6bb2cf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,6 @@ version: 1.0.{build} os: Visual Studio 2015 before_build: - git submodule update --init -- ps: src\Skia\getnatives.ps1 - nuget restore Perspex.sln environment: From 5da7f5ba29858bc88f36a6bbf4593aeb56bf7940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Sun, 17 Apr 2016 20:47:09 +0200 Subject: [PATCH 3/3] Remove EmbeddedNativeLibrary --- src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj b/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj index 04f0f6955e..92a3012ad7 100644 --- a/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj +++ b/src/Skia/Perspex.Skia.Android/Perspex.Skia.Android.csproj @@ -90,14 +90,6 @@ - - - native\armeabi-v7a\libperspesk.so - - - native\x86\libperspesk.so - -