Skip to content

Commit

Permalink
Remove bin/ directory in favour of an add_path.sh script that can be …
Browse files Browse the repository at this point in the history
…sourced

Remaining file in bin/ will be moved out as part of !34
  • Loading branch information
projectgus committed Sep 1, 2016
1 parent fb87346 commit d793d23
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 2 deletions.
17 changes: 17 additions & 0 deletions add_path.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# This shell snippet appends useful esp-idf tools to your PATH environment
# variable. This means you can run esp-idf tools without needing to give the
# full path.
#
# Use this script like this:
#
# source ${IDF_PATH}/add_path.sh
#
if [ -z ${IDF_PATH} ]; then
echo "IDF_PATH must be set before including this script."
else
IDF_ADD_PATHS_EXTRAS="${IDF_PATH}/components/esptool_py/:${IDF_PATH}/components/partition_table/"
export PATH="${PATH}:${IDF_ADD_PATHS_EXTRAS}"
echo "Added to PATH: ${IDF_ADD_PATHS_EXTRAS}"
fi


2 changes: 1 addition & 1 deletion components/esptool_py/Makefile.projbuild
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ PYTHON ?= $(call dequote,$(CONFIG_PYTHON))
# to invoke esptool.py (with or without serial port args)
#
# NB: esptool.py lives in the sdk/bin directory not the component directory
ESPTOOLPY := $(PYTHON) $(IDF_PATH)/bin/esptool.py --chip esp32
ESPTOOLPY := $(PYTHON) $(IDF_PATH)/components/esptool_py/esptool.py --chip esp32
ESPTOOLPY_SERIAL := $(ESPTOOLPY) --port $(ESPPORT) --baud $(ESPBAUD)

ESPTOOLPY_WRITE_FLASH=$(ESPTOOLPY_SERIAL) write_flash $(if $(CONFIG_ESPTOOLPY_COMPRESSED),-z)
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion components/partition_table/Makefile.projbuild
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.PHONY: partition_table partition_table-flash partition_table-clean

# NB: gen_esp32part.py lives in the sdk/bin/ dir not component dir
GEN_ESP32PART := $(PYTHON) $(IDF_PATH)/bin/gen_esp32part.py -q
GEN_ESP32PART := $(PYTHON) $(COMPONENT_PATH)/gen_esp32part.py -q

# Path to partition CSV file is relative to project path for custom
# partition CSV files, but relative to component dir otherwise.$
Expand Down
File renamed without changes.

0 comments on commit d793d23

Please sign in to comment.