Revert "new release"

This reverts commit e607c88.

.gitignore

@@ -1,15 +1,15 @@
-# MakeCode
-built
-node_modules
-yotta_modules
-yotta_targets
-pxt_modules
-_site
-*.db
-*.tgz
-.header.json
-.simstate.json
-docs/assets/js/binary-local.js
-dist
-others
+# MakeCode
+built
+node_modules
+yotta_modules
+yotta_targets
+pxt_modules
+_site
+*.db
+*.tgz
+.header.json
+.simstate.json
+docs/assets/js/binary-local.js
+dist
+others
 *.gts

bump.sh

@@ -1,5 +1,5 @@
-#!/bin/sh
-
-set -e
-git pull
-makecode bump --version-file version.ts
+#!/bin/sh
+
+set -e
+git pull
+makecode bump --version-file version.ts

copy-release-files.sh

@@ -1,4 +1,3 @@
-<<<<<<< Updated upstream
 #!/bin/sh
 
 set -e
@@ -15,19 +14,3 @@ cp -v tools/hid-servers/built/jacdac-brain-f4/binary.uf2 dist/hid-servers-f4.uf2
 cp -v tools/hid-servers/built/jacdac-brain-rp2040/binary.uf2 dist/hid-servers-rp2040.uf2
 cp -v tools/hid-joystick/built/jacdac-brain-f4/binary.uf2 dist/hid-joystick-f4.uf2
 cp -v tools/hid-joystick/built/jacdac-brain-rp2040/binary.uf2 dist/hid-joystick-rp2040.uf2
-=======
-#!/bin/sh
-
-set -e
-rm -rf dist
-mkdir dist
-cp -v tools/multitool/built/combined.uf2 dist/multitool-f4-d5-n4.uf2
-cp -v tools/multitool/built/n3/binary.hex dist/multitool-microbit.hex
-cp -v tools/uploader/built/jacdac-iot-s2/binary.uf2 dist/uploader-esp32s2.uf2
-cp -v tools/uploader/built/jacdac-iot-s2/binary.srcmap dist/uploader-esp32s2.srcmap
-cp -v tools/microbit-oob/built/binary.hex dist/microbit-oob.hex
-cp -v tools/microbit-machine/built/binary.hex dist/microbit-machine.hex
-cp -v tools/farm-beats/built/binary.hex dist/farm-beats.hex
-cp -v tools/hid-servers/built/jacdac-brain-f4/binary.uf2 dist/hid-servers-f4.uf2
-cp -v tools/hid-servers/built/jacdac-brain-rp2040/binary.uf2 dist/hid-servers-rp2040.uf2
->>>>>>> Stashed changes

mk.sh

@@ -1,6 +1,6 @@
-#!/bin/sh
-
-set -e
-makecode -u -j --mono-repo -c mkc.json
-makecode -u -j --mono-repo -c mkc-maker.json
-makecode -u -j --mono-repo -c mkc-arcade.json
+#!/bin/sh
+
+set -e
+makecode -u -j --mono-repo -c mkc.json
+makecode -u -j --mono-repo -c mkc-maker.json
+makecode -u -j --mono-repo -c mkc-arcade.json

tools/uploader/build.sh

@@ -1,12 +1,12 @@
-#!/bin/sh
-
-set -e
-set -x
-if test -d ../../../../pxt-common-packages/libs/wifi---esp32 ; then
-  cfg=mkc-local.json
-else
-  cfg=mkc.json
-fi
-mkc build -d --config-path $cfg
-mkc serve -p 3232 --config-path $cfg
-#cp built/binary.js ../../docs/assets/js/binary-local.js
+#!/bin/sh
+
+set -e
+set -x
+if test -d ../../../../pxt-common-packages/libs/wifi---esp32 ; then
+  cfg=mkc-local.json
+else
+  cfg=mkc.json
+fi
+mkc build -d --config-path $cfg
+mkc serve -p 3232 --config-path $cfg
+#cp built/binary.js ../../docs/assets/js/binary-local.js

tools/uploader/link.sh

@@ -1,7 +1,7 @@
-#!/bin/sh
-
-test -f mkc.json.bkp || cp mkc.json mkc.json.bkp
-cp mkc-local.json mkc.json
-mkc init --symlink-pxt-modules
-mv mkc.json.bkp mkc.json
-rm -rf pxt_modules/jacdac* tsconfig.json
+#!/bin/sh
+
+test -f mkc.json.bkp || cp mkc.json mkc.json.bkp
+cp mkc-local.json mkc.json
+mkc init --symlink-pxt-modules
+mv mkc.json.bkp mkc.json
+rm -rf pxt_modules/jacdac* tsconfig.json

update-clients.sh

@@ -1,14 +1,14 @@
-#!/bin/sh
-
-set -e
-git pull
-for f in $(find . -name '*.gts'); do
-    echo "processing $f..."; 
-    cf="${f%.*}.g.ts"
-    if [ -f $cf ]
-    then
-        cp "$f" "${cf}"
-    fi
-done
-
+#!/bin/sh
+
+set -e
+git pull
+for f in $(find . -name '*.gts'); do
+    echo "processing $f..."; 
+    cf="${f%.*}.g.ts"
+    if [ -f $cf ]
+    then
+        cp "$f" "${cf}"
+    fi
+done
+
 prettier --write **/*.ts