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.

Sign up for GitHub

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

Bump dependencies #366

Merged
merged 4 commits into from
Feb 2, 2024
Merged

Bump dependencies #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b588d13
Bump boost to 1.83.0 and cpprestsdk to 2.10.19
lo-simon Jan 31, 2024
5b65243
highest_pri and lowest_pri are used for node only
lo-simon Jan 31, 2024
3c6f192
Update doc
lo-simon Jan 31, 2024
4bfe150
Update comment
lo-simon Jan 31, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ jobs:
libssl-dev

cd ${{ env.RUNNER_WORKSPACE }}
git clone --recurse-submodules --branch v2.10.18 https://github.com/Microsoft/cpprestsdk
git clone --recurse-submodules --branch v2.10.19 https://github.com/Microsoft/cpprestsdk
cd cpprestsdk/Release
mkdir build
cd build
Expand Down Expand Up @@ -801,7 +801,7 @@ jobs:
libssl-dev

cd ${{ env.RUNNER_WORKSPACE }}
git clone --recurse-submodules --branch v2.10.18 https://github.com/Microsoft/cpprestsdk
git clone --recurse-submodules --branch v2.10.19 https://github.com/Microsoft/cpprestsdk
cd cpprestsdk/Release
mkdir build
cd build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/src/build-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
libssl-dev

cd ${{ env.RUNNER_WORKSPACE }}
git clone --recurse-submodules --branch v2.10.18 https://github.com/Microsoft/cpprestsdk
git clone --recurse-submodules --branch v2.10.19 https://github.com/Microsoft/cpprestsdk
cd cpprestsdk/Release
mkdir build
cd build
Expand Down
4 changes: 2 additions & 2 deletions Development/cmake/NmosCppDependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Boost

set(BOOST_VERSION_MIN "1.54.0")
set(BOOST_VERSION_CUR "1.80.0")
set(BOOST_VERSION_CUR "1.83.0")
# note: 1.57.0 doesn't work due to https://svn.boost.org/trac10/ticket/10754
# note: some components are only required for one platform or other
# so find_package(Boost) is called after adding those components
Expand Down Expand Up @@ -95,7 +95,7 @@ add_library(nmos-cpp::Boost ALIAS Boost)

# note: 2.10.16 or higher is recommended (which is the first version with cpprestsdk-configVersion.cmake)
set(CPPRESTSDK_VERSION_MIN "2.10.11")
set(CPPRESTSDK_VERSION_CUR "2.10.18")
set(CPPRESTSDK_VERSION_CUR "2.10.19")
find_package(cpprestsdk REQUIRED)
if(NOT cpprestsdk_VERSION)
message(STATUS "Found cpprestsdk unknown version; minimum version: " ${CPPRESTSDK_VERSION_MIN})
Expand Down
4 changes: 2 additions & 2 deletions Development/conanfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[requires]
boost/1.80.0
cpprestsdk/2.10.18
boost/1.83.0
cpprestsdk/2.10.19
websocketpp/0.8.2
openssl/1.1.1s
json-schema-validator/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion Development/nmos/client_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ namespace nmos
}

#ifdef CPPRESTSDK_ENABLE_BIND_WEBSOCKET_CLIENT
// The current version of the C++ REST SDK 2.10.18 does not provide the callback to enable the custom websocket setting
// The current version of the C++ REST SDK 2.10.19 does not provide the callback to enable the custom websocket setting
inline std::function<void(web::websockets::client::native_handle)> make_ws_client_nativehandle_options(bool secure, const utility::string_t& client_address, slog::base_gate& gate)
{
if (client_address.empty()) return {};
Expand Down
2 changes: 1 addition & 1 deletion Development/nmos/settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ namespace nmos
// pri [registry, node]: used for the 'pri' TXT record; specifying nmos::service_priorities::no_priority (maximum value) disables advertisement completely
const web::json::field_as_integer_or pri{ U("pri"), 100 }; // default to highest_development_priority

// highest_pri, lowest_pri [registry, node]: used to specify the (inclusive) range of suitable 'pri' values of discovered APIs, to avoid development and live systems colliding
// highest_pri, lowest_pri [node]: used to specify the (inclusive) range of suitable 'pri' values of discovered APIs, to avoid development and live systems colliding
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this an existing error in the comment that's been corrected?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the comment in it is corrected.

When IS-10 was first instructed, the higher_pri and lowest_pri were also used for Authorization API priority, but while under development, very often the Registration API can be using a different pri than the Authorization API, as the Authorization API does not provide by the Registry. So therefore in settings, there are a new authorization_highest_pri and authorization_lowest_pri for the Authorization API priority.

const web::json::field_as_integer_or highest_pri{ U("highest_pri"), 0 }; // default to highest_active_priority; specifying no_priority disables discovery completely
const web::json::field_as_integer_or lowest_pri{ U("lowest_pri"), (std::numeric_limits<int>::max)() }; // default to no_priority

Expand Down
8 changes: 4 additions & 4 deletions Documents/Dependencies.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ If using Conan, this section can be skipped.

1. Download a [recent release](http://www.boost.org/users/download/)
Notes:
- Several Boost releases have been tested, including Version 1.80.0 (latest release at the time) and Version 1.54.0
- Several Boost releases have been tested, including Version 1.83.0 (latest release at the time) and Version 1.54.0
- On Linux distributions, a Boost libraries package may already be installed, e.g. Ubuntu 14.04 LTS has Version 1.54.0
2. Expand the archive so that, for example, the boost\_1\_80\_0 directory is at the same level as the nmos-cpp directory
2. Expand the archive so that, for example, the boost\_1\_83\_0 directory is at the same level as the nmos-cpp directory
3. Build and stage (or install) the following Boost libraries for your platform/toolset:
- atomic
- chrono
Expand Down Expand Up @@ -133,11 +133,11 @@ If using Conan, this section can be skipped.
<summary>If not using Conan...</summary>

1. Get the source code
- Clone the [repo](https://github.com/Microsoft/cpprestsdk/) and its submodules, and check out the v2.10.18 tag
- Clone the [repo](https://github.com/Microsoft/cpprestsdk/) and its submodules, and check out the v2.10.19 tag
The ``git clone`` command option ``--recurse-submodules`` (formerly ``--recursive``) simplifies [cloning a project with submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules#_cloning_submodules).
For example:
```
git clone --recurse-submodules --branch v2.10.18 https://github.com/Microsoft/cpprestsdk <home-dir>/cpprestsdk
git clone --recurse-submodules --branch v2.10.19 https://github.com/Microsoft/cpprestsdk <home-dir>/cpprestsdk
```
Note: The downloadable archives created by GitHub cannot be used on their own since they don't include submodules.
2. Use CMake to configure for your platform
Expand Down
Loading