Skip to content

Commit 8ed192f

Browse files
authored
rm not needed
1 parent f136ba8 commit 8ed192f

File tree

1 file changed

+4
-34
lines changed

1 file changed

+4
-34
lines changed

build.sh

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ export TARGET="esp32"
1414
BUILD_TYPE="all"
1515
SKIP_ENV=0
1616
COPY_OUT=0
17-
ARCHIVE_OUT=0
18-
if [ -z $DEPLOY_OUT ]; then
19-
DEPLOY_OUT=0
20-
fi
17+
ARCHIVE_OUT=1
18+
DEPLOY_OUT=0
2119

2220
function print_help() {
2321
echo "Usage: build.sh [-s] [-A <arduino_branch>] [-I <idf_branch>] [-i <idf_commit>] [-c <path>] [-t <target>] [-b <build|menuconfig|reconfigure|idf-libs|copy-bootloader|mem-variant>] [config ...]"
@@ -26,8 +24,6 @@ function print_help() {
2624
echo " -I Set which branch of ESP-IDF to be used for compilation"
2725
echo " -i Set which commit of ESP-IDF to be used for compilation"
2826
echo " -e Archive the build to dist"
29-
echo " -d Deploy the build to github arduino-esp32"
30-
echo " -c Set the arduino-esp32 folder to copy the result to. ex. '$HOME/Arduino/hardware/espressif/esp32'"
3127
echo " -t Set the build target(chip) ex. 'esp32s3' or select multiple targets(chips) by separating them with comma ex. 'esp32,esp32s3,esp32c3'"
3228
echo " -b Set the build type. ex. 'build' to build the project and prepare for uploading to a board"
3329
echo " ... Specify additional configs to be applied. ex. 'qio 80m' to compile for QIO Flash@80MHz. Requires -b"
@@ -39,16 +35,9 @@ while getopts ":A:I:i:c:t:b:sde" opt; do
3935
s )
4036
SKIP_ENV=1
4137
;;
42-
d )
43-
DEPLOY_OUT=1
44-
;;
4538
e )
4639
ARCHIVE_OUT=1
4740
;;
48-
c )
49-
export ESP32_ARDUINO="$OPTARG"
50-
COPY_OUT=1
51-
;;
5241
A )
5342
export AR_BRANCH="$OPTARG"
5443
;;
@@ -268,13 +257,6 @@ done
268257

269258
export IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD)
270259

271-
# update package_esp32_index.template.json
272-
#if [ "$BUILD_TYPE" = "all" ]; then
273-
# python3 ./tools/gen_tools_json.py -i "$IDF_PATH" -j "$AR_COMPS/arduino/package/package_esp32_index.template.json" -o "$AR_OUT/"
274-
# python3 ./tools/gen_tools_json.py -i "$IDF_PATH" -o "$TOOLS_JSON_OUT/"
275-
# if [ $? -ne 0 ]; then exit 1; fi
276-
#fi
277-
278260
# Generate PlatformIO library manifest file
279261
if [ "$BUILD_TYPE" = "all" ]; then
280262
python3 ./tools/gen_pio_lib_manifest.py -o "$TOOLS_JSON_OUT/" -s "v$IDF_VERSION" -c "$IDF_COMMIT"
@@ -298,20 +280,8 @@ echo "#define ARDUINO_ESP32_GIT_VER 0x$AR_Commit_short
298280
#define ARDUINO_ESP32_RELEASE_$AR_VERSION_UNDERSCORE
299281
#define ARDUINO_ESP32_RELEASE \"$AR_VERSION_UNDERSCORE\"" >> "$AR_ROOT/core_version.h"
300282

301-
# copy everything to arduino-esp32 installation
302-
if [ $COPY_OUT -eq 1 ] && [ -d "$ESP32_ARDUINO" ]; then
303-
./tools/copy-to-arduino.sh
304-
if [ $? -ne 0 ]; then exit 1; fi
305-
fi
306-
307-
# push changes to esp32-arduino-libs and create pull request into arduino-esp32
308-
if [ $DEPLOY_OUT -eq 1 ]; then
309-
./tools/push-to-arduino.sh
310-
if [ $? -ne 0 ]; then exit 1; fi
311-
fi
312-
313283
# archive the build
314-
if [ "$BUILD_TYPE" = "all" ]; then
315-
./tools/archive-build.sh
284+
if [ $ARCHIVE_OUT -eq 1 ]; then
285+
./tools/archive-build.sh "$TARGET"
316286
if [ $? -ne 0 ]; then exit 1; fi
317287
fi

0 commit comments

Comments
 (0)