Skip to content

Commit ac5db72

Browse files
lucasssvazlucasssvaz
authored
fix(trademark): Remove 3rd party trademarks from scripts (#255)
1 parent 12afeba commit ac5db72

File tree

6 files changed

+97
-97
lines changed

6 files changed

+97
-97
lines changed

‎build.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -305,14 +305,14 @@ if [ "$BUILD_TYPE" = "all" ]; then
305305
if [ $? -ne 0 ]; then exit 1; fi
306306
fi
307307

308-
# Generate PlatformIO manifest file
308+
# Generate pioarduino manifest file
309309
if [ "$BUILD_TYPE" = "all" ]; then
310-
echo "* Generating PlatformIO manifest file..."
310+
echo "* Generating pioarduino manifest file..."
311311
pushd $IDF_PATH
312312
ibr=$(git describe --all 2>/dev/null)
313313
ic=$(git -C "$IDF_PATH" rev-parse --short HEAD)
314314
popd
315-
python3 ./tools/gen_platformio_manifest.py -o "$TOOLS_JSON_OUT/" -s "$ibr" -c "$ic"
315+
python3 ./tools/gen_pioarduino_manifest.py -o "$TOOLS_JSON_OUT/" -s "$ibr" -c "$ic"
316316
if [ $? -ne 0 ]; then exit 1; fi
317317
fi
318318

‎configs/pio_end.txt renamed to ‎configs/pioarduino_end.txt

File renamed without changes.

‎configs/pio_start.txt renamed to ‎configs/pioarduino_start.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ kinds of creative coding, interactive objects, spaces or physical experiences.
2222
http://arduino.cc/en/Reference/HomePage
2323
"""
2424

25-
# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py
25+
# Extends: https://github.com/pioarduino/platform-espressif32/blob/develop/builder/main.py
2626

2727
from os.path import basename, join
2828

‎tools/config.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ AR_PATCHES="$AR_ROOT/patches"
4949
AR_PLATFORM_TXT="$AR_OUT/platform.txt"
5050
AR_GEN_PART_PY="$AR_TOOLS/gen_esp32part.py"
5151
AR_SDK="$AR_TOOLS/esp32-arduino-libs/$IDF_TARGET"
52-
PIO_SDK="FRAMEWORK_SDK_DIR, \"$IDF_TARGET\""
52+
PIOARDUINO_SDK="FRAMEWORK_SDK_DIR, \"$IDF_TARGET\""
5353
TOOLS_JSON_OUT="$AR_TOOLS/esp32-arduino-libs"
5454

5555
if [ -d "$IDF_PATH" ]; then

‎tools/copy-libs.sh

+91-91
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ fi
3636
if [ -e "$AR_SDK/$MEMCONF" ]; then
3737
rm -rf "$AR_SDK/$MEMCONF"
3838
fi
39-
if [ -e "$AR_SDK/platformio-build.py" ]; then
40-
rm -rf "$AR_SDK/platformio-build.py"
39+
if [ -e "$AR_SDK/pioarduino-build.py" ]; then
40+
rm -rf "$AR_SDK/pioarduino-build.py"
4141
fi
4242

4343
mkdir -p "$AR_SDK"
@@ -72,13 +72,13 @@ LD_LIBS_SEARCH=""
7272
LD_SCRIPTS=""
7373
LD_SCRIPT_DIRS=""
7474

75-
PIO_CC_FLAGS=""
76-
PIO_C_FLAGS=""
77-
PIO_CXX_FLAGS=""
78-
PIO_AS_FLAGS=""
79-
PIO_LD_FLAGS=""
80-
PIO_LD_FUNCS=""
81-
PIO_LD_SCRIPTS=""
75+
PIOARDUINO_CC_FLAGS=""
76+
PIOARDUINO_C_FLAGS=""
77+
PIOARDUINO_CXX_FLAGS=""
78+
PIOARDUINO_AS_FLAGS=""
79+
PIOARDUINO_LD_FLAGS=""
80+
PIOARDUINO_LD_FUNCS=""
81+
PIOARDUINO_LD_SCRIPTS=""
8282

8383
TOOLCHAIN_PREFIX=""
8484
if [ "$IS_XTENSA" = "y" ]; then
@@ -126,7 +126,7 @@ for item in "${@:2:${#@}-5}"; do
126126
DEFINES+="$item "
127127
fi
128128
elif [ "$prefix" = "-O" ]; then
129-
PIO_CC_FLAGS+="$item "
129+
PIOARDUINO_CC_FLAGS+="$item "
130130
elif [[ "$item" != "-Wall" && "$item" != "-Werror=all" && "$item" != "-Wextra" ]]; then
131131
if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" && "${item:0:20}" != "-fdiagnostics-color=" && "${item:0:19}" != "-fdebug-prefix-map=" ]]; then
132132
C_FLAGS+="$item "
@@ -145,9 +145,9 @@ for item in "${@:2:${#@}-5}"; do
145145
if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" && "${item:0:20}" != "-fdiagnostics-color=" && "${item:0:19}" != "-fdebug-prefix-map=" ]]; then
146146
AS_FLAGS+="$item "
147147
if [[ $C_FLAGS == *"$item"* ]]; then
148-
PIO_CC_FLAGS+="$item "
148+
PIOARDUINO_CC_FLAGS+="$item "
149149
else
150-
PIO_AS_FLAGS+="$item "
150+
PIOARDUINO_AS_FLAGS+="$item "
151151
fi
152152
fi
153153
fi
@@ -163,17 +163,17 @@ for item in "${@:2:${#@}-5}"; do
163163
if [[ "$prefix" != "-I" && "$prefix" != "-D" && "$item" != "-Wall" && "$item" != "-Werror=all" && "$item" != "-Wextra" && "$prefix" != "-O" ]]; then
164164
if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" && "${item:0:20}" != "-fdiagnostics-color=" && "${item:0:19}" != "-fdebug-prefix-map=" ]]; then
165165
CPP_FLAGS+="$item "
166-
if [[ $PIO_CC_FLAGS != *"$item"* ]]; then
167-
PIO_CXX_FLAGS+="$item "
166+
if [[ $PIOARDUINO_CC_FLAGS != *"$item"* ]]; then
167+
PIOARDUINO_CXX_FLAGS+="$item "
168168
fi
169169
fi
170170
fi
171171
done
172172

173173
set -- $C_FLAGS
174174
for item; do
175-
if [[ $PIO_CC_FLAGS != *"$item"* ]]; then
176-
PIO_C_FLAGS+="$item "
175+
if [[ $PIOARDUINO_CC_FLAGS != *"$item"* ]]; then
176+
PIOARDUINO_C_FLAGS+="$item "
177177
fi
178178
done
179179

@@ -200,7 +200,7 @@ else
200200
fi
201201
if [ "$IDF_TARGET" = "esp32" ]; then
202202
LD_SCRIPTS+="-T esp32.rom.redefined.ld "
203-
PIO_LD_SCRIPTS+="esp32.rom.redefined.ld "
203+
PIOARDUINO_LD_SCRIPTS+="esp32.rom.redefined.ld "
204204
fi
205205
set -- $str
206206
for item; do
@@ -235,7 +235,7 @@ for item; do
235235
is_dir=0
236236
elif [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" && "${item:0:19}" != "-fdebug-prefix-map=" && "${item:0:17}" != "-Wl,--start-group" && "${item:0:15}" != "-Wl,--end-group" ]]; then
237237
LD_FLAGS+="$item "
238-
PIO_LD_FLAGS+="$item "
238+
PIOARDUINO_LD_FLAGS+="$item "
239239
fi
240240
fi
241241
else
@@ -247,10 +247,10 @@ for item; do
247247
elif [ "$is_script" = "1" ]; then
248248
is_script=0
249249
LD_SCRIPTS+="$item "
250-
PIO_LD_SCRIPTS+="$item "
250+
PIOARDUINO_LD_SCRIPTS+="$item "
251251
else
252252
LD_FLAGS+="$item "
253-
PIO_LD_FUNCS+="$item "
253+
PIOARDUINO_LD_FUNCS+="$item "
254254
fi
255255
else
256256
if [ "${item:${#item}-2:2}" = ".a" ]; then
@@ -318,82 +318,82 @@ done
318318

319319
mkdir -p "$AR_SDK"
320320

321-
# start generation of platformio-build.py
322-
AR_PLATFORMIO_PY="$AR_SDK/platformio-build.py"
323-
cat configs/pio_start.txt > "$AR_PLATFORMIO_PY"
321+
# start generation of pioarduino-build.py
322+
AR_PIOARDUINO_PY="$AR_SDK/pioarduino-build.py"
323+
cat configs/pioarduino_start.txt > "$AR_PIOARDUINO_PY"
324324

325-
echo " ASFLAGS=[" >> "$AR_PLATFORMIO_PY"
325+
echo " ASFLAGS=[" >> "$AR_PIOARDUINO_PY"
326326
if [ "$IS_XTENSA" = "y" ]; then
327-
echo " \"-mlongcalls\"" >> "$AR_PLATFORMIO_PY"
327+
echo " \"-mlongcalls\"" >> "$AR_PIOARDUINO_PY"
328328
else
329-
echo " \"-march=rv32imc\"" >> "$AR_PLATFORMIO_PY"
329+
echo " \"-march=rv32imc\"" >> "$AR_PIOARDUINO_PY"
330330
fi
331-
echo " ]," >> "$AR_PLATFORMIO_PY"
332-
echo "" >> "$AR_PLATFORMIO_PY"
331+
echo " ]," >> "$AR_PIOARDUINO_PY"
332+
echo "" >> "$AR_PIOARDUINO_PY"
333333

334-
echo " ASPPFLAGS=[" >> "$AR_PLATFORMIO_PY"
335-
set -- $PIO_AS_FLAGS
334+
echo " ASPPFLAGS=[" >> "$AR_PIOARDUINO_PY"
335+
set -- $PIOARDUINO_AS_FLAGS
336336
for item; do
337-
echo " \"$item\"," >> "$AR_PLATFORMIO_PY"
337+
echo " \"$item\"," >> "$AR_PIOARDUINO_PY"
338338
done
339-
echo " \"-x\", \"assembler-with-cpp\"" >> "$AR_PLATFORMIO_PY"
340-
echo " ]," >> "$AR_PLATFORMIO_PY"
341-
echo "" >> "$AR_PLATFORMIO_PY"
339+
echo " \"-x\", \"assembler-with-cpp\"" >> "$AR_PIOARDUINO_PY"
340+
echo " ]," >> "$AR_PIOARDUINO_PY"
341+
echo "" >> "$AR_PIOARDUINO_PY"
342342

343-
echo " CFLAGS=[" >> "$AR_PLATFORMIO_PY"
344-
set -- $PIO_C_FLAGS
343+
echo " CFLAGS=[" >> "$AR_PIOARDUINO_PY"
344+
set -- $PIOARDUINO_C_FLAGS
345345
last_item="${@: -1}"
346346
for item in "${@:0:${#@}}"; do
347347
if [ "${item:0:1}" != "/" ]; then
348-
echo " \"$item\"," >> "$AR_PLATFORMIO_PY"
348+
echo " \"$item\"," >> "$AR_PIOARDUINO_PY"
349349
fi
350350
done
351-
echo " \"$last_item\"" >> "$AR_PLATFORMIO_PY"
352-
echo " ]," >> "$AR_PLATFORMIO_PY"
353-
echo "" >> "$AR_PLATFORMIO_PY"
351+
echo " \"$last_item\"" >> "$AR_PIOARDUINO_PY"
352+
echo " ]," >> "$AR_PIOARDUINO_PY"
353+
echo "" >> "$AR_PIOARDUINO_PY"
354354

355-
echo " CXXFLAGS=[" >> "$AR_PLATFORMIO_PY"
356-
set -- $PIO_CXX_FLAGS
355+
echo " CXXFLAGS=[" >> "$AR_PIOARDUINO_PY"
356+
set -- $PIOARDUINO_CXX_FLAGS
357357
last_item="${@: -1}"
358358
for item in "${@:0:${#@}}"; do
359359
if [ "${item:0:1}" != "/" ]; then
360-
echo " \"$item\"," >> "$AR_PLATFORMIO_PY"
360+
echo " \"$item\"," >> "$AR_PIOARDUINO_PY"
361361
fi
362362
done
363-
echo " \"$last_item\"" >> "$AR_PLATFORMIO_PY"
364-
echo " ]," >> "$AR_PLATFORMIO_PY"
365-
echo "" >> "$AR_PLATFORMIO_PY"
363+
echo " \"$last_item\"" >> "$AR_PIOARDUINO_PY"
364+
echo " ]," >> "$AR_PIOARDUINO_PY"
365+
echo "" >> "$AR_PIOARDUINO_PY"
366366

367-
echo " CCFLAGS=[" >> "$AR_PLATFORMIO_PY"
368-
set -- $PIO_CC_FLAGS
367+
echo " CCFLAGS=[" >> "$AR_PIOARDUINO_PY"
368+
set -- $PIOARDUINO_CC_FLAGS
369369
for item; do
370-
echo " \"$item\"," >> "$AR_PLATFORMIO_PY"
370+
echo " \"$item\"," >> "$AR_PIOARDUINO_PY"
371371
done
372-
echo " \"-MMD\"" >> "$AR_PLATFORMIO_PY"
373-
echo " ]," >> "$AR_PLATFORMIO_PY"
374-
echo "" >> "$AR_PLATFORMIO_PY"
372+
echo " \"-MMD\"" >> "$AR_PIOARDUINO_PY"
373+
echo " ]," >> "$AR_PIOARDUINO_PY"
374+
echo "" >> "$AR_PIOARDUINO_PY"
375375

376-
echo " LINKFLAGS=[" >> "$AR_PLATFORMIO_PY"
377-
set -- $PIO_LD_FLAGS
376+
echo " LINKFLAGS=[" >> "$AR_PIOARDUINO_PY"
377+
set -- $PIOARDUINO_LD_FLAGS
378378
for item; do
379-
echo " \"$item\"," >> "$AR_PLATFORMIO_PY"
379+
echo " \"$item\"," >> "$AR_PIOARDUINO_PY"
380380
done
381-
set -- $PIO_LD_SCRIPTS
381+
set -- $PIOARDUINO_LD_SCRIPTS
382382
for item; do
383-
echo " \"-T\", \"$item\"," >> "$AR_PLATFORMIO_PY"
383+
echo " \"-T\", \"$item\"," >> "$AR_PIOARDUINO_PY"
384384
done
385-
set -- $PIO_LD_FUNCS
385+
set -- $PIOARDUINO_LD_FUNCS
386386
for item; do
387-
echo " \"-u\", \"$item\"," >> "$AR_PLATFORMIO_PY"
387+
echo " \"-u\", \"$item\"," >> "$AR_PIOARDUINO_PY"
388388
done
389-
echo " '-Wl,-Map=\"%s\"' % join(\"\${BUILD_DIR}\", \"\${PROGNAME}.map\")" >> "$AR_PLATFORMIO_PY"
389+
echo " '-Wl,-Map=\"%s\"' % join(\"\${BUILD_DIR}\", \"\${PROGNAME}.map\")" >> "$AR_PIOARDUINO_PY"
390390

391-
echo " ]," >> "$AR_PLATFORMIO_PY"
392-
echo "" >> "$AR_PLATFORMIO_PY"
391+
echo " ]," >> "$AR_PIOARDUINO_PY"
392+
echo "" >> "$AR_PIOARDUINO_PY"
393393

394394
# include dirs
395395
REL_INC=""
396-
echo " CPPPATH=[" >> "$AR_PLATFORMIO_PY"
396+
echo " CPPPATH=[" >> "$AR_PIOARDUINO_PY"
397397

398398
set -- $INCLUDES
399399

@@ -421,11 +421,11 @@ for item; do
421421
out_cpath="$AR_SDK/include/$fname$out_sub"
422422
REL_INC+="-iwithprefixbefore $fname$out_sub "
423423
if [ "$out_sub" = "" ]; then
424-
echo " join($PIO_SDK, \"include\", \"$fname\")," >> "$AR_PLATFORMIO_PY"
424+
echo " join($PIOARDUINO_SDK, \"include\", \"$fname\")," >> "$AR_PIOARDUINO_PY"
425425
else
426-
pio_sub="${out_sub:1}"
427-
pio_sub=`echo $pio_sub | sed 's/\//\\", \\"/g'`
428-
echo " join($PIO_SDK, \"include\", \"$fname\", \"$pio_sub\")," >> "$AR_PLATFORMIO_PY"
426+
pioarduino_sub="${out_sub:1}"
427+
pioarduino_sub=`echo $pioarduino_sub | sed 's/\//\\", \\"/g'`
428+
echo " join($PIOARDUINO_SDK, \"include\", \"$fname\", \"$pioarduino_sub\")," >> "$AR_PIOARDUINO_PY"
429429
fi
430430
for f in `find "$item" -name '*.h'`; do
431431
rel_f=${f#*$item}
@@ -452,57 +452,57 @@ for item; do
452452
fi
453453
fi
454454
done
455-
echo " join($PIO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_$OCT_PSRAM\")), \"include\")," >> "$AR_PLATFORMIO_PY"
456-
echo " join(FRAMEWORK_DIR, \"cores\", board_config.get(\"build.core\"))" >> "$AR_PLATFORMIO_PY"
457-
echo " ]," >> "$AR_PLATFORMIO_PY"
458-
echo "" >> "$AR_PLATFORMIO_PY"
455+
echo " join($PIOARDUINO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_$OCT_PSRAM\")), \"include\")," >> "$AR_PIOARDUINO_PY"
456+
echo " join(FRAMEWORK_DIR, \"cores\", board_config.get(\"build.core\"))" >> "$AR_PIOARDUINO_PY"
457+
echo " ]," >> "$AR_PIOARDUINO_PY"
458+
echo "" >> "$AR_PIOARDUINO_PY"
459459

460460
AR_LIBS="$LD_LIBS"
461-
PIO_LIBS=""
461+
PIOARDUINO_LIBS=""
462462
set -- $LD_LIBS
463463
for item; do
464-
if [ "$PIO_LIBS" != "" ]; then
465-
PIO_LIBS+=", "
464+
if [ "$PIOARDUINO_LIBS" != "" ]; then
465+
PIOARDUINO_LIBS+=", "
466466
fi
467-
PIO_LIBS+="\"$item\""
467+
PIOARDUINO_LIBS+="\"$item\""
468468
done
469469

470470
set -- $LD_LIB_FILES
471471
for item; do
472472
cp "$item" "$AR_SDK/lib/"
473473
done
474474

475-
echo " LIBPATH=[" >> "$AR_PLATFORMIO_PY"
476-
echo " join($PIO_SDK, \"lib\")," >> "$AR_PLATFORMIO_PY"
477-
echo " join($PIO_SDK, \"ld\")," >> "$AR_PLATFORMIO_PY"
478-
echo " join($PIO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_$OCT_PSRAM\")))" >> "$AR_PLATFORMIO_PY"
479-
echo " ]," >> "$AR_PLATFORMIO_PY"
480-
echo "" >> "$AR_PLATFORMIO_PY"
475+
echo " LIBPATH=[" >> "$AR_PIOARDUINO_PY"
476+
echo " join($PIOARDUINO_SDK, \"lib\")," >> "$AR_PIOARDUINO_PY"
477+
echo " join($PIOARDUINO_SDK, \"ld\")," >> "$AR_PIOARDUINO_PY"
478+
echo " join($PIOARDUINO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_$OCT_PSRAM\")))" >> "$AR_PIOARDUINO_PY"
479+
echo " ]," >> "$AR_PIOARDUINO_PY"
480+
echo "" >> "$AR_PIOARDUINO_PY"
481481

482-
echo " LIBS=[" >> "$AR_PLATFORMIO_PY"
483-
echo " $PIO_LIBS" >> "$AR_PLATFORMIO_PY"
484-
echo " ]," >> "$AR_PLATFORMIO_PY"
485-
echo "" >> "$AR_PLATFORMIO_PY"
482+
echo " LIBS=[" >> "$AR_PIOARDUINO_PY"
483+
echo " $PIOARDUINO_LIBS" >> "$AR_PIOARDUINO_PY"
484+
echo " ]," >> "$AR_PIOARDUINO_PY"
485+
echo "" >> "$AR_PIOARDUINO_PY"
486486

487-
echo " CPPDEFINES=[" >> "$AR_PLATFORMIO_PY"
487+
echo " CPPDEFINES=[" >> "$AR_PIOARDUINO_PY"
488488
set -- $DEFINES
489489
for item; do
490490
item="${item:2}" #remove -D
491491
if [[ $item == *"="* ]]; then
492492
item=(${item//=/ })
493493
re='^[+-]?[0-9]+([.][0-9]+)?$'
494494
if [[ ${item[1]} =~ $re ]]; then
495-
echo " (\"${item[0]}\", ${item[1]})," >> "$AR_PLATFORMIO_PY"
495+
echo " (\"${item[0]}\", ${item[1]})," >> "$AR_PIOARDUINO_PY"
496496
else
497-
echo " (\"${item[0]}\", '${item[1]}')," >> "$AR_PLATFORMIO_PY"
497+
echo " (\"${item[0]}\", '${item[1]}')," >> "$AR_PIOARDUINO_PY"
498498
fi
499499
else
500-
echo " \"$item\"," >> "$AR_PLATFORMIO_PY"
500+
echo " \"$item\"," >> "$AR_PIOARDUINO_PY"
501501
fi
502502
done
503503

504-
# end generation of platformio-build.py
505-
cat configs/pio_end.txt >> "$AR_PLATFORMIO_PY"
504+
# end generation of pioarduino-build.py
505+
cat configs/pioarduino_end.txt >> "$AR_PIOARDUINO_PY"
506506

507507
# replace double backslashes with single one
508508
DEFINES=`echo "$DEFINES" | tr -s '\'`

‎tools/gen_platformio_manifest.py renamed to ‎tools/gen_pioarduino_manifest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def main(dst_dir, version_string, commit_hash):
5353
json.dump(MANIFEST_DATA, fp, indent=2)
5454

5555
print(
56-
f"Generated PlatformIO manifest file '{manifest_file_path}' with '{converted_version}' version"
56+
f"Generated pioarduino manifest file '{manifest_file_path}' with '{converted_version}' version"
5757
)
5858
return 0
5959

0 commit comments

Comments
 (0)