Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
HendrikMennen committed Mar 17, 2024
1 parent e2b43e5 commit 33c3b3f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/OneWare.Quartus/OneWare.Quartus.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<ItemGroup>
<PackageReference Include="OneWare.Essentials" Version="0.4.4" Private="false" ExcludeAssets="runtime;Native"/>
<PackageReference Include="OneWare.UniversalFpgaProjectSystem" Version="0.16.5" Private="false" ExcludeAssets="runtime;Native"/>
<PackageReference Include="OneWare.UniversalFpgaProjectSystem" Version="0.16.6" Private="false" ExcludeAssets="runtime;Native"/>
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/OneWare.Quartus/QuartusToolchain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void SaveConnections(UniversalFpgaProjectRoot project, FpgaModel fpga)
}
}

public Task CompileAsync(UniversalFpgaProjectRoot project, FpgaModel fpga)
public Task<bool> CompileAsync(UniversalFpgaProjectRoot project, FpgaModel fpga)
{
try
{
Expand Down Expand Up @@ -93,7 +93,7 @@ public Task CompileAsync(UniversalFpgaProjectRoot project, FpgaModel fpga)
catch (Exception e)
{
logger.Error(e.Message, e);
return Task.CompletedTask;
return Task.FromResult(false);
}
}
}
6 changes: 4 additions & 2 deletions src/OneWare.Quartus/Services/QuartusService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ namespace OneWare.Quartus.Services;

public class QuartusService(IChildProcessService childProcessService, ILogger logger, IOutputService outputService, IDockService dockService)
{
public async Task CompileAsync(UniversalFpgaProjectRoot project, FpgaModel fpga)
public async Task<bool> CompileAsync(UniversalFpgaProjectRoot project, FpgaModel fpga)
{
if (project.TopEntity == null)
{
logger.Error("No TopEntity set");
return;
return false;
}

dockService.Show<IOutputService>();
Expand Down Expand Up @@ -42,5 +42,7 @@ public async Task CompileAsync(UniversalFpgaProjectRoot project, FpgaModel fpga)
outputService.WriteLine($"==================\n\nCompilation finished after {(int)compileTime.TotalMinutes:D2}:{compileTime.Seconds:D2}\n");
else
outputService.WriteLine($"==================\n\nCompilation failed after {(int)compileTime.TotalMinutes:D2}:{compileTime.Seconds:D2}\n", Brushes.Red);

return success;
}
}
4 changes: 2 additions & 2 deletions src/OneWare.Quartus/oneware.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
},
{
"Name": "OneWare.UniversalFpgaProjectSystem",
"MinVersion": "0.16.5.0",
"MaxVersion": "0.16.5.0"
"MinVersion": "0.16.6.0",
"MaxVersion": "0.16.6.0"
}
]
}

0 comments on commit 33c3b3f

Please sign in to comment.