Som devel (#72)

* removed std::endl

* progress

* fix: covbr2html -> py

* no more sombin

* update sompy

* adapted ci

.github/workflows/c-cpp.yml

@@ -6,9 +6,9 @@ name: DSTW CI
 
 on:
   push:
-    branches: [ "dev_98", "dev_20", "release" ]
+    branches: [ "dev", "dev_98" ]
   pull_request:
-    branches: [ "dev_98", "dev_20", "release" ]
+    branches: [ "dev", "dev_98" ]
 
 jobs:
   buildAndRunAll:

.gitmodules

@@ -9,7 +9,3 @@
 	path = submodules/sompy
 	url = [email protected]:sorgom/sompy.git
 	branch = dev
-[submodule "sombin"]
-	path = submodules/sombin
-	url = [email protected]:sorgom/sombin.git
-	branch = dev

application/components/COM/src/TCP_Com.cpp

@@ -2,8 +2,6 @@
 #include <SYS/IL.h>
 #include <BAS/coverage.h>
 
-using std::endl;
-
 std::ostream& TCP_Com_Base::comerr()
 {
     return IL::getLog().log(COMP_COM, RET_ERR_COM) << "E ";
@@ -20,17 +18,17 @@ bool Tcp_Listener_Base::listen(const UINT16 port)
     if (mSocket < 0)
     {
         ok = false;
-        comerr() << "socket " << port << endl;
+        comerr() << "socket " << port << '\n';
     }
     else if (not tcp.bind(mSocket, port))
     {
         ok = false;
-        comerr() << "bind " << port << endl;
+        comerr() << "bind " << port << '\n';
     }
     else if (not tcp.listen(mSocket))
     {
         ok = false;
-        comerr() << "listen " << port << endl;
+        comerr() << "listen " << port << '\n';
     }
 
     if (not ok)
@@ -50,7 +48,7 @@ bool Tcp_Listener_Base::select()
 
     if (not ok)
     {
-        comerr() << "select" << endl;
+        comerr() << "select" << '\n';
         tcp.close(mSocket);
     }
     return ok;
@@ -93,7 +91,7 @@ bool TCP_Con_Base::accept(const INT32 socket)
     }
     else
     {
-        comerr() << "accept" << endl;
+        comerr() << "accept" << '\n';
     }
     return ok;
 }
@@ -136,7 +134,7 @@ bool TCP_Con_Base::select()
     }
     if (not ok)
     {
-        comerr() << "select" << endl;
+        comerr() << "select" << '\n';
     }
     return ok;
 }

application/main/AppMain.cpp

@@ -1,6 +1,6 @@
 #include <SYS/IL.h>
 #include <iostream>
-using std::cout, std::endl;
+using std::cout;
 #include <iomanip>
 using std::setw;
 
@@ -10,19 +10,19 @@ int main(const INT32 argc, const CONST_C_STRING* const argv)
 
     E_Ret res = IL::getLog().maxerr();
     cout
-        << "TSW: " << setw(5) << IL::getTSW_Provider().size() << endl
-        << "SIG: " << setw(5) << IL::getSIG_Provider().size() << endl
-        << "LCR: " << setw(5) << IL::getLCR_Provider().size() << endl
-        << "ERR: " << setw(5) << static_cast<UINT16>(res) << endl
+        << "TSW: " << setw(5) << IL::getTSW_Provider().size() << '\n'
+        << "SIG: " << setw(5) << IL::getSIG_Provider().size() << '\n'
+        << "LCR: " << setw(5) << IL::getLCR_Provider().size() << '\n'
+        << "ERR: " << setw(5) << static_cast<UINT16>(res) << '\n'
     ;
 
     if (res == RET_NO_ERR and argc > 1)
     {
-        cout << "run .." << endl;
+        cout << "run .." << '\n';
         IL::getCom().run();
         res = IL::getLog().maxerr();
         cout
-            << "ERR: " << setw(5) << static_cast<UINT16>(res) << endl
+            << "ERR: " << setw(5) << static_cast<UINT16>(res) << '\n'
         ;
     }
     return res;

devel/qnd/useCout.h

@@ -11,10 +11,10 @@
 
 #include <iostream>
 #include <iomanip>
-using std::ostream, std::cout, std::endl;
+using std::ostream, std::cout;
 #include <iomanip>
 using std::setw, std::left, std::right, std::setfill, std::hex;
 
 #include <cstdio>
 
