From 0d3e9f0968677daeee7a0256cd25be58b66832ae Mon Sep 17 00:00:00 2001
From: Sam Grove <sam.w.grove@gmail.com>
Date: Thu, 17 Nov 2016 23:49:49 -0600
Subject: [PATCH 1/9] [exporters] make sure to clean .build and BUILD

---
 tools/export/makefile/__init__.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/export/makefile/__init__.py b/tools/export/makefile/__init__.py
index d449a38097..fe0b267e97 100644
--- a/tools/export/makefile/__init__.py
+++ b/tools/export/makefile/__init__.py
@@ -141,8 +141,11 @@ class Makefile(Exporter):
         if cleanup:
             remove("Makefile")
             remove(log_name)
+            # legacy .build directory cleaned if exists
             if exists('.build'):
                 shutil.rmtree('.build')
+            if exists('BUILD'):
+                shutil.rmtree('BUILD')
 
         if ret_code != 0:
             # Seems like something went wrong.

From 72cdf9d16fc6afd51c683d758ff96847a84953e4 Mon Sep 17 00:00:00 2001
From: Sam Grove <sam.w.grove@gmail.com>
Date: Thu, 17 Nov 2016 23:53:41 -0600
Subject: [PATCH 2/9] [exporters] iar build artifacts in BUILD directory, not
 .build

---
 tools/export/cdt/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/export/cdt/__init__.py b/tools/export/cdt/__init__.py
