Use real python list to make arduino-builder command line

Instead of making a string with spaces and then splitting on " ", just
make the list itself with individual parameters.  This will allow spaces
in paths to be supported properly.

Author: earlephilhower

tests/common.sh

@@ -69,11 +69,7 @@ function build_sketches()
     local build_cmd="python3 tools/build.py -b generic -v -w all -s 4M1M -v -k --build_cache $cache_dir -p $PWD/$build_dir -n $lwip $build_arg "
     if [ "$WINDOWS" = "1" ]; then
         # Paths to the arduino builder need to be / referenced, not our native ones
-	local pwd_win=$(realpath $PWD | sed 's/^\/c//')
-	local bar_win=$(echo $build_arg | sed 's/^\/c\//')
-	# Make ARDUINO_IDE_PATH to Windows slashies
-        export ARDUINO_IDE_PATH=$(realpath $arduino | sed 's/\/c/C:/' | tr / '\\' )
-        build_cmd="python3 tools/build.py -b generic -v -w all -s 4M1M -v -k -p $pwd_win/$build_dir -n $lwip $bar_win "
+        build_cmd=$(echo $build_cmd --ide_path $arduino | sed 's/ \/c\// \//g' ) # replace '/c/' with '/'
     fi
     local sketches=$(find $srcpath -name *.ino | sort)
     print_size_info >size.log
@@ -116,7 +112,12 @@ function build_sketches()
         echo -e "\n ------------ Building $sketch ------------ \n";
         # $arduino --verify $sketch;
 	if [ "$WINDOWS" == "1" ]; then
-            sketch=$(echo $sketch | sed 's/\/c/C:/')
+            sketch=$(echo $sketch | sed 's/^\/c//')
+            # MINGW will try to be helpful and silently convert args that look like paths to point to a spot inside the MinGW dir.  This breaks everything.
+            # http://www.mingw.org/wiki/Posix_path_conversion
+            # https://stackoverflow.com/questions/7250130/how-to-stop-mingw-and-msys-from-mangling-path-names-given-at-the-command-line#34386471
+            export MSYS2_ARG_CONV_EXC="*"
+            export MSYS_NO_PATHCONV=1
         fi
         echo "$build_cmd $sketch"
         time ($build_cmd $sketch >build.log)

tools/build.py

@@ -30,23 +30,24 @@
 import shutil
 
 def compile(tmp_dir, sketch, cache, tools_dir, hardware_dir, ide_path, f, args):
-    cmd = ide_path + '/arduino-builder '
-    cmd += '-compile -logger=human '
-    cmd += '-build-path ' + tmp_dir + ' '
-    cmd += '-tools ' +  ide_path + '/tools-builder '
+    cmd = []
+    cmd += [ide_path + '/arduino-builder']
+    cmd += ['-compile', '-logger=human']
+    cmd += ['-build-path', tmp_dir]
+    cmd += ['-tools', ide_path + '/tools-builder']
     if cache != "":
-        cmd += '-build-cache ' + cache + ' '
+        cmd += ['-build-cache', cache ]
     if args.library_path:
         for lib_dir in args.library_path:
-            cmd += '-libraries ' + lib_dir + ' '
-    cmd += '-hardware ' + ide_path + '/hardware '
+            cmd += ['-libraries', lib_dir]
+    cmd += ['-hardware', ide_path + '/hardware']
     if args.hardware_dir:
         for hw_dir in args.hardware_dir:
-            cmd += '-hardware ' + hw_dir + ' '
+            cmd += ['-hardware', hw_dir]
     else:
-        cmd += '-hardware ' + hardware_dir + ' '
+        cmd += ['-hardware', hardware_dir]
     # Debug=Serial,DebugLevel=Core____
-    cmd += '-fqbn=esp8266com:esp8266:{board_name}:' \
+    fqbn = '-fqbn=esp8266com:esp8266:{board_name}:' \
             'xtal={cpu_freq},' \
             'FlashFreq={flash_freq},' \
             'FlashMode={flash_mode},' \
@@ -55,24 +56,19 @@ def compile(tmp_dir, sketch, cache, tools_dir, hardware_dir, ide_path, f, args):
             'ip={lwIP},' \
             'ResetMethod=nodemcu'.format(**vars(args))
     if args.debug_port and args.debug_level:
-        cmd += 'dbg={debug_port},lvl={debug_level}'.format(**vars(args))
-    cmd += ' '
-    cmd += '-built-in-libraries ' + ide_path + '/libraries '
-    cmd += '-ide-version=10607 '
-    cmd += '-warnings={warnings} '.format(**vars(args))
+        fqbn += 'dbg={debug_port},lvl={debug_level}'.format(**vars(args))
+    cmd += [fqbn]
+    cmd += ['-built-in-libraries', ide_path + '/libraries']
+    cmd += ['-ide-version=10607']
+    cmd += ['-warnings={warnings}'.format(**vars(args))]
     if args.verbose:
-        cmd += '-verbose '
-    cmd += sketch
-
-    # Try removing quotes to make arduino-cli work
-    #if platform.system() == "Windows":
-    #    cmd = cmd.replace('/', '\\')
+        cmd += ['-verbose']
+    cmd += [sketch]
 
     if args.verbose:
-        print('Building: ' + cmd, file=f)
+        print('Building: ' + " ".join(cmd), file=f)
 
-    cmds = cmd.split(' ')
-    p = subprocess.Popen(cmds, stdout=f, stderr=subprocess.STDOUT)
+    p = subprocess.Popen(cmd, stdout=f, stderr=subprocess.STDOUT)
     p.wait()
     return p.returncode
 
@@ -113,13 +109,18 @@ def main():
     args = parse_args()
 
     ide_path = args.ide_path
+    try:
+        print("IDE dir1: ", ide_path)
+    except:
+        pass
     if not ide_path:
         ide_path = os.environ.get('ARDUINO_IDE_PATH')
         if not ide_path:
             print("Please specify Arduino IDE path via --ide_path option"
                   "or ARDUINO_IDE_PATH environment variable.", file=sys.stderr)
             return 2
 
+        print("IDE dir2: ", ide_path)
     sketch_path = args.sketch_path
     tmp_dir = args.build_path
     created_tmp_dir = False
@@ -134,6 +135,7 @@ def main():
     output_name = tmp_dir + '/' + os.path.basename(sketch_path) + '.bin'
 
     if args.verbose:
+        print("IDE dir: ", ide_path)
         print("Sketch: ", sketch_path)
         print("Build dir: ", tmp_dir)
         print("Cache dir: ", args.build_cache)