Skip to content
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.

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

[NEW-FEATURE] Implement compilation of methods for swapping data between shadow, plain, online #29

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
1e71448
Create draft PR for #2
PTKu Jan 28, 2023
ee431b9
Merge branch 'dev' into 2-_NEW-FEATURE_Implement_compilation_of_metho…
PTKu Feb 7, 2023
1535b4a
[connector] adds methods for swapping data
PTKu Feb 7, 2023
d10220b
wip
PTKu Feb 7, 2023
998c91c
Adds methods for transfering data between plain <-> online
PTKu Feb 7, 2023
1e7b555
[ixc/connectors] adds integration testing project
PTKu Feb 8, 2023
81560d3
fixes an issue with wrong creation of type when constructing an array
PTKu Feb 8, 2023
ea9b2b2
solves several issues with data swapping (arrays) Plain <-> Online
PTKu Feb 8, 2023
1abb34d
synch with dev
PTKu Feb 8, 2023
cbb6bb0
fixes ixc cs tests
PTKu Feb 8, 2023
4f23430
Merge branch 'dev' into 2-_NEW-FEATURE_Implement_compilation_of_metho…
PTKu Feb 8, 2023
10d0866
added tests for swap methods, tests for date and datetime are failing
Specter-13 Feb 9, 2023
0becdf6
fix an issue when WSTRING null write attempt could occurr over WebAPI
PTKu Feb 10, 2023
06a6620
improves observability of failure on WebAPI connector (log, hmi visu)
PTKu Feb 10, 2023
ef1d2fa
added implementation for plaintoshadow/shadowtoplain swap methods
Specter-13 Feb 10, 2023
7b47ffb
multiple bug fixies on webapi connector
PTKu Feb 10, 2023
bb12827
Merge branch '2-_NEW-FEATURE_Implement_compilation_of_methods_for_swa…
PTKu Feb 10, 2023
d3da6fd
Merge pull request #61 from ix-ax/plain-to-shadow-shadow-to-plain
PTKu Feb 10, 2023
7a9808c
integration testing project takes target from environment variables
PTKu Feb 10, 2023
bec144d
adds integration tests
PTKu Feb 10, 2023
e165370
added tests for primitive types and enums for all swap methods
Specter-13 Feb 10, 2023
aef2e78
adds ixc build for missing projects
PTKu Feb 10, 2023
91ab90d
change to datetime
Specter-13 Feb 10, 2023
a1cd9e7
Merge branch '2-_NEW-FEATURE_Implement_compilation_of_methods_for_swa…
PTKu Feb 10, 2023
b8eb681
Merge pull request #63 from ix-ax/swap-methods-primitive-tests
PTKu Feb 10, 2023
8bcf23c
fixes an target address for integration testing
PTKu Feb 10, 2023
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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,7 @@ FodyWeavers.xsd
.idea/

