Skip to content

Commit 4b4e9cc

Browse files
Lzw655Lzw655
committed
finish release/v3.0.0-alpha3
1 parent e2f746c commit 4b4e9cc

10 files changed

+232
-91
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ components/espressif__esp-dsp/
1111
components/esp-insights/
1212
components/arduino_tinyusb/tinyusb/
1313
components/tflite-micro/
14+
components/espressif__esp-dl/
15+
components/espressif__esp32-camera/
1416
esp-idf/
1517
out/
1618
build/

‎README.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
# ESP32 Arduino Lib Builder [![ESP32 Arduino Libs CI](https://github.com/espressif/esp32-arduino-lib-builder/actions/workflows/push.yml/badge.svg)](https://github.com/espressif/esp32-arduino-lib-builder/actions/workflows/push.yml)
1+
# ESP32 Arduino Lib Builder
22

33
This repository contains the scripts that produce the libraries included with esp32-arduino.
44

55
Tested on Ubuntu (32 and 64 bit), Raspberry Pi and MacOS.
66

77
### Build on Ubuntu and Raspberry Pi
8+
89
```bash
9-
sudo apt-get install git wget curl libssl-dev libncurses-dev flex bison gperf python python-pip python-setuptools python-serial python-click python-cryptography python-future python-pyparsing python-pyelftools cmake ninja-build ccache jq
10-
sudo pip install --upgrade pip
11-
git clone https://github.com/espressif/esp32-arduino-lib-builder
12-
cd esp32-arduino-lib-builder
10+
// Build all targets
1311
./build.sh
12+
13+
// Build specific targets, e.g. ESP32-S3
14+
./build.sh -t esp32s3
1415
```

‎build.sh

+20-18
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ while getopts ":A:I:i:c:t:b:D:sde" opt; do
6868
;;
6969
b )
7070
b=$OPTARG
71-
if [ "$b" != "build" ] &&
72-
[ "$b" != "menuconfig" ] &&
73-
[ "$b" != "reconfigure" ] &&
74-
[ "$b" != "idf_libs" ] &&
75-
[ "$b" != "copy_bootloader" ] &&
71+
if [ "$b" != "build" ] &&
72+
[ "$b" != "menuconfig" ] &&
73+
[ "$b" != "reconfigure" ] &&
74+
[ "$b" != "idf_libs" ] &&
75+
[ "$b" != "copy_bootloader" ] &&
7676
[ "$b" != "mem_variant" ]; then
7777
print_help
7878
fi
@@ -93,6 +93,8 @@ CONFIGS=$@
9393

9494
mkdir -p dist
9595

96+
source ./tools/config.sh
97+
9698
if [ $SKIP_ENV -eq 0 ]; then
9799
echo "* Installing/Updating ESP-IDF and all components..."
98100
# update components from git
@@ -122,7 +124,7 @@ if [ "$BUILD_TYPE" != "all" ]; then
122124
print_help
123125
fi
124126
configs="configs/defconfig.common;configs/defconfig.$TARGET;configs/defconfig.debug_$BUILD_DEBUG"
125-
127+
126128
# Target Features Configs
127129
for target_json in `jq -c '.targets[]' configs/builds.json`; do
128130
target=$(echo "$target_json" | jq -c '.target' | tr -d '"')
@@ -276,21 +278,21 @@ fi
276278

277279
# Generate PlatformIO manifest file
278280
if [ "$BUILD_TYPE" = "all" ]; then
279-
python3 ./tools/gen_platformio_manifest.py -o "$TOOLS_JSON_OUT/" -s $(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD) -c $(git -C "$IDF_PATH" rev-parse --short HEAD)
281+
python3 ./tools/gen_platformio_manifest.py -o "$TOOLS_JSON_OUT/" -s "$IDF_BRANCH" -c "$IDF_COMMIT"
280282
if [ $? -ne 0 ]; then exit 1; fi
281283
fi
282284

