From 5a93c7d576cd03ba9e7ddbaa0341c48eca37084b Mon Sep 17 00:00:00 2001 From: Nir Azkiel Date: Mon, 3 Jul 2023 08:23:20 +0300 Subject: [PATCH 1/2] add no easylogging to CI build --- .github/workflows/buildsCI.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildsCI.yaml b/.github/workflows/buildsCI.yaml index f1a24e7fa4..707f058bd6 100644 --- a/.github/workflows/buildsCI.yaml +++ b/.github/workflows/buildsCI.yaml @@ -21,7 +21,7 @@ jobs: #-------------------------------------------------------------------------------- - Win_SH_EX_CfU: # Windows, shared, with Examples & Tools, and Check for Updates + Win_SH_EX_CfU: # Windows, shared, with Examples & Tools, no EasyLogging and Check for Updates runs-on: windows-2019 timeout-minutes: 60 steps: @@ -53,7 +53,7 @@ jobs: cd ${{env.WIN_BUILD_DIR}} pwd ls - cmake ${LRS_SRC_DIR} -G "Visual Studio 16 2019" -DBUILD_SHARED_LIBS=true -DBUILD_EXAMPLES=true -DBUILD_TOOLS=true -DCHECK_FOR_UPDATES=true + cmake ${LRS_SRC_DIR} -G "Visual Studio 16 2019" -DBUILD_SHARED_LIBS=true -DBUILD_EXAMPLES=true -DBUILD_TOOLS=true -DCHECK_FOR_UPDATES=true -DBUILD_EASYLOGGINGPP=false - name: Build # Build your program with the given configuration From 045a1c2a4cf530051f5971ba54e9eca5c14263c7 Mon Sep 17 00:00:00 2001 From: Nir Azkiel Date: Mon, 3 Jul 2023 09:11:41 +0300 Subject: [PATCH 2/2] fix issues --- .github/workflows/buildsCI.yaml | 47 ++++++++++++++++++++-- src/proc/formats-converter.h | 1 + src/terminal-parser.cpp | 6 --- third-party/rsutils/src/ensure-console.cpp | 1 + 4 files changed, 46 insertions(+), 9 deletions(-) diff --git a/.github/workflows/buildsCI.yaml b/.github/workflows/buildsCI.yaml index 707f058bd6..e1a8fe66c3 100644 --- a/.github/workflows/buildsCI.yaml +++ b/.github/workflows/buildsCI.yaml @@ -21,7 +21,7 @@ jobs: #-------------------------------------------------------------------------------- - Win_SH_EX_CfU: # Windows, shared, with Examples & Tools, no EasyLogging and Check for Updates + Win_SH_EX_CfU: # Windows, shared, with Examples & Tools, and Check for Updates runs-on: windows-2019 timeout-minutes: 60 steps: @@ -53,16 +53,57 @@ jobs: cd ${{env.WIN_BUILD_DIR}} pwd ls - cmake ${LRS_SRC_DIR} -G "Visual Studio 16 2019" -DBUILD_SHARED_LIBS=true -DBUILD_EXAMPLES=true -DBUILD_TOOLS=true -DCHECK_FOR_UPDATES=true -DBUILD_EASYLOGGINGPP=false + cmake ${LRS_SRC_DIR} -G "Visual Studio 16 2019" -DBUILD_SHARED_LIBS=true -DBUILD_EXAMPLES=true -DBUILD_TOOLS=true -DCHECK_FOR_UPDATES=true - name: Build # Build your program with the given configuration shell: bash run: | cd ${{env.WIN_BUILD_DIR}} - cmake --build . --config ${{env.LRS_RUN_CONFIG}} -- -m + cmake --build . --config ${{env.LRS_RUN_CONFIG}} -- -m + #-------------------------------------------------------------------------------- + Win_SH_EX_No_Logs: # Windows, shared, with Examples & Tools, no EasyLogging and no Check for Updates + runs-on: windows-2019 + timeout-minutes: 60 + steps: + - uses: actions/checkout@v3 + - name: Enable Long Paths + shell: powershell + run: | + New-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" -Name "LongPathsEnabled" -Value 1 -PropertyType DWORD -Force + + - name: Check_API + shell: bash + run: | + cd scripts + ./api_check.sh + cd .. + + - name: PreBuild + shell: bash + run: | + mkdir ${{env.WIN_BUILD_DIR}} + + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + shell: bash + run: | + LRS_SRC_DIR=$(pwd) + cd ${{env.WIN_BUILD_DIR}} + pwd + ls + cmake ${LRS_SRC_DIR} -G "Visual Studio 16 2019" -DBUILD_SHARED_LIBS=true -DBUILD_EXAMPLES=true -DBUILD_TOOLS=true -DCHECK_FOR_UPDATES=false -DBUILD_EASYLOGGINGPP=false + + - name: Build + # Build your program with the given configuration + shell: bash + run: | + cd ${{env.WIN_BUILD_DIR}} + cmake --build . --config ${{env.LRS_RUN_CONFIG}} -- -m + #-------------------------------------------------------------------------------- Win_ST_Py_CI: # Windows, Static, Python, Tools, libCI with executables runs-on: windows-2019 diff --git a/src/proc/formats-converter.h b/src/proc/formats-converter.h index b011b8e7a1..c21d5361b3 100644 --- a/src/proc/formats-converter.h +++ b/src/proc/formats-converter.h @@ -7,6 +7,7 @@ #include #include +#include #include namespace librealsense diff --git a/src/terminal-parser.cpp b/src/terminal-parser.cpp index 17cce7495a..5c8d19d18d 100644 --- a/src/terminal-parser.cpp +++ b/src/terminal-parser.cpp @@ -32,12 +32,6 @@ namespace librealsense auto raw_data = build_raw_command_data(command, params); - for (auto b : raw_data) - { - cout << hex << fixed << setfill('0') << setw(2) << (int)b << " "; - } - cout << endl; - return raw_data; } diff --git a/third-party/rsutils/src/ensure-console.cpp b/third-party/rsutils/src/ensure-console.cpp index d1f74c64ab..c042a602ad 100644 --- a/third-party/rsutils/src/ensure-console.cpp +++ b/third-party/rsutils/src/ensure-console.cpp @@ -2,6 +2,7 @@ // Copyright(c) 2023 Intel Corporation. All Rights Reserved. #if defined( WIN32 ) +#include #include #include #endif