ix/.g/**
.g/

.apax/
/src/apax/stc-generic-x64
Expand Down
35 changes: 21 additions & 14 deletions cake/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,20 @@ public override void Run(BuildContext context)
{
context.DotNetBuild(Path.Combine(context.RootDir, "ix.compiler\\src\\ixc\\Ix.ixc.csproj"), context.DotNetBuildSettings);

context.DotNetRunSettings.WorkingDirectory = Path.Combine(context.RootDir, "ix.blazor\\tests\\sandbox\\ax-blazor-example\\");

context.DotNetRun(Path.Combine(context.RootDir, "ix.compiler\\src\\ixc\\Ix.ixc.csproj"), context.DotNetRunSettings);
var axprojects = new List<string>()
{
Path.Combine(context.RootDir, "ix.blazor\\tests\\sandbox\\ax-blazor-example\\"),
Path.Combine(context.RootDir, "sanbox\\integration\\ix-integration-plc\\"),
Path.Combine(context.RootDir, "ix.examples\\hello.world.console\\hello.world.console.plc"),
Path.Combine(context.RootDir, "ix.connectors\\tests\\ax-test-project\\")
};

context.DotNetRunSettings.WorkingDirectory = Path.Combine(context.RootDir, "sanbox\\integration\\ix-integration-plc\\");
context.DotNetRun(Path.Combine(context.RootDir, "ix.compiler\\src\\ixc\\Ix.ixc.csproj"), context.DotNetRunSettings);

context.DotNetRunSettings.WorkingDirectory = Path.Combine(context.RootDir, "ix.examples\\hello.world.console\\hello.world.console.plc");
context.DotNetRun(Path.Combine(context.RootDir, "ix.compiler\\src\\ixc\\Ix.ixc.csproj"), context.DotNetRunSettings);
foreach (var axproject in axprojects)
{
context.DotNetRunSettings.WorkingDirectory = Path.Combine(context.RootDir, axproject);
context.DotNetRun(Path.Combine(context.RootDir, "ix.compiler\\src\\ixc\\Ix.ixc.csproj"), context.DotNetRunSettings);
}

context.DotNetBuild(Path.Combine(context.RootDir, "ix.sln"), context.DotNetBuildSettings);

Expand Down Expand Up @@ -155,13 +160,15 @@ public override void Run(BuildContext context)
}
else
{
var workingDirectory = Path.GetFullPath(Path.Combine(context.WorkDirName,
"..//..//src//ix.connectors//tests//ax-test-project//"));

var targetIp = Environment.GetEnvironmentVariable("AXTARGET");
var targetPlatform = Environment.GetEnvironmentVariable("AXTARGETPLATFORMINPUT");

UploadTestPlc(context, workingDirectory, targetIp, targetPlatform);
UploadTestPlc(context,
Path.GetFullPath(Path.Combine(context.WorkDirName, "..//..//src//ix.connectors//tests//ax-test-project//")),
Environment.GetEnvironmentVariable("AX_WEBAPI_TARGET"),
Environment.GetEnvironmentVariable("AXTARGETPLATFORMINPUT"));

UploadTestPlc(context,
Path.GetFullPath(Path.Combine(context.WorkDirName, "..//..//src//tests.integrations//integrated//src//ax")),
Environment.GetEnvironmentVariable("AXTARGET"),
Environment.GetEnvironmentVariable("AXTARGETPLATFORMINPUT"));

RunTestsFromFilteredSolution(context, Path.Combine(context.RootDir, "ix-L3-tests.slnf"));
}
Expand Down
8 changes: 6 additions & 2 deletions src/ix-L3-tests.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,19 @@
"ix.examples\\hello.world.console\\hello.world.console.plc\\ix\\hello.world.console.plc.csproj",
"ix.examples\\hello.world.console\\hello.world.console\\hello.world.console.csproj",
"ix.templates\\working\\ix.templates.csproj",
"ix.templates\\working\\templates\\ixblazor\\ixblazor.app\\ixblazor.hmi.csproj",
"ix.templates\\working\\templates\\ixblazor\\ixblazor.twin\\ixblazor.csproj",
"ix.templates\\working\\templates\\ixblazor\\ixblazor\\ixblazor.app.csproj",
"ix.templates\\working\\templates\\ixconsole\\ixconsole.twin\\ixconsole.csproj",
"ix.templates\\working\\templates\\ixconsole\\ixconsole\\ixconsole.app.csproj",
"ix.templates\\working\\templates\\ixtwin\\ixtwin.csproj",
"ix.tools\\src\\ix.nuget.update\\ix.nuget.update.csproj",
"ix.tools\\tests\\ix.nuget.update.Tests\\ix.nuget.update.Tests.csproj",
"sanbox\\integration\\ix-integration-blazor\\ix-integration-blazor.csproj",
"sanbox\\integration\\ix-integration-plc\\ix\\ix-integration-plc.csproj"
"sanbox\\integration\\ix-integration-library\\ix-integration-library.csproj",
"sanbox\\integration\\ix-integration-plc\\ix\\ix-integration-plc.csproj",
"tests.integrations\\integrated\\src\\integrated.app\\integrated.hmi.csproj",
"tests.integrations\\integrated\\src\\integrated.twin\\integrated.csproj",
"tests.integrations\\integrated\\tests\\integrated.tests\\integrated.tests.csproj"
]
}
}

This file was deleted.

This file was deleted.

Loading