index 7b43761602..05147d07fc 100644
--- a/tools/export/cdt/__init__.py
+++ b/tools/export/cdt/__init__.py
@@ -14,7 +14,7 @@ class Eclipse(Makefile):
         super(Eclipse, self).generate()
         ctx = {
             'name': self.project_name,
-            'elf_location': join('.build',self.project_name)+'.elf',
+            'elf_location': join('BUILD',self.project_name)+'.elf',
             'c_symbols': self.toolchain.get_symbols(),
             'asm_symbols': self.toolchain.get_symbols(True),
             'target': self.target,

From 116d8dffdd72169a6ed62a49d1ec936c94277163 Mon Sep 17 00:00:00 2001
From: Sam Grove <sam.w.grove@gmail.com>
Date: Thu, 17 Nov 2016 23:55:10 -0600
Subject: [PATCH 3/9] [exporters] make sure to clean .build and BUILD when
 testing iar

---
 tools/export/iar/__init__.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/export/iar/__init__.py b/tools/export/iar/__init__.py
index 475f86615e..e07d7d9926 100644
--- a/tools/export/iar/__init__.py
+++ b/tools/export/iar/__init__.py
@@ -165,8 +165,11 @@ class IAR(Exporter):
             os.remove(project_name + ".ewp")
             os.remove(project_name + ".ewd")
             os.remove(project_name + ".eww")
+            # legacy output file location
             if exists('.build'):
                 shutil.rmtree('.build')
+            if exists('BUILD'):
+                shutil.rmtree('BUILD')
 
         if ret_code !=0:
             # Seems like something went wrong.

From 6bee31eaad52924bb1d7c6266a21a60a1f112529 Mon Sep 17 00:00:00 2001
From: Sam Grove <sam.w.grove@gmail.com>
Date: Thu, 17 Nov 2016 23:56:11 -0600
Subject: [PATCH 4/9] [exporters] make sure to clean .build and BUILD when
 testing uvision

---
 tools/export/uvision/__init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/export/uvision/__init__.py b/tools/export/uvision/__init__.py
index c0aa5c5b6e..aad783d2d9 100644
--- a/tools/export/uvision/__init__.py
+++ b/tools/export/uvision/__init__.py
@@ -226,8 +226,11 @@ class Uvision(Exporter):
             os.remove(log_name)
             os.remove(project_name+".uvprojx")
             os.remove(project_name+".uvoptx")
+            # legacy .build directory cleaned if exists
             if exists('.build'):
-                shutil.rmtree(".build")
+                shutil.rmtree('.build')
+            if exists('BUILD'):
+                shutil.rmtree('BUILD')
 
         # Returns 0 upon success, 1 upon a warning, and neither upon an error
         if ret_code != 0 and ret_code != 1:

From 2fe28f0da10dbbdf5973d1e069c79df4fdc715f4 Mon Sep 17 00:00:00 2001
From: Sam Grove <sam.w.grove@gmail.com>
Date: Thu, 17 Nov 2016 23:57:26 -0600
Subject: [PATCH 5/9] [tools] update comments in memmap about build folder name

---
 tools/memap.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/memap.py b/tools/memap.py
index ba598c2c86..9718b9b584 100644
--- a/tools/memap.py
+++ b/tools/memap.py
@@ -138,8 +138,8 @@ class MemapParser(object):
         """ Parse data from a section of gcc map file
 
         examples:
-                        0x00004308       0x7c ./.build/K64F/GCC_ARM/mbed-os/hal/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/spi_api.o
-         .text          0x00000608      0x198 ./.build/K64F/GCC_ARM/mbed-os/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_GCC/HAL_CM4.o
+                        0x00004308       0x7c ./BUILD/K64F/GCC_ARM/mbed-os/hal/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/spi_api.o
+         .text          0x00000608      0x198 ./BUILD/K64F/GCC_ARM/mbed-os/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN_GCC/HAL_CM4.o
 
         Positional arguments:
         line - the line to parse a section from

From 7297fdf3f6ecb1d2bf66ae1b2a545ad61b9f56be Mon Sep 17 00:00:00 2001
From: Sam Grove <sam.w.grove@gmail.com>
Date: Fri, 18 Nov 2016 00:01:21 -0600
Subject: [PATCH 6/9] [exporters] update iar teamplates so build artifacts end
 up in BUILD directory, not .build

---
 tools/export/iar/ewp.tmpl                   | 6 +++---
 tools/export/iar/iar_nucleo_f746zg.ewp.tmpl | 6 +++---
 tools/export/iar/iar_rz_a1h.ewp.tmpl        | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tools/export/iar/ewp.tmpl b/tools/export/iar/ewp.tmpl
index b69f6f694b..3ba5e4be8a 100644
--- a/tools/export/iar/ewp.tmpl
+++ b/tools/export/iar/ewp.tmpl
@@ -20,15 +20,15 @@
 				</option>
 				<option>
 					<name>ExePath</name>
-					<state>$PROJ_DIR$\.build\Exe</state>
+					<state>$PROJ_DIR$\BUILD\Exe</state>
 				</option>
 				<option>
 					<name>ObjPath</name>
-					<state>$PROJ_DIR$\.build\Obj</state>
+					<state>$PROJ_DIR$\BUILD\Obj</state>
 				</option>
 				<option>
 					<name>ListPath</name>
-					<state>$PROJ_DIR$\.build\List</state>
+					<state>$PROJ_DIR$\BUILD\List</state>
 				</option>
 				<option>
 					<name>Variant</name>
diff --git a/tools/export/iar/iar_nucleo_f746zg.ewp.tmpl b/tools/export/iar/iar_nucleo_f746zg.ewp.tmpl
index be2a678f1c..f42f88222e 100644
--- a/tools/export/iar/iar_nucleo_f746zg.ewp.tmpl
+++ b/tools/export/iar/iar_nucleo_f746zg.ewp.tmpl
@@ -16,15 +16,15 @@
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
-          <state>$PROJ_DIR$\.build\iar_arm\Exe</state>
+          <state>$PROJ_DIR$\BUILD\Exe</state>
           <name>ExePath</name>
         </option>
         <option>
-          <state>$PROJ_DIR$\.build\iar_arm\Obj</state>
+          <state>$PROJ_DIR$\BUILD\Obj</state>
           <name>ObjPath</name>
         </option>
         <option>
-          <state>$PROJ_DIR$\.build\iar_arm\List</state>
+          <state>$PROJ_DIR$\BUILD\List</state>
           <name>ListPath</name>
         </option>
         <option>
diff --git a/tools/export/iar/iar_rz_a1h.ewp.tmpl b/tools/export/iar/iar_rz_a1h.ewp.tmpl
index 84833e64e7..b36e1011cf 100644
--- a/tools/export/iar/iar_rz_a1h.ewp.tmpl
+++ b/tools/export/iar/iar_rz_a1h.ewp.tmpl
@@ -16,15 +16,15 @@
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
-          <state>$PROJ_DIR$\.build\iar_arm\Exe</state>
+          <state>$PROJ_DIR$\BUILD\Exe</state>
           <name>ExePath</name>
         </option>
         <option>
-          <state>$PROJ_DIR$\.build\iar_arm\Obj</state>
+          <state>$PROJ_DIR$\BUILD\Obj</state>
           <name>ObjPath</name>
         </option>
         <option>
-          <state>$PROJ_DIR$\.build\iar_arm\List</state>
+          <state>$PROJ_DIR$\BUILD\List</state>
           <name>ListPath</name>
         </option>
         <option>

From a6f5233f4503dabe607ffd53e3fd4957e2d1e88a Mon Sep 17 00:00:00 2001
From: Sam Grove <sam.w.grove@gmail.com>
Date: Fri, 18 Nov 2016 00:02:35 -0600
Subject: [PATCH 7/9] [exporters] update uvision teamplates so build artifacts
 end up in BUILD directory, not .build

---
 tools/export/uvision/uvision.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/export/uvision/uvision.tmpl b/tools/export/uvision/uvision.tmpl
index c22f2cb491..74f4ee9c28 100644
--- a/tools/export/uvision/uvision.tmpl
+++ b/tools/export/uvision/uvision.tmpl
@@ -46,14 +46,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\.build\uvision5\</OutputDirectory>
+          <OutputDirectory>.\BUILD\</OutputDirectory>
           <OutputName>{{name}}</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\.build\uvision5\</ListingPath>
+          <ListingPath>.\BUILD\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>

From 91361ec39a6d668fdaf5ed83515420059d0cd32a Mon Sep 17 00:00:00 2001
From: Sam Grove <sam.w.grove@gmail.com>
Date: Fri, 18 Nov 2016 00:03:55 -0600
Subject: [PATCH 8/9] [tools] update default build directory from .build to
 BUILD

---
 tools/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/settings.py b/tools/settings.py
index 46050c5c63..b3b2f470cd 100644
--- a/tools/settings.py
+++ b/tools/settings.py
@@ -25,7 +25,7 @@ ROOT = abspath(join(dirname(__file__), ".."))
 ##############################################################################
 # Toolchains and Build System Settings
 ##############################################################################
-BUILD_DIR = abspath(join(ROOT, ".build"))
+BUILD_DIR = abspath(join(ROOT, "BUILD"))
 
 # ARM Compiler 5
 ARM_PATH = "C:/Keil_v5/ARM/ARMCC"

From f0e3ff490924f48fe9ed7160b6a35b99a33fabbc Mon Sep 17 00:00:00 2001
From: Sam Grove <sam.w.grove@gmail.com>
Date: Fri, 18 Nov 2016 00:25:01 -0600
Subject: [PATCH 9/9] [exporters] update makefile build output directory to
 match mbed-cli and use the special reserved folder BUILD

---
 tools/export/makefile/Makefile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/export/makefile/Makefile.tmpl b/tools/export/makefile/Makefile.tmpl
index e16024cc46..b488ca4dcf 100644
--- a/tools/export/makefile/Makefile.tmpl
+++ b/tools/export/makefile/Makefile.tmpl
@@ -13,7 +13,7 @@ else
     RM = '$(SHELL)' -c "rm -rf \"$(1)\""
 endif
 
-OBJDIR := .build
+OBJDIR := BUILD
 # Move to the build directory
 ifeq (,$(filter $(OBJDIR),$(notdir $(CURDIR))))
 .SUFFIXES: