Try and keep build.options.json

Author: earlephilhower

tests/common.sh

@@ -58,9 +58,23 @@ function build_sketches()
         # the git version header is rewritten after each compile, so the
         # builder sees it is new and says "rebuild the whole thing!"
 
-        if [ -e $cache_dir/core/*.a ]; then touch -t 203712310000 $cache_dir/core/*.a; fi
+        if [ -e $cache_dir/core/*.a ]; then
+            echo "orig:"; cat $build_dir/build.options.json
+            head -8 $build_dir/build.options.json > $build_dir/../build.options.json
+            echo '  "sketchLocation" : "'$sketch'",' >> $build_dir/../build.options.json
+            tail -2 $build_dir/build.options.json >> $build_dir/../build.options.json
+            echo "patched:"; cat $build_dir/../build.options.json
+            mv $build_dir/core $build_dir/../savecore
+            touch -t 203712310000 $cache_dir/core/*.a
+        fi
+
+        rm -rf $build_dir/sketch
+
+        if [ -e $cache_dir/core/*.a ]; then
+            mv $build_dir/../build.options.json $build_dir/build.options.json
+            mv $build_dir/../savecore $build_dir/core
+        fi
 
-        rm -rf $build_dir/*
         local sketchdir=$(dirname $sketch)
         local sketchdirname=$(basename $sketchdir)
         local sketchname=$(basename $sketch)

tools/build.py

@@ -57,6 +57,7 @@ def compile(tmp_dir, sketch, cache, tools_dir, hardware_dir, ide_path, f, args):
         cmd += 'dbg={debug_port},lvl={debug_level}'.format(**vars(args))
     cmd += ' '
     cmd += '-ide-version=10607 '
+    cmd += '-debug-level=10 '
     cmd += '-warnings={warnings} '.format(**vars(args))
     if args.verbose:
         cmd += '-verbose '