Change sdk folder structure and fix json generation

Author: me-no-dev

Diff for: tools/add_sdk_json.py

@@ -18,6 +18,16 @@
 if sys.version_info[0] == 3:
     unicode = lambda s: str(s)
 
+def add_system(systems, host, url, filename, sha, size):
+    system = {
+        "host": host,
+        "url": url,
+        "archiveFileName": filename,
+        "checksum": "SHA-256:"+sha,
+        "size": str(size)
+    }
+    systems.append(system)
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(
         prog = 'add_sdk_json',
@@ -76,30 +86,14 @@
             farray['packages'][0]['platforms'][0]['toolsDependencies'].append(deps)
 
         systems = []
-        system = {
-            "host": '',
-            "url": tool_url,
-            "archiveFileName": tool_filename,
-            "checksum": "SHA-256:"+tool_sha,
-            "size": str(tool_size)
-        }
-
-        system["host"] = "i686-mingw32";
-        systems.append(system)
-        system["host"] = "x86_64-mingw32";
-        systems.append(system)
-        system["host"] = "arm64-apple-darwin";
-        systems.append(system)
-        system["host"] = "x86_64-apple-darwin";
-        systems.append(system)
-        system["host"] = "x86_64-pc-linux-gnu";
-        systems.append(system)
-        system["host"] = "i686-pc-linux-gnu";
-        systems.append(system)
-        system["host"] = "aarch64-linux-gnu";
-        systems.append(system)
-        system["host"] = "arm-linux-gnueabihf";
-        systems.append(system)
+        add_system(systems, "i686-mingw32", tool_url, tool_filename, tool_sha, tool_size)
+        add_system(systems, "x86_64-mingw32", tool_url, tool_filename, tool_sha, tool_size)
+        add_system(systems, "arm64-apple-darwin", tool_url, tool_filename, tool_sha, tool_size)
+        add_system(systems, "x86_64-apple-darwin", tool_url, tool_filename, tool_sha, tool_size)
+        add_system(systems, "x86_64-pc-linux-gnu", tool_url, tool_filename, tool_sha, tool_size)
+        add_system(systems, "i686-pc-linux-gnu", tool_url, tool_filename, tool_sha, tool_size)
+        add_system(systems, "aarch64-linux-gnu", tool_url, tool_filename, tool_sha, tool_size)
+        add_system(systems, "arm-linux-gnueabihf", tool_url, tool_filename, tool_sha, tool_size)
 
         tool_found = False
         for t in farray['packages'][0]['tools']:

Diff for: tools/push-to-arduino.sh

@@ -92,7 +92,7 @@ if [ $LIBS_HAS_COMMIT == "0" ]; then
 
 	# make changes to the files
 	echo "Patching files in esp32-arduino-libs branch '$AR_NEW_BRANCH_NAME'..."
-	rm -rf $IDF_LIBS_DIR/sdk && cp -Rf $AR_TOOLS/sdk $IDF_LIBS_DIR/
+	rm -rf $IDF_LIBS_DIR/* && cp -Rf $AR_TOOLS/sdk/* $IDF_LIBS_DIR/
 
 	cd $IDF_LIBS_DIR
 	if [ -f "README.md" ]; then