Skip to content

Changes added to generate libs for ESP RainMaker #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2020
Merged

Changes added to generate libs for ESP RainMaker #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Changes added to generate libs for ESP RainMaker
  • Loading branch information
@sweetymhaiske
sweetymhaiske committed Aug 11, 2020
commit f3d0ba79ca6630f38cd2320cbb1aa11015fa817f
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/components/esp-face/lib
EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/components/esp-face/image_util
EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/components/esp-face/face_detection
EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/components/esp-face/face_recognition
EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/components/esp-rainmaker/components/esp_rainmaker
EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/components/esp-rainmaker/components/json_generator
EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/components/esp-rainmaker/components/json_parser
EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/components/esp-rainmaker/components/qrcode

include $(IDF_PATH)/make/project.mk

Expand Down
1 change: 1 addition & 0 deletions tools/config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ IDF_REPO_URL="https://github.com/espressif/esp-idf.git"
CAMERA_REPO_URL="https://github.com/espressif/esp32-camera.git"
FACE_REPO_URL="https://github.com/espressif/esp-face.git"
AR_REPO_URL="https://github.com/$AR_REPO.git"
RMAKER_REPO_URL="https://github.com/espressif/esp-rainmaker.git"

if [ -n $GITHUB_TOKEN ]; then
AR_REPO_URL="https://$GITHUB_TOKEN@github.com/$AR_REPO.git"
Expand Down
12 changes: 12 additions & 0 deletions tools/update-components.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,15 @@ else
git -C "$AR_COMPS/esp-face" pull origin master
fi
if [ $? -ne 0 ]; then exit 1; fi

#
# CLONE/UPDATE RAINMAKER
#

if [ ! -d "$AR_COMPS/esp-rainmaker" ]; then
git clone $RMAKER_REPO_URL "$AR_COMPS/esp-rainmaker"
else
git -C "$AR_COMPS/esp-rainmaker" fetch origin && \
git -C "$AR_COMPS/esp-rainmaker" pull origin master
fi
if [ $? -ne 0 ]; then exit 1; fi