Skip to content

Commit

Permalink
Merge pull request #14 from kebhr/feat/update-scratch-to-v3.29.1
Browse files Browse the repository at this point in the history
Update scratch-desktop to v3.29.1
  • Loading branch information
kebhr authored Jul 19, 2022
2 parents ee4cb9c + 97d2b43 commit cce9295
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 533 deletions.
11 changes: 0 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,3 @@
!/scratch-gui/src/lib/libraries/extensions/tello

/scratch-desktop/*
!/scratch-desktop/LICENSE
!/scratch-desktop/src
/scratch-desktop/src/*
!/scratch-desktop/src/renderer
/scratch-desktop/src/renderer/*
!/scratch-desktop/src/renderer/app.jsx
!/scratch-desktop/src/renderer/telloProcessor.js
!/scratch-desktop/src/main/
/scratch-desktop/src/main/*
!/scratch-desktop/src/main/index.js
!/scratch-desktop/src/main/TelloProcessor.js
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# scratch3-tello
Code Tello with Scratch 3.0.
Fly Tello with Scratch 3.0.

For more information such as how to download, how to build: [scratch3-tello.app](https://scratch3-tello.app/)

Expand Down
24 changes: 15 additions & 9 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
git clone --depth 1 https://github.com/LLK/scratch-vm.git
git clone --depth 1 --branch scratch-desktop-v3.10.2 https://github.com/LLK/scratch-gui.git
git clone --depth 1 --branch v3.10.4 https://github.com/LLK/scratch-desktop.git
git clone --filter=blob:none https://github.com/LLK/scratch-vm.git -b 0.2.0-prerelease.20220222132735
git clone --filter=blob:none https://github.com/LLK/scratch-gui.git -b scratch-desktop-v3.29.0
git clone --filter=blob:none https://github.com/LLK/scratch-desktop.git -b v3.29.1

cd scratch-vm
npm install
npm link
cd ../scratch-gui
cd ..

cd scratch-gui
npm install
npm link scratch-vm
npm link
cd ../scratch-desktop
cd ..

cd scratch-desktop
npm install
npm link scratch-gui
cd node_modules/scratch-gui
npm link scratch-vm
cd ../../../
cd node_modules
rm -rf scratch-gui
ln -s ../../scratch-gui scratch-gui
cd ../../

git clone https://github.com/kebhr/scratch3-tello
cp -r scratch3-tello/. ./
rm -rf scratch3-tello/
13 changes: 0 additions & 13 deletions relink.sh

This file was deleted.

12 changes: 0 additions & 12 deletions scratch-desktop/LICENSE

This file was deleted.

Loading

0 comments on commit cce9295

Please sign in to comment.