Use full path to upload tools // Issue #16

valeros · valeros · commit 5fd0124b33f8 · 2021-08-19T12:03:16.000+03:00
diff --git a/builder/main.py b/builder/main.py
@@ -154,9 +154,9 @@ def generate_uf2(target, source, env):
     ]
 elif upload_protocol == "picotool":
     env.Replace(
-        UPLOADER="rp2040load",
+        UPLOADER=join(platform.get_package_dir("tool-rp2040tools") or "", "rp2040load"),
         UPLOADERFLAGS=["-v", "-D"],
-        UPLOADCMD="$UPLOADER $UPLOADERFLAGS $SOURCES"
+        UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS $SOURCES'
     )
 
     upload_actions = [

Original file line number	Diff line number	Diff line change
`@@ -154,9 +154,9 @@ def generate_uf2(target, source, env):`
`154`	`154`	`]`
`155`	`155`	`elif upload_protocol == "picotool":`
`156`	`156`	`env.Replace(`
`157`		`- UPLOADER="rp2040load",`
	`157`	`+ UPLOADER=join(platform.get_package_dir("tool-rp2040tools") or "", "rp2040load"),`
`158`	`158`	`UPLOADERFLAGS=["-v", "-D"],`
`159`		`- UPLOADCMD="$UPLOADER $UPLOADERFLAGS $SOURCES"`
	`159`	`+ UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS $SOURCES'`
`160`	`160`	`)`
`161`	`161`
`162`	`162`	`upload_actions = [`