Prepare for 1.1.0 (#105)

Author: jadamcrain

.github/workflows/ci.yml

@@ -139,6 +139,7 @@ jobs:
           toolchain: stable
           override: true
       - name: Caching
+        if: ${{ !startsWith(github.ref, 'refs/tags/') }}
         uses: Swatinem/rust-cache@v2
       - name: Create the FFI modules dir
         run: mkdir ffi-modules\${{ matrix.target }}
@@ -184,6 +185,7 @@ jobs:
           toolchain: stable
           override: true
       - name: Caching
+        if: ${{ !startsWith(github.ref, 'refs/tags/') }}
         uses: Swatinem/rust-cache@v2
       - name: Create FFI modules dir
         run: mkdir -p ffi-modules/${{ matrix.target }}
@@ -234,6 +236,9 @@ jobs:
           toolchain: stable
           target: ${{ matrix.target }}
           override: true
+      - name: Caching
+        if: ${{ !startsWith(github.ref, 'refs/tags/') }}
+        uses: Swatinem/rust-cache@v2
       - name: Install Rust Cross
         run: cargo install cross
       - name: Create ffi-modules dir
@@ -282,6 +287,7 @@ jobs:
           toolchain: stable
           override: true
       - name: Caching
+        if: ${{ !startsWith(github.ref, 'refs/tags/') }}
         uses: Swatinem/rust-cache@v2
       - name: Checkout BOM tools repo
         uses: actions/checkout@v3
@@ -332,6 +338,10 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           path: artifacts
+      - name: Package C Bindings
+        run: |
+          mkdir release
+          zip -r release/rodbus-${GITHUB_REF##*/}.zip artifacts/c-bindings
       - name: Checkout stepfunc/docs
         uses: actions/checkout@v3
         with:

CHANGELOG.md

@@ -1,4 +1,10 @@
-### Next (1.0.0) ###
+### 1.1.0-rc1 ###
+* :star: Enable TCP_NODELAY for client and server sockets. See [#99](https://github.com/stepfunc/rodbus/pull/99).
+* :star: Enable full link-time optimization (LTO) in release builds. See [#103](https://github.com/stepfunc/rodbus/pull/103).
+* :star: Add support for 3 MUSL Linux targets to C/C++ and .NET. See [#104](https://github.com/stepfunc/rodbus/pull/104).
+* :star: Internal refactoring to promote code reuse with DNP3. See: [#100](https://github.com/stepfunc/rodbus/pull/100), [#101](https://github.com/stepfunc/rodbus/pull/101), [#102](https://github.com/stepfunc/rodbus/pull/102).
+
+### 1.0.0 ###
 * :star: Add Modbus Security (TLS) support. See [#52](https://github.com/stepfunc/rodbus/pull/52).
 * :star: Add RTU support. See [#56](https://github.com/stepfunc/rodbus/pull/56).
 * :star: Dynamic protocol decoding. See [#61](https://github.com/stepfunc/rodbus/pull/66).

Cargo.lock

@@ -2,29 +2,32 @@ cmake_minimum_required(VERSION 3.12)
 
 project(rodbus_c LANGUAGES C CXX)
 
-set(RODBUS_VERSION "1.0.0")
+set(RODBUS_BACKUP_VERSION "1.0.0")
 
 # Determine the architecture
 if(WIN32 AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(RODBUS_ARCH "x86_64-pc-windows-msvc")
+    set(RODBUS_RUST_TARGET "x86_64-pc-windows-msvc")
 elseif(UNIX AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64")
-    set(RODBUS_ARCH "x86_64-unknown-linux-gnu")
+    set(RODBUS_RUST_TARGET "x86_64-unknown-linux-gnu")
 elseif(UNIX AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
-    set(RODBUS_ARCH "aarch64-unknown-linux-gnu")
+    set(RODBUS_RUST_TARGET "aarch64-unknown-linux-gnu")
 else()
     message(FATAL_ERROR "target architecture not supported by this CMake file")
 endif()
 
 # Find the Rodbus package
-if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/generated/${RODBUS_ARCH})
+if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/generated)
+    message("Rodbus package is local")
     # Use the locally built library
-    find_package(rodbus REQUIRED HINTS ${CMAKE_CURRENT_LIST_DIR}/generated/${RODBUS_ARCH}/cmake)
+    find_package(rodbus REQUIRED HINTS ${CMAKE_CURRENT_LIST_DIR}/generated/cmake)
 else()
+    message("No local rodbus, fetching remote library version ${RODBUS_BACKUP_VERSION}")
+
     # Download the library from GitHub
     include(FetchContent)
     FetchContent_Declare(
         rodbus
-        URL https://github.com/stepfunc/rodbus/releases/download/${RODBUS_VERSION}/rodbus-${RODBUS_VERSION}-${RODBUS_ARCH}.zip
+        URL https://github.com/stepfunc/rodbus/releases/download/${RODBUS_BACKUP_VERSION}/rodbus-${RODBUS_BACKUP_VERSION}.zip
     )
 
     FetchContent_GetProperties(rodbus)

ffi/bindings/c/CMakeLists.txt

@@ -1,6 +1,6 @@
 [package]
 name = "rodbus-bindings"
-version = "1.0.0"
+version = "1.1.0-rc1"
 authors = ["Step Function I/O LLC <[email protected]>"]
 edition = "2021"
 license = "GPL-3.0-only"
@@ -11,7 +11,7 @@ repository = "https://github.com/stepfunc/rodbus"
 readme = "../README.md"
 
 [dependencies]
-ci-script = { git = "https://github.com/stepfunc/oo_bindgen.git", tag = "0.5.0" }
+ci-script = { git = "https://github.com/stepfunc/oo_bindgen.git", tag = "0.5.1" }
 rodbus-schema = { path = "../rodbus-schema" }
 tracing = "^0.1"
 tracing-subscriber = "^0.3"

ffi/rodbus-bindings/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rodbus-ffi-java"
-version = "1.0.0"
+version = "1.1.0-rc1"
 authors = ["Step Function I/O LLC <[email protected]>"]
 edition = "2021"
 build = "build.rs"
@@ -19,4 +19,4 @@ tls = ["rodbus-ffi/tls"]
 
 [build-dependencies]
 rodbus-schema = { path = "../rodbus-schema" }
-java-oo-bindgen = { git = "https://github.com/stepfunc/oo_bindgen.git", tag = "0.5.0" }
+java-oo-bindgen = { git = "https://github.com/stepfunc/oo_bindgen.git", tag = "0.5.1" }