diff --git a/.github/workflows/artifact_linux.yml b/.github/workflows/artifact_linux.yml index fdc7f556..3a876e9a 100644 --- a/.github/workflows/artifact_linux.yml +++ b/.github/workflows/artifact_linux.yml @@ -3,7 +3,7 @@ on: [workflow_dispatch] jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - name: Check out code uses: actions/checkout@v2 @@ -26,5 +26,5 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v3 with: - name: Eclipse-Paho-MQTT-C-1.3.12-Linux.tar.gz - path: /home/runner/work/paho.mqtt.c/paho.mqtt.c/build.paho/Eclipse-Paho-MQTT-C-1.3.12-Linux.tar.gz + name: Eclipse-Paho-MQTT-C-1.3.13-Linux.tar.gz + path: /home/runner/work/paho.mqtt.c/paho.mqtt.c/build.paho/Eclipse-Paho-MQTT-C-1.3.13-Linux.tar.gz diff --git a/.github/workflows/artifact_macos.yml b/.github/workflows/artifact_macos.yml index 8013e86e..cac2ca3e 100644 --- a/.github/workflows/artifact_macos.yml +++ b/.github/workflows/artifact_macos.yml @@ -26,5 +26,5 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v3 with: - name: Eclipse-Paho-MQTT-C-1.3.12-Darwin.tar.gz - path: /Users/runner/work/paho.mqtt.c/paho.mqtt.c/build.paho/Eclipse-Paho-MQTT-C-1.3.12-Darwin.tar.gz + name: Eclipse-Paho-MQTT-C-1.3.13-Darwin.tar.gz + path: /Users/runner/work/paho.mqtt.c/paho.mqtt.c/build.paho/Eclipse-Paho-MQTT-C-1.3.13-Darwin.tar.gz diff --git a/CMakeLists.txt b/CMakeLists.txt index cf0fd68b..1148e8ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2015, 2020 logi.cals GmbH and others +# Copyright (c) 2015, 2023 logi.cals GmbH and others # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v2.0 @@ -44,6 +44,7 @@ ENDIF() ## build options SET(PAHO_WITH_SSL FALSE CACHE BOOL "Flag that defines whether to build ssl-enabled binaries too. ") +SET(PAHO_WITH_LIBUUID FALSE CACHE BOOL "Flag that defines whether libuuid or a custom uuid implementation should be used") SET(PAHO_BUILD_SHARED TRUE CACHE BOOL "Build shared library") SET(PAHO_BUILD_STATIC FALSE CACHE BOOL "Build static library") SET(PAHO_BUILD_DOCUMENTATION FALSE CACHE BOOL "Create and install the HTML based API documentation (requires Doxygen)") @@ -62,10 +63,18 @@ IF (PAHO_USE_SELECT) ADD_DEFINITIONS(-DUSE_SELECT=1) ENDIF() +IF (PAHO_WITH_LIBUUID) + ADD_DEFINITIONS(-DUSE_LIBUUID=1) +ENDIF() + IF (NOT PAHO_BUILD_SHARED AND NOT PAHO_BUILD_STATIC) MESSAGE(FATAL_ERROR "You must set either PAHO_BUILD_SHARED, PAHO_BUILD_STATIC, or both") ENDIF() +IF (PAHO_BUILD_SAMPLES AND NOT PAHO_WITH_SSL) + MESSAGE(FATAL_ERROR "You must build with SSL to build the samples") +ENDIF() + IF(PAHO_BUILD_DEB_PACKAGE) set(CMAKE_INSTALL_DOCDIR share/doc/libpaho-mqtt) set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d62bd218..91b782b0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,14 +31,11 @@ Please read the [Eclipse Foundation policy on accepting contributions via Git](h 9. Push the changes in your branch to your forked repository. 10. Finally, go to [https://github.com/eclipse/paho.mqtt.c](https://github.com/eclipse/paho.mqtt.c) and create a pull request from your "YOUR_BRANCH_NAME" branch to the ```develop``` one to request review and merge of the commits in your pushed branch. - -What happens next depends on the content of the patch. If it is 100% authored -by the contributor and is less than 1000 lines (and meets the needs of the -project), then it can be pulled into the main repository. If not, more steps -are required. These are detailed in the -[legal process poster](http://www.eclipse.org/legal/EclipseLegalProcessPoster.pdf). - - +What happens next depends on the content of the patch. +If it is 100% authored by the contributor with less than 1000 lines of new product code that meets +the needs of the project (refactored, test code and sample code is excluded from the count), then it +can be pulled into the main repository. When there are more than 1000 lines of new product code, +more steps are required. More details are provided in the [handbook](https://www.eclipse.org/projects/handbook/#ip). ## Developer resources: diff --git a/README.md b/README.md index fce8f686..2950379e 100644 --- a/README.md +++ b/README.md @@ -214,7 +214,7 @@ Test code is available in the `test` directory. The tests can be built and execu After ensuring a MQTT broker is available, it is possible to execute the tests by starting the proxy and running `ctest` as described below: ``` -$ python ../test/mqttsas2.py & +$ python ../test/mqttsas.py & $ ctest -VV ``` diff --git a/docs/MQTTAsync/html/_m_q_t_t_async_8h.html b/docs/MQTTAsync/html/_m_q_t_t_async_8h.html index 0e0b4628..e7e5513e 100644 --- a/docs/MQTTAsync/html/_m_q_t_t_async_8h.html +++ b/docs/MQTTAsync/html/_m_q_t_t_async_8h.html @@ -3,7 +3,7 @@
- +Initializer for connect options for MQTT 3.1.1 non-WebSocket connections
Initializer for connect options for MQTT 5.0 non-WebSocket connections
- 1.8.17
+Generated on Fri Oct 13 2023 18:02:52 for Paho Asynchronous MQTT C Client Library by