Skip to content

Commit ac38387

Browse files
committed
small changes
1 parent 1a4e83d commit ac38387

File tree

3 files changed

+13
-17
lines changed

3 files changed

+13
-17
lines changed

CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,28 @@ project(arduino-lib-builder)
1010
idf_build_get_property(elf EXECUTABLE GENERATOR_EXPRESSION)
1111

1212
add_custom_command(
13-
OUTPUT "idf_libs"
13+
OUTPUT "idf_libs"
1414
COMMAND ${CMAKE_SOURCE_DIR}/tools/copy-libs.sh ${IDF_TARGET} "${CONFIG_LIB_BUILDER_FLASHMODE}" "${CONFIG_SPIRAM_MODE_OCT}" "${CONFIG_IDF_TARGET_ARCH_XTENSA}"
15-
DEPENDS ${elf}
16-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
15+
DEPENDS ${elf}
16+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
1717
VERBATIM
1818
)
1919
add_custom_target(idf-libs DEPENDS "idf_libs")
2020

2121
add_custom_command(
22-
OUTPUT "copy_bootloader"
22+
OUTPUT "copy_bootloader"
2323
COMMAND ${CMAKE_SOURCE_DIR}/tools/copy-bootloader.sh ${IDF_TARGET} "${CONFIG_LIB_BUILDER_FLASHMODE}" "${CONFIG_LIB_BUILDER_FLASHFREQ}"
24-
DEPENDS bootloader
25-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
24+
DEPENDS bootloader
25+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
2626
VERBATIM
2727
)
2828
add_custom_target(copy-bootloader DEPENDS "copy_bootloader")
2929

3030
add_custom_command(
31-
OUTPUT "mem_variant"
31+
OUTPUT "mem_variant"
3232
COMMAND ${CMAKE_SOURCE_DIR}/tools/copy-mem-variant.sh ${IDF_TARGET} "${CONFIG_LIB_BUILDER_FLASHMODE}" "${CONFIG_SPIRAM_MODE_OCT}"
3333
DEPENDS ${elf}
34-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
34+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
3535
VERBATIM
3636
)
3737
add_custom_target(mem-variant DEPENDS "mem_variant")

build.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ while getopts ":A:I:i:c:t:b:sd" opt; do
5151
;;
5252
b )
5353
b=$OPTARG
54-
if [ "$b" != "build" ] &&
55-
[ "$b" != "menuconfig" ] &&
56-
[ "$b" != "idf_libs" ] &&
57-
[ "$b" != "copy_bootloader" ] &&
54+
if [ "$b" != "build" ] &&
55+
[ "$b" != "menuconfig" ] &&
56+
[ "$b" != "idf_libs" ] &&
57+
[ "$b" != "copy_bootloader" ] &&
5858
[ "$b" != "mem_variant" ]; then
5959
print_help
6060
fi
@@ -92,7 +92,7 @@ if [ "$BUILD_TYPE" != "all" ]; then
9292
print_help
9393
fi
9494
configs="configs/defconfig.common;configs/defconfig.$TARGET"
95-
95+
9696
# Target Features Configs
9797
for target_json in `jq -c '.targets[]' configs/builds.json`; do
9898
target=$(echo "$target_json" | jq -c '.target' | tr -d '"')

tools/archive-build.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ pio_archive_path="dist/framework-arduinoespressif32-$idf_version_string.tar.gz"
1111
mkdir -p dist && rm -rf "$archive_path" "$build_archive_path"
1212

1313
cd out
14-
echo "Show files from folder out"
15-
ls
16-
echo "Show Arduino directory"
17-
ls ../components/arduino
1814
echo "Creating framework-arduinoespressif32"
1915
cp -rf ../components/arduino arduino-esp32
2016
rm -rf arduino-esp32/docs

0 commit comments

Comments
 (0)