283-
# copy everything to arduino-esp32 installation
284-
if [ $COPY_OUT -eq 1 ] && [ -d "$ESP32_ARDUINO" ]; then
285-
./tools/copy-to-arduino.sh
286-
if [ $? -ne 0 ]; then exit 1; fi
287-
fi
288-
289-
# push changes to esp32-arduino-libs and create pull request into arduino-esp32
290-
if [ $DEPLOY_OUT -eq 1 ]; then
291-
./tools/push-to-arduino.sh
292-
if [ $? -ne 0 ]; then exit 1; fi
293-
fi
285+
# # copy everything to arduino-esp32 installation
286+
# if [ $COPY_OUT -eq 1 ] && [ -d "$ESP32_ARDUINO" ]; then
287+
# ./tools/copy-to-arduino.sh
288+
# if [ $? -ne 0 ]; then exit 1; fi
289+
# fi
290+
291+
# # push changes to esp32-arduino-libs and create pull request into arduino-esp32
292+
# if [ $DEPLOY_OUT -eq 1 ]; then
293+
# ./tools/push-to-arduino.sh
294+
# if [ $? -ne 0 ]; then exit 1; fi
295+
# fi
294296

295297
# archive the build
296298
if [ $ARCHIVE_OUT -eq 1 ]; then

‎main/idf_component.yml

+89-11
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,106 @@
11
dependencies:
22
# Required IDF version
33
idf: ">=5.1"
4-
espressif/esp32-camera:
5-
version: "master"
6-
git: https://github.com/espressif/esp32-camera.git
7-
require: public
8-
rules:
9-
- if: "target in [esp32, esp32s2, esp32s3]"
10-
espressif/esp-tflite-micro:
11-
version: ">=1.2.0"
4+
5+
chmorgan/esp-libhelix-mp3:
6+
version: "1.0.3"
127
require: public
8+
9+
espressif/cbor:
1310
rules:
14-
- if: "target not in [esp32c2]"
11+
- if: idf_version >=5.0
12+
version: "0.6.0~1"
13+
1514
espressif/esp-dl:
16-
version: "master"
15+
version: "79034eeb6a98e5dd896c1bf8e87403d562460078"
1716
git: https://github.com/espressif/esp-dl.git
1817
require: public
1918
rules:
2019
- if: "target in [esp32s3, esp32s2, esp32]"
20+
21+
esp-dsp:
22+
version: "1.4.9"
23+
rules:
24+
- if: "target != esp32c2"
25+
26+
espressif/esp-nn:
27+
version: "1.0.2"
28+
2129
espressif/esp-sr:
22-
version: ">=1.4.2"
30+
version: "1.6.0"
2331
rules:
2432
- if: "target in [esp32s3]"
2533

34+
espressif/esp-tflite-micro:
35+
version: "1.2.0"
36+
require: public
37+
rules:
38+
- if: "target not in [esp32c2]"
39+
40+
espressif/esp-zboss-lib:
41+
version: "1.0.5"
42+
rules:
43+
- if: "target != esp32c2"
44+
45+
espressif/esp-zigbee-lib:
46+
version: "1.0.5"
47+
rules:
48+
- if: "target != esp32c2"
49+
50+
espressif/esp32-camera:
51+
version: "dba8da9898928d9808d57a0b0cdcde9f130ed8fe"
52+
git: https://github.com/espressif/esp32-camera.git
53+
require: public
54+
rules:
55+
- if: "target in [esp32, esp32s2, esp32s3]"
56+
57+
espressif/esp_diag_data_store:
58+
version: "1.0.1"
59+
60+
espressif/esp_diagnostics:
61+
version: "1.0.1"
62+
63+
espressif/esp_insights:
64+
version: "1.0.1"
65+
rules:
66+
- if: "target != esp32c2"
67+
68+
espressif/esp_rainmaker:
69+
version: "1.0.0"
70+
rules:
71+
- if: "target != esp32c2"
72+
73+
espressif/esp_schedule:
74+
version: "1.0.1"
75+
76+
espressif/esp_secure_cert_mgr:
77+
rules:
78+
- if: idf_version >=4.3
79+
version: "2.4.1"
80+
81+
espressif/jsmn:
82+
version: "1.1.0"
83+
84+
espressif/json_generator:
85+
version: "1.1.1"
86+
87+
espressif/json_parser:
88+
version: "1.0.3"
89+
90+
mdns: "1.2.1"
91+
92+
espressif/qrcode:
93+
version: "0.1.0~1"
94+
rules:
95+
- if: "target != esp32c2"
96+
97+
espressif/rmaker_common:
98+
version: "1.4.3"
99+
rules:
100+
- if: "target != esp32c2"
101+
102+
joltwallet/littlefs: "1.10.2"
103+
26104
# esp-sr: "^1.3.1"
27105
# esp32-camera: "^2.0.4"
28106
# esp-dl:

