Skip to content

Commit

Permalink
Merge branch 'master' into features/zxgraphics
Browse files Browse the repository at this point in the history
  • Loading branch information
Duefectu committed Nov 5, 2024
2 parents 61766e8 + 577007b commit 8227c9d
Show file tree
Hide file tree
Showing 5 changed files with 129 additions and 3 deletions.
53 changes: 53 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Bug Report
description: File a bug report.
title: "[Bug]: "
labels: ["bug", "triage"]
projects: ["boriel-basic/2"]
assignees:
- duefectu
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: input
id: contact
attributes:
label: Contact Details
description: How can we get in touch with you if we need more info?
placeholder: e.g. Telegram @nickname
validations:
required: false
- type: input
id: version
attributes:
label: IDE version
description: |
Always check you have the latest version.
placeholder: 0.2-beta
validations:
required: true
- type: textarea
id: what-happened
attributes:
label: What happened?
description: Also tell us, what did you expect to happen?
placeholder: Tell us what you see!
validations:
required: true
- type: textarea
id: logs
attributes:
label: Error and Warning messages
description: |
Please copy and paste any relevant log output.
This will be automatically formatted into code, so no need for backticks.
render: shell
- type: checkboxes
id: terms
attributes:
label: Code of Conduct
description: By submitting this issue, you agree to follow our [Code of Conduct](https://boriel-basic/zxbasic/blob/main/CODE_OF_CONDUCT.md).
options:
- label: I agree to follow this project's Code of Conduct
required: true
24 changes: 22 additions & 2 deletions ZXBStudio/BuildSystem/ZXProjectBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,9 @@ private static void CheckNextCreator()
OutputLogWritter.WriteLine("Building map files...");

foreach (var file in files)
{
file.CreateBuildFile(files);
}

OutputLogWritter.WriteLine("Building program map...");

Expand All @@ -344,7 +346,10 @@ private static void CheckNextCreator()
return null;
}

var proc = Process.Start(new ProcessStartInfo(Path.GetFullPath(ZXOptions.Current.ZxbcPath), $"\"{Path.Combine(codeFile.Directory, codeFile.TempFileName)}\" -M MEMORY_MAP " + args) { WorkingDirectory = project.ProjectPath, RedirectStandardError = true, CreateNoWindow = true });
var proc = Process.Start(
new ProcessStartInfo(
Path.GetFullPath(ZXOptions.Current.ZxbcPath),
$"\"{Path.Combine(codeFile.Directory, codeFile.TempFileName)}\" -M MEMORY_MAP " + args) { WorkingDirectory = project.ProjectPath, RedirectStandardError = true, CreateNoWindow = true });

OutputProcessLog(OutputLogWritter, proc, out logOutput);

Expand All @@ -364,7 +369,22 @@ private static void CheckNextCreator()

OutputLogWritter.WriteLine("Building variable map...");

proc = Process.Start(new ProcessStartInfo(Path.GetFullPath(ZXOptions.Current.ZxbcPath), $"\"{Path.Combine(codeFile.Directory, codeFile.TempFileName)}\" -E " + args) { WorkingDirectory = project.ProjectPath, RedirectStandardError = true, CreateNoWindow = true });
// DUEFECTU: 2024.09.11 -> Force .ic extension for debug
//proc = Process.Start(new ProcessStartInfo(Path.GetFullPath(ZXOptions.Current.ZxbcPath), $"\"{Path.Combine(codeFile.Directory, codeFile.TempFileName)}\" -E " + args) { WorkingDirectory = project.ProjectPath, RedirectStandardError = true, CreateNoWindow = true });
var pi = new ProcessStartInfo();
pi.WorkingDirectory = project.ProjectPath;
pi.RedirectStandardError = true;
pi.CreateNoWindow = true;
// Compile command
var tempFileName = Path.Combine(codeFile.Directory, codeFile.TempFileName);
var debugFile = Path.GetFileNameWithoutExtension(tempFileName) + ".ic"; // force .ic extension
pi.FileName = Path.GetFullPath(ZXOptions.Current.ZxbcPath); // ZXBC.exe
pi.Arguments = string.Format("\"{0}\" -E -o {1} {2}",
tempFileName, // Main project file
debugFile, // Debug file
args); // user arguments
// Go for it
proc = Process.Start(pi);

OutputProcessLog(OutputLogWritter, proc, out logOutput);

Expand Down
12 changes: 11 additions & 1 deletion ZXBasicStudio.sln
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Elementos de la solución",
README.md = README.md
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeadlessEmulator", "HeadlessEmulator\HeadlessEmulator.csproj", "{D99C36AE-072A-4885-9585-CFD78FC6763E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HeadlessEmulator", "HeadlessEmulator\HeadlessEmulator.csproj", "{D99C36AE-072A-4885-9585-CFD78FC6763E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZXBasicStudioTest", "ZXBasicStudioTest\ZXBasicStudioTest.csproj", "{6A0F3D17-4AC4-43AC-BA18-2133D61D6F23}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -107,6 +109,14 @@ Global
{D99C36AE-072A-4885-9585-CFD78FC6763E}.Release|Any CPU.Build.0 = Release|Any CPU
{D99C36AE-072A-4885-9585-CFD78FC6763E}.Release|x64.ActiveCfg = Release|Any CPU
{D99C36AE-072A-4885-9585-CFD78FC6763E}.Release|x64.Build.0 = Release|Any CPU
{6A0F3D17-4AC4-43AC-BA18-2133D61D6F23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6A0F3D17-4AC4-43AC-BA18-2133D61D6F23}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6A0F3D17-4AC4-43AC-BA18-2133D61D6F23}.Debug|x64.ActiveCfg = Debug|Any CPU
{6A0F3D17-4AC4-43AC-BA18-2133D61D6F23}.Debug|x64.Build.0 = Debug|Any CPU
{6A0F3D17-4AC4-43AC-BA18-2133D61D6F23}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6A0F3D17-4AC4-43AC-BA18-2133D61D6F23}.Release|Any CPU.Build.0 = Release|Any CPU
{6A0F3D17-4AC4-43AC-BA18-2133D61D6F23}.Release|x64.ActiveCfg = Release|Any CPU
{6A0F3D17-4AC4-43AC-BA18-2133D61D6F23}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
14 changes: 14 additions & 0 deletions ZXBasicStudioTest/UnitTest1.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
namespace ZXBasicStudioTest
{
public class UnitTest1
{
[Fact]
public void Test1()
{
int a = 10;
int b = 20;

Assert.NotEqual(a, b);
}
}
}
29 changes: 29 additions & 0 deletions ZXBasicStudioTest/ZXBasicStudioTest.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Using Include="Xunit" />
</ItemGroup>

</Project>

0 comments on commit 8227c9d

Please sign in to comment.