Skip to content

Commit 90aff4c

Browse files
tomaszduda23tomaszduda23
committed
Currently components are taken from master which not always builds.
Add command which recrate libs in the same version as in arduino-esp32.
1 parent d4158af commit 90aff4c

File tree

5 files changed

+97
-108
lines changed

5 files changed

+97
-108
lines changed

‎README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,9 @@ git clone https://github.com/espressif/esp32-arduino-lib-builder
1212
cd esp32-arduino-lib-builder
1313
./build.sh
1414
```
15+
16+
### Recreate esp32-arduino libs in given version
17+
Create version-v#.#.#.sh based on `framework-arduinoespressif32/tools/sdk/versions.txt`
18+
```bash
19+
./build.sh -I v4.4.2 -r -t esp32s2
20+
```

‎build.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ BUILD_TYPE="all"
1515
SKIP_ENV=0
1616
COPY_OUT=0
1717
DEPLOY_OUT=0
18+
RECREATE=0
1819

1920
function print_help() {
2021
echo "Usage: build.sh [-s] [-A <arduino_branch>] [-I <idf_branch>] [-i <idf_commit>] [-c <path>] [-t <target>] [-b <build|menuconfig|idf_libs|copy_bootloader|mem_variant>] [config ...]"
@@ -26,12 +27,16 @@ function print_help() {
2627
echo " -c Set the arduino-esp32 folder to copy the result to. ex. '$HOME/Arduino/hardware/espressif/esp32'"
2728
echo " -t Set the build target(chip). ex. 'esp32s3'"
2829
echo " -b Set the build type. ex. 'build' to build the project and prepare for uploading to a board"
30+
echo " -r Recreate arduino-esp32 libs in give version"
2931
echo " ... Specify additional configs to be applied. ex. 'qio 80m' to compile for QIO Flash@80MHz. Requires -b"
3032
exit 1
3133
}
3234

33-
while getopts ":A:I:i:c:t:b:sd" opt; do
35+
while getopts ":A:I:i:c:t:b:sdr" opt; do
3436
case ${opt} in
37+
r )
38+
export RECREATE=1
39+
;;
3540
s )
3641
SKIP_ENV=1
3742
;;
@@ -78,6 +83,11 @@ done
7883
shift $((OPTIND -1))
7984
CONFIGS=$@
8085

86+
if [ $RECREATE -eq 1 -a -z "$IDF_BRANCH" ]; then
87+
echo "RECREATE requires IDF_BRANCH"
88+
exit 1
89+
fi
90+
8191
if [ $SKIP_ENV -eq 0 ]; then
8292
echo "* Installing/Updating ESP-IDF and all components..."
8393
# update components from git

‎tools/git-update.sh

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
set -e
2+
3+
SUBMODULE=0
4+
5+
while getopts "s" opt; do
6+
case ${opt} in
7+
s)
8+
SUBMODULE=1
9+
;;
10+
esac
11+
done
12+
shift $((OPTIND-1))
13+
14+
DIR=$1
15+
URL=$2
16+
VERSION=$3
17+
18+
[ -d "$DIR" ] || git clone $URL "$DIR"
19+
git -C "$DIR" fetch
20+
[ -n "$VERSION" ] && git -C "$DIR" checkout $VERSION
21+
git -C "$DIR" symbolic-ref -q HEAD && git -C "$DIR" pull --ff-only
22+
[ $SUBMODULE -eq 1 ] && git -C "$DIR" submodule update --init --recursive
23+
24+
exit 0

‎tools/update-components.sh

Lines changed: 48 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#/bin/bash
22

3+
set -e
4+
35
source ./tools/config.sh
46

57
CAMERA_REPO_URL="https://github.com/espressif/esp32-camera.git"
@@ -10,142 +12,81 @@ DSP_REPO_URL="https://github.com/espressif/esp-dsp.git"
1012
LITTLEFS_REPO_URL="https://github.com/joltwallet/esp_littlefs.git"
1113
TINYUSB_REPO_URL="https://github.com/hathach/tinyusb.git"
1214

15+
if [ -n "$RECREATE" ]; then
16+
VERSION="./tools/version-$IDF_BRANCH.sh"
17+
if [ ! -f "$VERSION" ]; then
18+
echo "$VERSION does not exists"
19+
exit 1
20+
fi
21+
source $VERSION
22+
fi
23+
1324
#
1425
# CLONE/UPDATE ARDUINO
1526
#
16-
17-
if [ ! -d "$AR_COMPS/arduino" ]; then
18-
git clone $AR_REPO_URL "$AR_COMPS/arduino"
19-
fi
20-
21-
if [ -z $AR_BRANCH ]; then
22-
if [ -z $GITHUB_HEAD_REF ]; then
23-
current_branch=`git branch --show-current`
24-
else
25-
current_branch="$GITHUB_HEAD_REF"
27+
if [ -z "AR_REPO_VERSION" ]; then
28+
if [ ! -d "$AR_COMPS/arduino" ]; then
29+
git clone $AR_REPO_URL "$AR_COMPS/arduino"
2630
fi
27-
echo "Current Branch: $current_branch"
28-
if [[ "$current_branch" != "master" && `git_branch_exists "$AR_COMPS/arduino" "$current_branch"` == "1" ]]; then
29-
export AR_BRANCH="$current_branch"
30-
else
31-
if [ -z "$IDF_COMMIT" ]; then #commit was not specified at build time
32-
AR_BRANCH_NAME="idf-$IDF_BRANCH"
31+
32+
if [ -z $AR_BRANCH ]; then
33+
if [ -z $GITHUB_HEAD_REF ]; then
34+
current_branch=`git branch --show-current`
3335
else
34-
AR_BRANCH_NAME="idf-$IDF_COMMIT"
36+
current_branch="$GITHUB_HEAD_REF"
3537
fi
36-
has_ar_branch=`git_branch_exists "$AR_COMPS/arduino" "$AR_BRANCH_NAME"`
37-
if [ "$has_ar_branch" == "1" ]; then
38-
export AR_BRANCH="$AR_BRANCH_NAME"
38+
echo "Current Branch: $current_branch"
39+
if [[ "$current_branch" != "master" && `git_branch_exists "$AR_COMPS/arduino" "$current_branch"` == "1" ]]; then
40+
export AR_BRANCH="$current_branch"
3941
else
40-
has_ar_branch=`git_branch_exists "$AR_COMPS/arduino" "$AR_PR_TARGET_BRANCH"`
42+
if [ -z "$IDF_COMMIT" ]; then #commit was not specified at build time
43+
AR_BRANCH_NAME="idf-$IDF_BRANCH"
44+
else
45+
AR_BRANCH_NAME="idf-$IDF_COMMIT"
46+
fi
47+
has_ar_branch=`git_branch_exists "$AR_COMPS/arduino" "$AR_BRANCH_NAME"`
4148
if [ "$has_ar_branch" == "1" ]; then
42-
export AR_BRANCH="$AR_PR_TARGET_BRANCH"
49+
export AR_BRANCH="$AR_BRANCH_NAME"
50+
else
51+
has_ar_branch=`git_branch_exists "$AR_COMPS/arduino" "$AR_PR_TARGET_BRANCH"`
52+
if [ "$has_ar_branch" == "1" ]; then
53+
export AR_BRANCH="$AR_PR_TARGET_BRANCH"
54+
fi
4355
fi
4456
fi
4557
fi
46-
fi
4758

48-
if [ "$AR_BRANCH" ]; then
49-
git -C "$AR_COMPS/arduino" checkout "$AR_BRANCH" && \
50-
git -C "$AR_COMPS/arduino" fetch && \
51-
git -C "$AR_COMPS/arduino" pull --ff-only
59+
if [ "$AR_BRANCH" ]; then
60+
git -C "$AR_COMPS/arduino" checkout "$AR_BRANCH"
61+
git -C "$AR_COMPS/arduino" fetch
62+
git -C "$AR_COMPS/arduino" pull --ff-only
63+
fi
64+
else
65+
./tools/git-update.sh "$AR_COMPS/arduino" $AR_REPO_URL $AR_REPO_VERSION
5266
fi
53-
if [ $? -ne 0 ]; then exit 1; fi
5467

55-
#
5668
# CLONE/UPDATE ESP32-CAMERA
57-
#
69+
./tools/git-update.sh "$AR_COMPS/esp32-camera" $CAMERA_REPO_URL $CAMERA_REPO_VERSION
5870

59-
if [ ! -d "$AR_COMPS/esp32-camera" ]; then
60-
git clone $CAMERA_REPO_URL "$AR_COMPS/esp32-camera"
61-
else
62-
git -C "$AR_COMPS/esp32-camera" fetch && \
63-
git -C "$AR_COMPS/esp32-camera" pull --ff-only
64-
fi
6571
#this is a temp measure to fix build issue in recent IDF master
6672
if [ -f "$AR_COMPS/esp32-camera/idf_component.yml" ]; then
6773
rm -rf "$AR_COMPS/esp32-camera/idf_component.yml"
6874
fi
69-
if [ $? -ne 0 ]; then exit 1; fi
7075

71-
#
7276
# CLONE/UPDATE ESP-DL
73-
#
77+
./tools/git-update.sh "$AR_COMPS/esp-dl" $DL_REPO_URL $DL_REPO_VERSION
7478

75-
if [ ! -d "$AR_COMPS/esp-dl" ]; then
76-
git clone $DL_REPO_URL "$AR_COMPS/esp-dl"
77-
else
78-
git -C "$AR_COMPS/esp-dl" fetch && \
79-
git -C "$AR_COMPS/esp-dl" pull --ff-only
80-
fi
81-
if [ $? -ne 0 ]; then exit 1; fi
82-
83-
#
8479
# CLONE/UPDATE ESP-SR
85-
#
80+
./tools/git-update.sh "$AR_COMPS/esp-sr" $SR_REPO_URL $SR_REPO_VERSION
8681

87-
if [ ! -d "$AR_COMPS/esp-sr" ]; then
88-
git clone $SR_REPO_URL "$AR_COMPS/esp-sr"
89-
else
90-
git -C "$AR_COMPS/esp-sr" fetch && \
91-
git -C "$AR_COMPS/esp-sr" pull --ff-only
92-
fi
93-
if [ $? -ne 0 ]; then exit 1; fi
94-
95-
#
9682
# CLONE/UPDATE ESP-LITTLEFS
97-
#
98-
99-
if [ ! -d "$AR_COMPS/esp_littlefs" ]; then
100-
git clone $LITTLEFS_REPO_URL "$AR_COMPS/esp_littlefs" && \
101-
git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive
102-
else
103-
git -C "$AR_COMPS/esp_littlefs" fetch && \
104-
git -C "$AR_COMPS/esp_littlefs" pull --ff-only && \
105-
git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive
106-
fi
107-
if [ $? -ne 0 ]; then exit 1; fi
83+
./tools/git-update.sh -s "$AR_COMPS/esp_littlefs" $LITTLEFS_REPO_URL $LITTLEFS_REPO_VERSION
10884

109-
#
11085
# CLONE/UPDATE ESP-RAINMAKER
111-
#
112-
113-
if [ ! -d "$AR_COMPS/esp-rainmaker" ]; then
114-
git clone $RMAKER_REPO_URL "$AR_COMPS/esp-rainmaker" && \
115-
git -C "$AR_COMPS/esp-rainmaker" submodule update --init --recursive
116-
# git -C "$AR_COMPS/esp-rainmaker" checkout f1b82c71c4536ab816d17df016d8afe106bd60e3
117-
else
118-
git -C "$AR_COMPS/esp-rainmaker" fetch && \
119-
git -C "$AR_COMPS/esp-rainmaker" pull --ff-only && \
120-
git -C "$AR_COMPS/esp-rainmaker" submodule update --init --recursive
121-
fi
122-
if [ $? -ne 0 ]; then exit 1; fi
86+
./tools/git-update.sh -s "$AR_COMPS/esp-rainmaker" $RMAKER_REPO_URL $RMAKER_REPO_VERSION
12387

124-
#
12588
# CLONE/UPDATE ESP-DSP
126-
#
127-
128-
if [ ! -d "$AR_COMPS/esp-dsp" ]; then
129-
git clone $DSP_REPO_URL "$AR_COMPS/esp-dsp"
130-
# cml=`cat "$AR_COMPS/esp-dsp/CMakeLists.txt"`
131-
# echo "if(IDF_TARGET STREQUAL \"esp32\" OR IDF_TARGET STREQUAL \"esp32s2\" OR IDF_TARGET STREQUAL \"esp32s3\")" > "$AR_COMPS/esp-dsp/CMakeLists.txt"
132-
# echo "$cml" >> "$AR_COMPS/esp-dsp/CMakeLists.txt"
133-
# echo "endif()" >> "$AR_COMPS/esp-dsp/CMakeLists.txt"
134-
else
135-
git -C "$AR_COMPS/esp-dsp" fetch && \
136-
git -C "$AR_COMPS/esp-dsp" pull --ff-only
137-
fi
138-
if [ $? -ne 0 ]; then exit 1; fi
89+
./tools/git-update.sh "$AR_COMPS/esp-dsp" $DSP_REPO_URL $DSP_REPO_VERSION
13990

140-
#
14191
# CLONE/UPDATE TINYUSB
142-
#
143-
144-
if [ ! -d "$AR_COMPS/arduino_tinyusb/tinyusb" ]; then
145-
git clone $TINYUSB_REPO_URL "$AR_COMPS/arduino_tinyusb/tinyusb"
146-
else
147-
git -C "$AR_COMPS/arduino_tinyusb/tinyusb" fetch && \
148-
git -C "$AR_COMPS/arduino_tinyusb/tinyusb" pull --ff-only
149-
fi
150-
if [ $? -ne 0 ]; then exit 1; fi
151-
92+
./tools/git-update.sh "$AR_COMPS/arduino_tinyusb/tinyusb" $TINYUSB_REPO_URL $TINYUSB_REPO_VERSION

‎tools/version-v4.4.2.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
AR_REPO_VERSION=55d608e3
2+
CAMERA_REPO_VERSION=5611989
3+
DL_REPO_VERSION=f3006d7
4+
SR_REPO_VERSION=b578f17
5+
RMAKER_REPO_VERSION=3736c12
6+
DSP_REPO_VERSION=401faf8
7+
LITTLEFS_REPO_VERSION=485a037
8+
TINYUSB_REPO_VERSION=111515a29

0 commit comments

Comments
 (0)