Skip to content

Commit 40154e1

Browse files
authored
Merge pull request wolfSSL#8219 from gojimmypi/pr-arduino-5.7.4
Update Arduino files for wolfssl 5.7.4
2 parents 033a2a0 + 560d89e commit 40154e1

3 files changed

Lines changed: 19 additions & 8 deletions

File tree

IDE/ARDUINO/Arduino_README_prepend.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@ See the [Arduino-wolfSSL logs](https://downloads.arduino.cc/libraries/logs/githu
88

99
## Arduino Releases
1010

11-
The first Official wolfSSL Arduino Library is `5.6.6-Arduino.1`: a slightly modified, post [release 5.6.6](https://github.com/wolfSSL/wolfssl/releases/tag/v5.6.6-stable) version update.
11+
This release of wolfSSL is version [5.7.4](https://github.com/wolfSSL/wolfssl/releases/tag/v5.7.4-stable).
1212

13-
The next Official wolfSSL Arduino Library is [5.7.0](https://github.com/wolfSSL/wolfssl/releases/tag/v5.7.0-stable)
13+
Version [5.7.2](https://github.com/wolfSSL/wolfssl/releases/tag/v5.7.2-stable) of the Arduino wolfSSL was published August 3, 2024.
14+
15+
The next Official wolfSSL Arduino Library was [5.7.0](https://github.com/wolfSSL/wolfssl/releases/tag/v5.7.0-stable)
16+
17+
The first Official wolfSSL Arduino Library was `5.6.6-Arduino.1`: a slightly modified, post [release 5.6.6](https://github.com/wolfSSL/wolfssl/releases/tag/v5.6.6-stable) version update.
1418

1519
See other [wolfSSL releases versions](https://github.com/wolfSSL/wolfssl/releases). The `./wolfssl-arduino.sh INSTALL` [script](https://github.com/wolfSSL/wolfssl/tree/master/IDE/ARDUINO) can be used to install specific GitHub versions as needed.

IDE/ARDUINO/wolfssl-arduino.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ if [ $# -gt 0 ]; then
106106
else
107107
echo "Installing to $THIS_INSTALL_DIR"
108108
if [ -d "$THIS_INSTALL_DIR/.git" ];then
109-
echo "Target is a GitHub repository."
109+
echo "Target is a GitHub root repository."
110110
THIS_INSTALL_IS_GITHUB="true"
111111
else
112-
echo "Target is NOT a GitHub repository."
112+
echo "Target is NOT a GitHub root directory repository. (e.g. not wolfssl/Arduino-wolfssl)"
113113
fi
114114
fi
115115
else
@@ -325,11 +325,18 @@ if [ "$THIS_OPERATION" = "INSTALL" ]; then
325325
echo "Removing workspace library directory: .$ROOT_DIR"
326326
rm -rf ".$ROOT_DIR"
327327
else
328+
328329
echo "Installing to local directory:"
329-
echo "mv .$ROOT_DIR $ARDUINO_ROOT"
330-
mv ."$ROOT_DIR" "$ARDUINO_ROOT" || exit 1
330+
if [ "$THIS_INSTALL_DIR" = "" ]; then
331+
echo "mv .$ROOT_DIR $ARDUINO_ROOT"
332+
mv ."$ROOT_DIR" "$ARDUINO_ROOT" || exit 1
331333

332-
echo "Arduino wolfSSL Version: $WOLFSSL_VERSION$WOLFSSL_VERSION_ARUINO_SUFFIX"
334+
echo "Arduino wolfSSL Version: $WOLFSSL_VERSION$WOLFSSL_VERSION_ARUINO_SUFFIX"
335+
else
336+
echo "cp -r .\"$ROOT_DIR\"/* \"$THIS_INSTALL_DIR\""
337+
mkdir -p "$THIS_INSTALL_DIR" || exit 1
338+
cp -r ."$ROOT_DIR"/* "$THIS_INSTALL_DIR" || exit 1
339+
fi
333340
fi
334341
fi
335342

examples/configs/user_settings_arduino.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626

2727
/* Define a macro to display user settings version in example code: */
28-
#define WOLFSSL_USER_SETTINGS_ID "Arduino user_settings.h v5.6.7"
28+
#define WOLFSSL_USER_SETTINGS_ID "Arduino user_settings.h v5.7.4"
2929

3030
/* Due to limited build control, we'll ignore file warnings. */
3131
/* See https://github.com/arduino/arduino-cli/issues/631 */

0 commit comments

Comments
 (0)