-#define TRACEVAR(VAR) cout << #VAR << ": " << VAR << endl;
+#define TRACEVAR(VAR) cout << #VAR << ": " << VAR << '\n';

make/bullseye/_covreport.cmd

@@ -26,7 +26,7 @@ cd %dstwDir%
 if %_gentodo% (
     echo - todo
     covbr -qu --srcdir . > %covTodoTxt%
-    %binDir%\covbr2html.exe -co %myReportsDir% %covTodoTxt%
+    %pyDir%\covbr2html\covbr2html.py -co %myReportsDir% %covTodoTxt%
 )
 if %_genmd% call %myDir%\_cov2md.cmd
 

make/bullseye/_covsetup.cmd

@@ -14,7 +14,7 @@ set subsDir=%cd%\submodules
 set ReportsDir=%cd%\reports
 set myReportsDir=%reportsDir%\%_me%
 
-set binDir=%subsDir%\sombin
+set pyDir=%subsDir%\sompy
 set vsSolution=%makeDir%\DSTW.sln
 set exeDir=%buildDir%\windows\bin
 set buildLog=%myReportsDir%\build.txt
@@ -33,7 +33,8 @@ set tmpCmd=%buildDir%\tmp.cmd
 
 md %buildDir% >NUL 2>&1
 
-%binDir%\docopts.exe %optsTxt% %* > %tmpCmd%
+%pyDir%\somutil\docopts.py %optsTxt% %* > %tmpCmd%
+if %errorlevel% NEQ 0 exit /b 1
 call %tmpCmd%
 
 if not exist %covfile% set _c=1==1

make/runSub.cmd

@@ -2,6 +2,5 @@
 SETLOCAL
 set tsfile=%1
 call %2 %3 %4 %5 %6 %7 %8 %9
-echo return code: %errorlevel%
 del /Q %tsfile% 2>nul
 exit 0

make/runSystemTests.cmd

@@ -10,16 +10,14 @@ cd ..
 set buildDir=%cd%\build
 set bindir=windows\bin
 cd %myDir%
+echo - build
 msbuild DSTW.sln -t:dstw_gen,dstw_runtime,systemtests,dstw_stop >NUL
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 set tmpfile=tmp_%random%.txt
 
 cd %buildDir%
-
-%binDir%\dstw_stop.exe
-timeout /t 1 /nobreak >nul
-
+echo - run
 rem gen required proj data file
 %binDir%\dstw_gen.exe
 rem start app in background
@@ -30,8 +28,10 @@ rem run tests
 set ret=%errorlevel%
 rem stop app anyway
 %binDir%\dstw_stop.exe
+goto check
 :wait
-timeout /t 1 /nobreak >nul
+timeout /t 1 /nobreak >NUL
+:check
 if exist %tmpfile% goto wait
 
 exit /b %ret%

testing/testenv/comparators/Comparator.h

@@ -41,7 +41,7 @@ namespace test
 
         SimpleString valueToString(CPTR ptr)
         {
-            begin() << std::endl << *reinterpret_cast<const T*>(ptr);
+            begin() << '\n' << *reinterpret_cast<const T*>(ptr);
             //  content is copied by CppUTest
             //  cppcheck-suppress returnDanglingLifetime
             return mStream.str().c_str();

testing/testenv/comparators/ostreamHelpers.h

@@ -37,15 +37,15 @@
 
 //  output line for standard types
 #define DOUT(NAME) \
-    OUT_BEGIN(NAME) << d.NAME << std::endl
+    OUT_BEGIN(NAME) << d.NAME << '\n'
 
 //  output line for fixed character types
 #define DFIX(NAME) \
-    OUT_BEGIN(NAME) << fixT(d.NAME) << std::endl
+    OUT_BEGIN(NAME) << fixT(d.NAME) << '\n'
 
 //  output line for UINT8 arrays
 #define DU8X(NAME) \
-    OUT_BEGIN(NAME) << fixU(d.NAME) << std::endl
+    OUT_BEGIN(NAME) << fixU(d.NAME) << '\n'
 
 //  helper struct for fixed array types
 template <typename T>

testing/testenv/comparators/src/Comparator.cpp

@@ -6,6 +6,6 @@ namespace test
     std::ostream& ComparatorBase::begin()
     {
         mStream.str("");
-        return mStream << std::endl;
+        return mStream << '\n';
     }
-}
+}