Browse Source

tmp: pr 3114 compile avalonia.native.dylib with nuke and fix clean

Andrey Kunchev 6 years ago
parent
commit
8ce7977ec3
  1. 12
      nukebuild/Build.cs
  2. 2
      nukebuild/BuildParameters.cs
  3. 3
      src/Avalonia.Native/Avalonia.Native.csproj

12
nukebuild/Build.cs

@ -123,8 +123,18 @@ partial class Build : NukeBuild
EnsureCleanDirectory(Parameters.TestResultsRoot);
});
Target CompileNative => _ => _
.DependsOn(Clean)
.OnlyWhen(() => EnvironmentInfo.IsOsx)
.Executes(() =>
{
var project = $"{RootDirectory}/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/";
var args = $"-project {project} -configuration {Parameters.Configuration} CONFIGURATION_BUILD_DIR={RootDirectory}/Build/Products/Release";
ProcessTasks.StartProcess("xcodebuild", args).AssertZeroExitCode();
});
Target Compile => _ => _
.DependsOn(Clean)
.DependsOn(Clean, CompileNative)
.Executes(() =>
{
if (Parameters.IsRunningOnWindows)

2
nukebuild/BuildParameters.cs

@ -122,7 +122,7 @@ public partial class Build
ZipRoot = ArtifactsDir / "zip";
BinRoot = ArtifactsDir / "bin";
TestResultsRoot = ArtifactsDir / "test-results";
BuildDirs = GlobDirectories(RootDirectory, "**bin").Concat(GlobDirectories(RootDirectory, "**obj")).ToList();
BuildDirs = new[] { "src", "samples", "tests" }.SelectMany(v => GlobDirectories(RootDirectory / v, "**/bin", "**/obj")).ToList();
DirSuffix = Configuration;
FileZipSuffix = Version + ".zip";
ZipCoreArtifacts = ZipRoot / ("Avalonia-" + FileZipSuffix);

3
src/Avalonia.Native/Avalonia.Native.csproj

@ -9,8 +9,9 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup Condition="'$(Configuration)' == 'Release' AND '$([MSBuild]::IsOSPlatform(OSX))' == 'true'">
<ItemGroup Condition="'$([MSBuild]::IsOSPlatform(OSX))' == 'true'">
<Content Include="../../Build/Products/Release/libAvalonia.Native.OSX.dylib">
<Link>libAvaloniaNative.dylib</Link>
<PackagePath>runtimes/osx/native/libAvaloniaNative.dylib</PackagePath>
<Pack>true</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

Loading…
Cancel
Save