Skip to content

Commit ef4b936

Browse files
committed
Windows build files updated. Updated version of iec61850client.
1 parent aa59398 commit ef4b936

File tree

9 files changed

+22
-14
lines changed

9 files changed

+22
-14
lines changed

platform-windows/build.bat

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ set SRCPATH=%JSPATH%\src
99
set BINPATH=%JSPATH%\bin
1010
set BINWINPATH=%JSPATH%\demo-docker\bin_win
1111
set NPM=%JSPATH%\platform-windows\nodejs-runtime\npm
12+
rem _set NPM="%programfiles%\nodejs\npm"
1213

1314
cd %JSPATH%
1415
mkdir bin
@@ -21,8 +22,11 @@ cd %SRCPATH%\dnp3\Dnp3Client\
2122
dotnet publish --self-contained --runtime win-x64 -p:PublishReadyToRun=true -c Release -o %BINWINPATH% Dnp3Client.csproj
2223

2324
cd %SRCPATH%\libiec61850\build
24-
rem set VCTargetsPath=d:\ProgramFiles\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\
25-
rem set VCTargetsPath=c:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\
25+
rem set VCTargetsPath=C:\ProgramFiles\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\
26+
rem set VCTargetsPath=D:\ProgramFiles\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\
27+
rem set VCToolsInstallDir=D:\ProgramFiles\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.39.33519\
28+
rem dotnet clean -c Release libiec61850.sln
29+
2630
dotnet publish --no-self-contained --runtime win-x64 -c Release libiec61850.sln
2731
copy %SRCPATH%\libiec61850\build\src\Release\iec61850.dll %BINPATH%
2832

@@ -61,7 +65,7 @@ set GOBIN=c:\json-scada\bin
6165
cd %SRCPATH%\calculations
6266
go mod tidy
6367
go build
64-
copy /Y calculations %BINPATH%
68+
copy /Y calculations.exe %BINPATH%
6569

6670
rem cd %SRCPATH%\plc4x-client
6771
rem go get "github.com/icza/bitio"

platform-windows/buildupd.bat

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ set SRCPATH=%JSPATH%\src
99
set BINPATH=%JSPATH%\bin
1010
set BINWINPATH=%JSPATH%\demo-docker\bin_win
1111
set NPM=%JSPATH%\platform-windows\nodejs-runtime\npm
12+
rem _set NPM="%programfiles%\nodejs\npm"
1213

1314
cd %JSPATH%
1415
mkdir bin
@@ -21,8 +22,11 @@ cd %SRCPATH%\dnp3\Dnp3Client\
2122
dotnet publish --self-contained --runtime win-x64 -p:PublishReadyToRun=true -c Release -o %BINWINPATH% Dnp3Client.csproj
2223

2324
cd %SRCPATH%\libiec61850\build
24-
rem set VCTargetsPath=d:\ProgramFiles\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\
25-
rem set VCTargetsPath=c:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\
25+
rem set VCTargetsPath="C:\ProgramFiles\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\"
26+
rem set VCTargetsPath="D:\ProgramFiles\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\"
27+
rem set VCToolsInstallDir="D:\ProgramFiles\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.39.33519\"
28+
rem dotnet clean -c Release libiec61850.sln
29+
2630
dotnet publish --no-self-contained --runtime win-x64 -c Release libiec61850.sln
2731
copy %SRCPATH%\libiec61850\build\src\Release\iec61850.dll %BINPATH%
2832

@@ -61,7 +65,7 @@ set GOBIN=c:\json-scada\bin
6165
cd %SRCPATH%\calculations
6266
go mod tidy
6367
go build
64-
copy /Y calculations %BINPATH%
68+
copy /Y calculations.exe %BINPATH%
6569

6670
rem cd %SRCPATH%\plc4x-client
6771
rem go get "github.com/icza/bitio"

src/libiec61850/dotnet/core/2.0/iec61850_client/AsduReceiveHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This software implements a IEC61850 driver for JSON SCADA.
3-
* Copyright - 2020-2023 - Ricardo Lastra Olsen
3+
* Copyright - 2020-2024 - Ricardo Lastra Olsen
44
*
55
* Requires libiec61850 from MZ Automation.
66
*

src/libiec61850/dotnet/core/2.0/iec61850_client/Common_srv_cli.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This software implements a IEC61850 driver for JSON SCADA.
3-
* Copyright - 2020-2023 - Ricardo Lastra Olsen
3+
* Copyright - 2020-2024 - Ricardo Lastra Olsen
44
*
55
* Requires libiec61850 from MZ Automation.
66
*

src/libiec61850/dotnet/core/2.0/iec61850_client/Main.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This software implements a IEC61850 driver for JSON SCADA.
3-
* Copyright - 2020-2023 - Ricardo Lastra Olsen
3+
* Copyright - 2020-2024 - Ricardo Lastra Olsen
44
*
55
* Requires libiec61850 from MZ Automation.
66
*
@@ -35,7 +35,7 @@ partial class MainClass
3535
{
3636
public static String CopyrightMessage = "{json:scada} IEC61850 Client Driver - Copyright 2023 Ricardo Olsen";
3737
public static String ProtocolDriverName = "IEC61850";
38-
public static String DriverVersion = "0.1.5";
38+
public static String DriverVersion = "0.1.6";
3939
public static bool Active = false; // indicates this driver instance is the active node in the moment
4040
public static Int32 DataBufferLimit = 20000; // limit to start dequeuing and discarding data from the acquisition buffer
4141
public static Int32 BulkWriteLimit = 1250; // limit of each bulk write to mongodb

src/libiec61850/dotnet/core/2.0/iec61850_client/MongoCommands.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This software implements a IEC61850 driver for JSON SCADA.
3-
* Copyright - 2020-2023 - Ricardo Lastra Olsen
3+
* Copyright - 2020-2024 - Ricardo Lastra Olsen
44
*
55
* Requires libiec61850 from MZ Automation.
66
*

src/libiec61850/dotnet/core/2.0/iec61850_client/MongoUpdate.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This software implements a IEC61850 driver for JSON SCADA.
3-
* Copyright - 2020-2023 - Ricardo Lastra Olsen
3+
* Copyright - 2020-2024 - Ricardo Lastra Olsen
44
*
55
* Requires libiec61850 from MZ Automation.
66
*

src/libiec61850/dotnet/core/2.0/iec61850_client/Redundancy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This software implements a IEC61850 driver for JSON SCADA.
3-
* Copyright - 2020-2023 - Ricardo Lastra Olsen
3+
* Copyright - 2020-2024 - Ricardo Lastra Olsen
44
*
55
* Requires libiec61850 from MZ Automation.
66
*

src/libiec61850/dotnet/core/2.0/iec61850_client/TagsCreation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This software implements a IEC61850 driver for JSON SCADA.
3-
* Copyright - 2020-2023 - Ricardo Lastra Olsen
3+
* Copyright - 2020-2024 - Ricardo Lastra Olsen
44
*
55
* Requires libiec61850 from MZ Automation.
66
*

0 commit comments

Comments
 (0)