‎tools/archive-build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD || echo "")
4-
IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD || echo "")
3+
source ./tools/config.sh
4+
55
idf_version_string=${IDF_BRANCH//\//_}"-$IDF_COMMIT"
66

77
archive_path="dist/arduino-esp32-libs-$1-$idf_version_string.tar.gz"

‎tools/check-deploy-needed.sh

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
source ./tools/config.sh
44

5-
IDF_COMMIT=`github_last_commit "$IDF_REPO" "$IDF_BRANCH"`
6-
75
if [ -z $GITHUB_HEAD_REF ]; then
86
current_branch=`git branch --show-current`
97
else

‎tools/config.sh

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/bash
22

3+
export IDF_COMMIT="3662303f31"
4+
export IDF_BRANCH="release/v5.1"
35

46
if [ -z $IDF_PATH ]; then
57
export IDF_PATH="$PWD/esp-idf"
@@ -52,10 +54,10 @@ PIO_SDK="FRAMEWORK_SDK_DIR, \"$IDF_TARGET\""
5254
TOOLS_JSON_OUT="$AR_TOOLS/esp32-arduino-libs"
5355
IDF_LIBS_DIR="$AR_ROOT/../esp32-arduino-libs"
5456

55-
if [ -d "$IDF_PATH" ]; then
56-
export IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD)
57-
export IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD)
58-
fi
57+
# if [ -d "$IDF_PATH" ]; then
58+
# export IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD)
59+
# export IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD)
60+
# fi
5961

