revert the renaming of esp32/build/ to esp32/build-BASE/

peter-pycom · peter-pycom · commit e4cf3155a648 · 2020-06-18T15:49:40.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@
 
 # Build directories
 ######################
+esp32/build/
 esp32/build-*/
 mpy-cross/build/*
 # This map file is generated here instead of the build folder...
diff --git a/esp32/Makefile b/esp32/Makefile
@@ -55,7 +55,11 @@ ifeq ($(VARIANT),PYGATE)
     PYGATE_ENABLED=1
 endif
 
-BUILD_DIR ?=build-$(VARIANT)
+ifeq ($(VARIANT),BASE)
+	BUILD_DIR ?=build
+else
+	BUILD_DIR ?=build-$(VARIANT)
+endif
 
 BUILD = $(BUILD_DIR)/$(BOARD)/$(BTYPE)
 
diff --git a/esp32/tools/mpy-build-check.sh b/esp32/tools/mpy-build-check.sh
@@ -9,7 +9,11 @@ VARIANT="$3"
 PY_PATH="./frozen"
 PY_DIRS="$(ls ${PY_PATH})"
 OS="$(uname)"
-BUILD_DIR="build-${VARIANT}/${BOARD}/${RELEASE_TYP}"
+if [ ${VARIANT} != "BASE" ] ; then
+  BUILD_DIR="build-${VARIANT}/${BOARD}/${RELEASE_TYP}"
+else
+  BUILD_DIR="build/${BOARD}/${RELEASE_TYP}"
+fi
 
 # Script has to be called from esp32 dir
 if ! [ $0 = "tools/mpy-build-check.sh" ]; then
diff --git a/esp32/tools/size_check.sh b/esp32/tools/size_check.sh
@@ -5,7 +5,12 @@ set -e
 BOARD="$1"
 RELEASE_TYP="$2"
 VARIANT="$3"
-BUILD_DIR="build-${VARIANT}"
+if [ ${VARIANT} != "BASE" ] ; then
+  BUILD_DIR="build-${VARIANT}"
+else
+  BUILD_DIR="build"
+fi
+
 IMG_MAX_SIZE_8MB=2027520
 IMG_MAX_SIZE_4MB=1761280
 OS="$(uname)"
