From 1154616d038ec0cda6b96c9f2574db01d910cc7a Mon Sep 17 00:00:00 2001
From: C Freeman <cecille@google.com>
Date: Tue, 13 Jul 2021 09:56:51 -0400
Subject: [PATCH] Fix clear-config in build-all-clusters-app.py (#8260)

---
 scripts/examples/build-all-clusters-app.py | 28 +++++++++++++++-------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/scripts/examples/build-all-clusters-app.py b/scripts/examples/build-all-clusters-app.py
index b5b26402636059..b2a669f4b6e7b7 100755
--- a/scripts/examples/build-all-clusters-app.py
+++ b/scripts/examples/build-all-clusters-app.py
@@ -2,6 +2,7 @@
 
 import argparse
 import os
+import shutil
 import subprocess
 import logging
 import coloredlogs
@@ -41,7 +42,7 @@ def main():
   parser.add_argument(
       '--clear-config',
       default=None,
-      choices=['m5stack', 'devkit'],
+      choices=['m5stack', 'devkit', 'curr', 'default'],
   )
   args = parser.parse_args()
 
@@ -54,17 +55,28 @@ def main():
   e = IDFExecutor()
 
   if args.clear_config:
+    old_default_sdkconfig = None
+    clear_curr = args.clear_config != 'curr'
     logging.info('Building a clear configuration')
-    sdkconfig = 'sdkconfig_%s.defaults' % args.clear_config
 
-    curr_sdkconfig = os.path.join(ROOT, 'sdkconfig')
-    if os.path.exists(curr_sdkconfig):
-      os.remove(curr_sdkconfig)
+    if args.clear_config == "m5stack" or args.clear_config == "devkit":
+      desired_sdkconfig_name = 'sdkconfig_%s.defaults' % args.clear_config
+      logging.info('Using default' + desired_sdkconfig_name)
+      desired_sdkconfig = os.path.join(ROOT, desired_sdkconfig_name)
+      default_sdkconfig = os.path.join(ROOT, 'sdkconfig.defaults')
+      old_default_sdkconfig = os.path.join(ROOT, 'sdkconfig.defaults.old')
+      shutil.copy(default_sdkconfig, old_default_sdkconfig)
+      shutil.copy(desired_sdkconfig, default_sdkconfig)
 
-    e.execute('-D SDKCONFIG_DEFAULTS="{sdkname}" build'.format(
-      sdkname=sdkconfig
-    ))
+    if clear_curr:
+      logging.info('Clearing current config')
+      sdkconfig = os.path.join(ROOT, 'sdkconfig')
+      os.remove(sdkconfig)
 
+    e.execute('menuconfig')
+
+    if old_default_sdkconfig is not None:
+      shutil.move(old_default_sdkconfig, default_sdkconfig)
 
   logging.info('Compiling')
   e.execute('build')