6062
function get_os(){
6163
OSBITS=`arch`

‎tools/install-arduino.sh

+62-45
Original file line numberDiff line numberDiff line change
@@ -5,58 +5,75 @@ source ./tools/config.sh
55
#
66
# CLONE/UPDATE ARDUINO
77
#
8-
echo "Updating ESP32 Arduino..."
9-
if [ ! -d "$AR_COMPS/arduino" ]; then
10-
git clone $AR_REPO_URL "$AR_COMPS/arduino"
11-
fi
8+
# echo "Updating ESP32 Arduino..."
9+
# if [ ! -d "$AR_COMPS/arduino" ]; then
10+
# git clone $AR_REPO_URL "$AR_COMPS/arduino"
11+
# fi
1212

13-
if [ -z $AR_BRANCH ]; then
14-
if [ -z $GITHUB_HEAD_REF ]; then
15-
current_branch=`git branch --show-current`
16-
else
17-
current_branch="$GITHUB_HEAD_REF"
18-
fi
19-
echo "Current Branch: $current_branch"
20-
if [[ "$current_branch" != "master" && `git_branch_exists "$AR_COMPS/arduino" "$current_branch"` == "1" ]]; then
21-
export AR_BRANCH="$current_branch"
22-
else
23-
if [ "$IDF_TAG" ]; then #tag was specified at build time
24-
AR_BRANCH_NAME="idf-$IDF_TAG"
25-
elif [ "$IDF_COMMIT" ]; then #commit was specified at build time
26-
AR_BRANCH_NAME="idf-$IDF_COMMIT"
27-
else
28-
AR_BRANCH_NAME="idf-$IDF_BRANCH"
29-
fi
30-
has_ar_branch=`git_branch_exists "$AR_COMPS/arduino" "$AR_BRANCH_NAME"`
31-
if [ "$has_ar_branch" == "1" ]; then
32-
export AR_BRANCH="$AR_BRANCH_NAME"
33-
else
34-
has_ar_branch=`git_branch_exists "$AR_COMPS/arduino" "$AR_PR_TARGET_BRANCH"`
35-
if [ "$has_ar_branch" == "1" ]; then
36-
export AR_BRANCH="$AR_PR_TARGET_BRANCH"
37-
fi
38-
fi
39-
fi
40-
fi
13+
# if [ -z $AR_BRANCH ]; then
14+
# if [ -z $GITHUB_HEAD_REF ]; then
15+
# current_branch=`git branch --show-current`
16+
# else
17+
# current_branch="$GITHUB_HEAD_REF"
18+
# fi
19+
# echo "Current Branch: $current_branch"
20+
# if [[ "$current_branch" != "master" && `git_branch_exists "$AR_COMPS/arduino" "$current_branch"` == "1" ]]; then
21+
# export AR_BRANCH="$current_branch"
22+
# else
23+
# if [ "$IDF_TAG" ]; then #tag was specified at build time
24+
# AR_BRANCH_NAME="idf-$IDF_TAG"
25+
# elif [ "$IDF_COMMIT" ]; then #commit was specified at build time
26+
# AR_BRANCH_NAME="idf-$IDF_COMMIT"
27+
# else
28+
# AR_BRANCH_NAME="idf-$IDF_BRANCH"
29+
# fi
30+
# has_ar_branch=`git_branch_exists "$AR_COMPS/arduino" "$AR_BRANCH_NAME"`
31+
# if [ "$has_ar_branch" == "1" ]; then
32+
# export AR_BRANCH="$AR_BRANCH_NAME"
33+
# else
34+
# has_ar_branch=`git_branch_exists "$AR_COMPS/arduino" "$AR_PR_TARGET_BRANCH"`
35+
# if [ "$has_ar_branch" == "1" ]; then
36+
# export AR_BRANCH="$AR_PR_TARGET_BRANCH"
37+
# fi
38+
# fi
39+
# fi
40+
# fi
4141

42-
if [ "$AR_BRANCH" ]; then
43-
echo "AR_BRANCH='$AR_BRANCH'"
44-
git -C "$AR_COMPS/arduino" checkout "$AR_BRANCH" && \
42+
# if [ "$AR_BRANCH" ]; then
43+
# echo "AR_BRANCH='$AR_BRANCH'"
44+
# git -C "$AR_COMPS/arduino" checkout "$AR_BRANCH" && \
45+
# git -C "$AR_COMPS/arduino" fetch && \
46+
# git -C "$AR_COMPS/arduino" pull --ff-only
47+
# fi
48+
# if [ $? -ne 0 ]; then exit 1; fi
49+
50+
AR_REPO_COMMIT="e97a5190"
51+
52+
#
53+
# CLONE/UPDATE ARDUINO
54+
#
55+
echo "Updating ESP32 Arduino..."
56+
if [ ! -d "$AR_COMPS/arduino" ]; then
57+
git clone $AR_REPO_URL "$AR_COMPS/arduino" && \
58+
git -C "$AR_COMPS/arduino" checkout --recurse-submodules ${AR_REPO_COMMIT} && \
59+
git -C "$AR_COMPS/arduino" submodule update --init --recursive
60+
else
4561
git -C "$AR_COMPS/arduino" fetch && \
46-
git -C "$AR_COMPS/arduino" pull --ff-only
62+
git -C "$AR_COMPS/arduino" checkout --recurse-submodules ${AR_REPO_COMMIT} && \
63+
git -C "$AR_COMPS/arduino" submodule update --init --recursive
4764
fi
4865
if [ $? -ne 0 ]; then exit 1; fi
4966

5067
#
5168
# CLONE/UPDATE ESP32-ARDUINO-LIBS
5269
#
53-
if [ ! -d "$IDF_LIBS_DIR" ]; then
54-
echo "Cloning esp32-arduino-libs..."
55-
git clone "$AR_LIBS_REPO_URL" "$IDF_LIBS_DIR"
56-
else
57-
echo "Updating esp32-arduino-libs..."
58-
git -C "$IDF_LIBS_DIR" fetch && \
59-
git -C "$IDF_LIBS_DIR" pull --ff-only
60-
fi
61-
if [ $? -ne 0 ]; then exit 1; fi
70+
# if [ ! -d "$IDF_LIBS_DIR" ]; then
71+
# echo "Cloning esp32-arduino-libs..."
72+
# git clone "$AR_LIBS_REPO_URL" "$IDF_LIBS_DIR"
73+
# else
74+
# echo "Updating esp32-arduino-libs..."
75+
# git -C "$IDF_LIBS_DIR" fetch && \
76+
# git -C "$IDF_LIBS_DIR" pull --ff-only
77+
# fi
78+
# if [ $? -ne 0 ]; then exit 1; fi
6279

0 commit comments

Comments
 (0)