From c8be7eb84131858ebc85fe70a4f9a661f9091965 Mon Sep 17 00:00:00 2001 From: W3SLAV <49104904+W3SLAV@users.noreply.github.com> Date: Tue, 12 Aug 2025 20:18:50 -0500 Subject: [PATCH 01/12] Added Orca installer to Blocks --- tools/Orca.py | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 tools/Orca.py diff --git a/tools/Orca.py b/tools/Orca.py new file mode 100644 index 00000000..fae391f9 --- /dev/null +++ b/tools/Orca.py @@ -0,0 +1,74 @@ +#idk, license or something +# W3SLAV was x + + +#this tool only works on x86 linux platforms for the time being (because Wonderful Toolchain doesn't support windows) +import os + +#urllib is only for downloading Wonderful Toolchain builds +from urllib.request import urlretrieve + +#this is for simple "portable" option (no path exports and all files sent to single dir) +import argparse +parser = argparse.ArgumentParser() +parser.add_argument("--portable",action="store_true", help="build in portable mode") +args = parser.parse_args() + + +print("OrcaBlocks Installer v1.0\n -W3SLAV") + +is_portable = False + +if (args.portable==True): + print("using portable mode") + print("THIS MODE IS NOT RECOMMENDED FOR NORMAL USE") + is_portable = True + + +#pull from https://wonderful.asie.pl/bootstrap/wf-bootstrap-x86_64.tar.gz +urlretrieve("https://wonderful.asie.pl/bootstrap/wf-bootstrap-x86_64.tar.gz", "wf-bootstrap-x86_64.tar.gz") + +#get current path for later +#cwd = blocks sdk dir +cwd = os.getcwd() + +if (is_portable==False): + #following the tutorial here: + os.system('mkdir /opt/wonderful') + os.system('chown -R $USER:$USER /opt/wonderful') + os.system('cd /opt/wonderful/') + os.system('tar xzvf '+cwd+'/wf-bootstrap-x86_64.tar.gz -C /opt/wonderful') + os.environ["PATH"] = "/opt/wonderful/bin:" + os.environ["PATH"] + os.environ["WONDERFUL_TOOLCHAIN"] = "/opt/wonderful" + os.system('cd /opt/wonderful/bin') + os.system('wf-pacman -Syu --noconfirm') + os.system('wf-pacman -S toolchain-gcc-arm-none-eabi --noconfirm') + + print('finished installing Wonderful Toolchain\n beginning BlocksDS install') + + + #start installing blocks + os.system('sudo mkdir /opt/blocksds/') + os.system('sudo chown $USER:$USER /opt/blocksds') + os.system('mkdir /opt/blocksds/external') + os.system('make install') + + +if (is_portable==True): + #build to "portable file" called portable.blocks + + os.system('mkdir portable.blocks') + os.system('cd portable.blocks') + os.system('tar xzvf '+cwd+'/wf-bootstrap-x86_64.tar.gz -C '+cwd+'/portable.blocks') + #VVV this needs Wonderful toolchain to make a few changes to how it searches for the config file, I will make an issue on github for this + os.system('cd '+cwd+'/portable.blocks/bin/ && ./wf-pacman -Syu') + os.system('cd '+cwd+'/portable.blocks/bin/ && ./wf-pacman -S toolchain-gcc-arm-none-eabi') + print("finished portable Wonderful Toolchain packing\nmoving on to Blocks...") + + #build blocks to dir + os.system('BLOCKSDS=$PWD make INSTALLDIR=portable.blocks -j`nproc`') + + +print("\nDone!\n") + + From 3cbce1ca8d2291050edd5090a5c44b7279daa6fc Mon Sep 17 00:00:00 2001 From: W3SLAV <49104904+W3SLAV@users.noreply.github.com> Date: Tue, 12 Aug 2025 20:19:17 -0500 Subject: [PATCH 02/12] Add final installer shell script --- Install_Linux.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Install_Linux.sh diff --git a/Install_Linux.sh b/Install_Linux.sh new file mode 100644 index 00000000..1f22310d --- /dev/null +++ b/Install_Linux.sh @@ -0,0 +1,7 @@ +# W3SLAV was x + +#some installed elements need sudo, so to improve user experience run with sudo so you don't have to enter a password 10 times +#this can be done with sudo bash Install_Linux.sh +python tools/Orca.py +export PATH=/opt/wonderful/bin:$PATH +WONDERFUL_TOOLCHAIN=/opt/wonderful From 2c5ee9f55bef1c6d1e9c7b123a48a650a0eee5a4 Mon Sep 17 00:00:00 2001 From: W3SLAV <49104904+W3SLAV@users.noreply.github.com> Date: Wed, 13 Aug 2025 08:26:34 -0500 Subject: [PATCH 03/12] cleanup and add final print out message --- Install_Linux.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Install_Linux.sh b/Install_Linux.sh index 1f22310d..1dcc4e1c 100644 --- a/Install_Linux.sh +++ b/Install_Linux.sh @@ -4,4 +4,6 @@ #this can be done with sudo bash Install_Linux.sh python tools/Orca.py export PATH=/opt/wonderful/bin:$PATH -WONDERFUL_TOOLCHAIN=/opt/wonderful +export WONDERFUL_TOOLCHAIN=/opt/wonderful + +echo "Install finished, but you may need to set the PATH for Wonderful Toolchain permanently" From 75c870b3df48b3518e941e058ef81d9d94117dcf Mon Sep 17 00:00:00 2001 From: W3SLAV <49104904+W3SLAV@users.noreply.github.com> Date: Wed, 13 Aug 2025 17:01:41 -0500 Subject: [PATCH 04/12] Added improved error checking and platform support --- tools/Orca.py | 107 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 68 insertions(+), 39 deletions(-) diff --git a/tools/Orca.py b/tools/Orca.py index fae391f9..51d4c007 100644 --- a/tools/Orca.py +++ b/tools/Orca.py @@ -1,72 +1,101 @@ #idk, license or something # W3SLAV was x - -#this tool only works on x86 linux platforms for the time being (because Wonderful Toolchain doesn't support windows) import os - +import platform +import argparse #urllib is only for downloading Wonderful Toolchain builds from urllib.request import urlretrieve -#this is for simple "portable" option (no path exports and all files sent to single dir) -import argparse + +cwd = os.getcwd() + + parser = argparse.ArgumentParser() -parser.add_argument("--portable",action="store_true", help="build in portable mode") +parser.add_argument("--portable",action="store_true", help="build in portable mode (LINUX)") +parser.add_argument("--minimal",action="store_true", help="minimal install") args = parser.parse_args() print("OrcaBlocks Installer v1.0\n -W3SLAV") is_portable = False - if (args.portable==True): print("using portable mode") print("THIS MODE IS NOT RECOMMENDED FOR NORMAL USE") is_portable = True -#pull from https://wonderful.asie.pl/bootstrap/wf-bootstrap-x86_64.tar.gz -urlretrieve("https://wonderful.asie.pl/bootstrap/wf-bootstrap-x86_64.tar.gz", "wf-bootstrap-x86_64.tar.gz") -#get current path for later -#cwd = blocks sdk dir -cwd = os.getcwd() + +#use msys if windows +if (platform.system() == "Windows"): + env = os.environ + return ( + "MSYSTEM" in env and + env["MSYSTEM"] in ("MSYS", "MINGW32", "MINGW64", "UCRT64", "CLANG64") + ) + if is_msys2(): + pacman_path = shutil.which("wf-pacman") + if not pacman_path: + exit() + else: + print("Not running inside MSYS2. Please Use MSYS2") + exit() if (is_portable==False): - #following the tutorial here: - os.system('mkdir /opt/wonderful') - os.system('chown -R $USER:$USER /opt/wonderful') - os.system('cd /opt/wonderful/') - os.system('tar xzvf '+cwd+'/wf-bootstrap-x86_64.tar.gz -C /opt/wonderful') - os.environ["PATH"] = "/opt/wonderful/bin:" + os.environ["PATH"] - os.environ["WONDERFUL_TOOLCHAIN"] = "/opt/wonderful" - os.system('cd /opt/wonderful/bin') +#pull from https://wonderful.asie.pl/bootstrap/wf-bootstrap-x86_64.tar.gz + if (platform.system() == "Linux"): + urlretrieve("https://wonderful.asie.pl/bootstrap/wf-bootstrap-x86_64.tar.gz", "wf-bootstrap-x86_64.tar.gz") + + #following the tutorial here: + os.system('mkdir /opt/wonderful') + os.system('chown -R $USER:$USER /opt/wonderful') + os.system('cd /opt/wonderful/') + os.system('tar xzvf '+cwd+'/wf-bootstrap-x86_64.tar.gz -C /opt/wonderful') + os.environ["PATH"] = "/opt/wonderful/bin:" + os.environ["PATH"] + os.environ["WONDERFUL_TOOLCHAIN"] = "/opt/wonderful" + os.system('cd /opt/wonderful/bin') + os.system('wf-pacman -Syu --noconfirm') + os.system('wf-pacman -S toolchain-gcc-arm-none-eabi --noconfirm') + + print('finished installing Wonderful Toolchain\n beginning BlocksDS install') + +# THIS WILL RUN ON ALL PLATFORMS + os.system('wf-pacman -Syu wf-tools --noconfirm') + os.system('wf-config repo enable blocksds --noconfirm') os.system('wf-pacman -Syu --noconfirm') - os.system('wf-pacman -S toolchain-gcc-arm-none-eabi --noconfirm') + os.system('wf-pacman -S blocksds-toolchain') + # this will install docs as well V + if (args.minimal==False): + os.system('wf-pacman -S blocksds-docs') + os.system('wf-pacman -S toolchain-llvm-teak-llvm') + os.system('wf-pacman -S blocksds-nflib blocksds-nitroengine') + os.system('ln -s /opt/wonderful/thirdparty/blocksds /opt/blocksds') + + + + - print('finished installing Wonderful Toolchain\n beginning BlocksDS install') - #start installing blocks - os.system('sudo mkdir /opt/blocksds/') - os.system('sudo chown $USER:$USER /opt/blocksds') - os.system('mkdir /opt/blocksds/external') - os.system('make install') +#LINUX/WSL ONLY VVVVV if (is_portable==True): - #build to "portable file" called portable.blocks - - os.system('mkdir portable.blocks') - os.system('cd portable.blocks') - os.system('tar xzvf '+cwd+'/wf-bootstrap-x86_64.tar.gz -C '+cwd+'/portable.blocks') - #VVV this needs Wonderful toolchain to make a few changes to how it searches for the config file, I will make an issue on github for this - os.system('cd '+cwd+'/portable.blocks/bin/ && ./wf-pacman -Syu') - os.system('cd '+cwd+'/portable.blocks/bin/ && ./wf-pacman -S toolchain-gcc-arm-none-eabi') - print("finished portable Wonderful Toolchain packing\nmoving on to Blocks...") - - #build blocks to dir - os.system('BLOCKSDS=$PWD make INSTALLDIR=portable.blocks -j`nproc`') + if (platform.system() == "Linux"): + #build to "portable file" called portable.blocks + + os.system('mkdir portable.blocks') + os.system('cd portable.blocks') + if os.path.exists("/opt/wonderful"): + os.system('cp -r /opt/wonderful '+cwd+'/portable.blocks') + print("finished portable Wonderful Toolchain packing\nmoving on to Blocks...") + else: + print("building a portable copy requires having wf-pacman installed please install it by running this program without the '--portable' flag") + exit() + #build blocks to dir + os.system('BLOCKSDS=$PWD make INSTALLDIR=portable.blocks -j`nproc`') print("\nDone!\n") From 34c84f33478ad4f0469061480935de5ca7a14433 Mon Sep 17 00:00:00 2001 From: W3SLAV <49104904+W3SLAV@users.noreply.github.com> Date: Wed, 13 Aug 2025 17:02:50 -0500 Subject: [PATCH 05/12] Update Install_Linux.sh for pacman --- Install_Linux.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Install_Linux.sh b/Install_Linux.sh index 1dcc4e1c..65d58799 100644 --- a/Install_Linux.sh +++ b/Install_Linux.sh @@ -3,7 +3,12 @@ #some installed elements need sudo, so to improve user experience run with sudo so you don't have to enter a password 10 times #this can be done with sudo bash Install_Linux.sh python tools/Orca.py + export PATH=/opt/wonderful/bin:$PATH export WONDERFUL_TOOLCHAIN=/opt/wonderful +ln -s /opt/wonderful/thirdparty/blocksds /opt/blocksds +export BLOCKSDS=/opt/wonderful/thirdparty/blocksds/core +export BLOCKSDSEXT=/opt/wonderful/thirdparty/blocksds/external + echo "Install finished, but you may need to set the PATH for Wonderful Toolchain permanently" From 58bd3c21e74ec036d90a55f4e995f92d03bb7542 Mon Sep 17 00:00:00 2001 From: W3SLAV <49104904+W3SLAV@users.noreply.github.com> Date: Wed, 13 Aug 2025 17:34:22 -0500 Subject: [PATCH 06/12] fix redundant install --- tools/Orca.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/Orca.py b/tools/Orca.py index 51d4c007..4d639b45 100644 --- a/tools/Orca.py +++ b/tools/Orca.py @@ -57,7 +57,6 @@ os.environ["WONDERFUL_TOOLCHAIN"] = "/opt/wonderful" os.system('cd /opt/wonderful/bin') os.system('wf-pacman -Syu --noconfirm') - os.system('wf-pacman -S toolchain-gcc-arm-none-eabi --noconfirm') print('finished installing Wonderful Toolchain\n beginning BlocksDS install') From 1c4591dcd753739fb035669bde89af0f130d2db8 Mon Sep 17 00:00:00 2001 From: W3SLAV <49104904+W3SLAV@users.noreply.github.com> Date: Wed, 13 Aug 2025 18:00:48 -0500 Subject: [PATCH 07/12] Add error checker (like `set -e`) --- tools/Orca.py | 57 ++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/tools/Orca.py b/tools/Orca.py index 4d639b45..172cb6a7 100644 --- a/tools/Orca.py +++ b/tools/Orca.py @@ -4,12 +4,14 @@ import os import platform import argparse +import subprocess #urllib is only for downloading Wonderful Toolchain builds from urllib.request import urlretrieve - +#error checking cwd = os.getcwd() - +def run(cmd): + subprocess.run(cmd, shell=True, check=True) parser = argparse.ArgumentParser() parser.add_argument("--portable",action="store_true", help="build in portable mode (LINUX)") @@ -31,17 +33,12 @@ #use msys if windows if (platform.system() == "Windows"): env = os.environ - return ( - "MSYSTEM" in env and - env["MSYSTEM"] in ("MSYS", "MINGW32", "MINGW64", "UCRT64", "CLANG64") - ) - if is_msys2(): - pacman_path = shutil.which("wf-pacman") - if not pacman_path: - exit() - else: + if "MSYSTEM" not in os.environ: print("Not running inside MSYS2. Please Use MSYS2") exit() + pacman_path = shutil.which("wf-pacman") + if not pacman_path: + exit() if (is_portable==False): #pull from https://wonderful.asie.pl/bootstrap/wf-bootstrap-x86_64.tar.gz @@ -49,28 +46,29 @@ urlretrieve("https://wonderful.asie.pl/bootstrap/wf-bootstrap-x86_64.tar.gz", "wf-bootstrap-x86_64.tar.gz") #following the tutorial here: - os.system('mkdir /opt/wonderful') - os.system('chown -R $USER:$USER /opt/wonderful') - os.system('cd /opt/wonderful/') - os.system('tar xzvf '+cwd+'/wf-bootstrap-x86_64.tar.gz -C /opt/wonderful') + run('mkdir /opt/wonderful') + run('chown -R $USER:$USER /opt/wonderful') + run('cd /opt/wonderful/') + run('tar xzvf '+cwd+'/wf-bootstrap-x86_64.tar.gz -C /opt/wonderful') os.environ["PATH"] = "/opt/wonderful/bin:" + os.environ["PATH"] os.environ["WONDERFUL_TOOLCHAIN"] = "/opt/wonderful" - os.system('cd /opt/wonderful/bin') - os.system('wf-pacman -Syu --noconfirm') + run('cd /opt/wonderful/bin') + run('wf-pacman -Syu --noconfirm') + run('wf-pacman -S toolchain-gcc-arm-none-eabi --noconfirm') print('finished installing Wonderful Toolchain\n beginning BlocksDS install') # THIS WILL RUN ON ALL PLATFORMS - os.system('wf-pacman -Syu wf-tools --noconfirm') - os.system('wf-config repo enable blocksds --noconfirm') - os.system('wf-pacman -Syu --noconfirm') - os.system('wf-pacman -S blocksds-toolchain') + run('wf-pacman -Syu wf-tools --noconfirm') + run('wf-config repo enable blocksds --noconfirm') + run('wf-pacman -Syu --noconfirm') + run('wf-pacman -S blocksds-toolchain') # this will install docs as well V if (args.minimal==False): - os.system('wf-pacman -S blocksds-docs') - os.system('wf-pacman -S toolchain-llvm-teak-llvm') - os.system('wf-pacman -S blocksds-nflib blocksds-nitroengine') - os.system('ln -s /opt/wonderful/thirdparty/blocksds /opt/blocksds') + run('wf-pacman -S blocksds-docs') + run('wf-pacman -S toolchain-llvm-teak-llvm') + run('wf-pacman -S blocksds-nflib blocksds-nitroengine') + run('ln -s /opt/wonderful/thirdparty/blocksds /opt/blocksds') @@ -84,17 +82,16 @@ if (is_portable==True): if (platform.system() == "Linux"): #build to "portable file" called portable.blocks - - os.system('mkdir portable.blocks') - os.system('cd portable.blocks') + run("mkdir portable.blocks") + run("cd portable.blocks") if os.path.exists("/opt/wonderful"): - os.system('cp -r /opt/wonderful '+cwd+'/portable.blocks') + run('cp -r /opt/wonderful '+cwd+'/portable.blocks') print("finished portable Wonderful Toolchain packing\nmoving on to Blocks...") else: print("building a portable copy requires having wf-pacman installed please install it by running this program without the '--portable' flag") exit() #build blocks to dir - os.system('BLOCKSDS=$PWD make INSTALLDIR=portable.blocks -j`nproc`') + run('BLOCKSDS=$PWD make INSTALLDIR=portable.blocks -j`nproc`') print("\nDone!\n") From 6c8207f5c146f28df1feb28f3d60005220d4037b Mon Sep 17 00:00:00 2001 From: W3SLAV <49104904+W3SLAV@users.noreply.github.com> Date: Wed, 13 Aug 2025 18:16:01 -0500 Subject: [PATCH 08/12] Removed redundant bit again (forgot to remove from latest push) --- tools/Orca.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/Orca.py b/tools/Orca.py index 172cb6a7..48a100ca 100644 --- a/tools/Orca.py +++ b/tools/Orca.py @@ -54,7 +54,6 @@ def run(cmd): os.environ["WONDERFUL_TOOLCHAIN"] = "/opt/wonderful" run('cd /opt/wonderful/bin') run('wf-pacman -Syu --noconfirm') - run('wf-pacman -S toolchain-gcc-arm-none-eabi --noconfirm') print('finished installing Wonderful Toolchain\n beginning BlocksDS install') From fdf9ab58f2d7fd6cb19f0cca51678554430409df Mon Sep 17 00:00:00 2001 From: W3SLAV <49104904+W3SLAV@users.noreply.github.com> Date: Thu, 14 Aug 2025 19:03:53 -0500 Subject: [PATCH 09/12] Update Orca.py --- tools/Orca.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/tools/Orca.py b/tools/Orca.py index 48a100ca..b665a9d5 100644 --- a/tools/Orca.py +++ b/tools/Orca.py @@ -34,11 +34,23 @@ def run(cmd): if (platform.system() == "Windows"): env = os.environ if "MSYSTEM" not in os.environ: - print("Not running inside MSYS2. Please Use MSYS2") - exit() - pacman_path = shutil.which("wf-pacman") - if not pacman_path: - exit() + print("Not running inside MSYS2. Installing MSYS2 + WF-PACMAN + BLOCKS") + + #this will need a good way to be set to latest always VV + urlretrieve("https://github.com/msys2/msys2-installer/releases/download/2025-06-22/msys2-x86_64-20250622.exe", "msys2_installer.exe") + #silent install based on: https://silentinstallhq.com/msys2-silent-install-how-to-guide/ + run("msys2_installer.exe install --root C:\MSYS2 --confirm-command") + + #install wf-pacman + urlretrieve("https://wonderful.asie.pl/bootstrap/wf-bootstrap-windows-x86_64.exe", "wf-installer.exe") + run("wf-installer.exe /VERYSILENT /NORESTART") + + + else: + pacman_path = shutil.which("wf-pacman") + if not pacman_path: + urlretrieve("https://wonderful.asie.pl/bootstrap/wf-bootstrap-windows-x86_64.exe", "wf-installer.exe") + run("wf-installer.exe /VERYSILENT /NORESTART") if (is_portable==False): #pull from https://wonderful.asie.pl/bootstrap/wf-bootstrap-x86_64.tar.gz @@ -54,6 +66,7 @@ def run(cmd): os.environ["WONDERFUL_TOOLCHAIN"] = "/opt/wonderful" run('cd /opt/wonderful/bin') run('wf-pacman -Syu --noconfirm') + run('wf-pacman -S toolchain-gcc-arm-none-eabi --noconfirm') print('finished installing Wonderful Toolchain\n beginning BlocksDS install') From d361cef802bd34a9396a15bcdae9dcf269262e5b Mon Sep 17 00:00:00 2001 From: W3SLAV <49104904+W3SLAV@users.noreply.github.com> Date: Thu, 14 Aug 2025 19:09:36 -0500 Subject: [PATCH 10/12] Added Script to Compile Installer for Windows --- Compile_Installer.bat | 1 + 1 file changed, 1 insertion(+) create mode 100644 Compile_Installer.bat diff --git a/Compile_Installer.bat b/Compile_Installer.bat new file mode 100644 index 00000000..f09cefdc --- /dev/null +++ b/Compile_Installer.bat @@ -0,0 +1 @@ +pyinstaller --onefile --noconsole .\tools\Orca.py From 5e10b80820813704b479247caac920b87416824f Mon Sep 17 00:00:00 2001 From: W3SLAV <49104904+W3SLAV@users.noreply.github.com> Date: Thu, 14 Aug 2025 19:18:14 -0500 Subject: [PATCH 11/12] Add completely automated install --- tools/Orca.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/Orca.py b/tools/Orca.py index b665a9d5..b52f5cf5 100644 --- a/tools/Orca.py +++ b/tools/Orca.py @@ -8,10 +8,17 @@ #urllib is only for downloading Wonderful Toolchain builds from urllib.request import urlretrieve + +#add MSYS command mode check +MSYS_MODE = False + #error checking cwd = os.getcwd() def run(cmd): - subprocess.run(cmd, shell=True, check=True) + if (MYS_MODE==True): + subprocess.run("C:\msys64\usr\bin\bash.exe -lc "+cmd, shell=True, check=True) + else: + subprocess.run(cmd, shell=True, check=True) parser = argparse.ArgumentParser() parser.add_argument("--portable",action="store_true", help="build in portable mode (LINUX)") @@ -45,6 +52,7 @@ def run(cmd): urlretrieve("https://wonderful.asie.pl/bootstrap/wf-bootstrap-windows-x86_64.exe", "wf-installer.exe") run("wf-installer.exe /VERYSILENT /NORESTART") + MSYS_MODE = True else: pacman_path = shutil.which("wf-pacman") @@ -52,6 +60,8 @@ def run(cmd): urlretrieve("https://wonderful.asie.pl/bootstrap/wf-bootstrap-windows-x86_64.exe", "wf-installer.exe") run("wf-installer.exe /VERYSILENT /NORESTART") + MSYS_MODE = True + if (is_portable==False): #pull from https://wonderful.asie.pl/bootstrap/wf-bootstrap-x86_64.tar.gz if (platform.system() == "Linux"): From 048131ba363ef1e0020cf014416ce5db9588af12 Mon Sep 17 00:00:00 2001 From: W3SLAV <49104904+W3SLAV@users.noreply.github.com> Date: Fri, 15 Aug 2025 11:33:51 -0500 Subject: [PATCH 12/12] Update Orca.py --- tools/Orca.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Orca.py b/tools/Orca.py index b52f5cf5..72221e5e 100644 --- a/tools/Orca.py +++ b/tools/Orca.py @@ -76,7 +76,7 @@ def run(cmd): os.environ["WONDERFUL_TOOLCHAIN"] = "/opt/wonderful" run('cd /opt/wonderful/bin') run('wf-pacman -Syu --noconfirm') - run('wf-pacman -S toolchain-gcc-arm-none-eabi --noconfirm') + #run('wf-pacman -S toolchain-gcc-arm-none-eabi --noconfirm') print('finished installing Wonderful Toolchain\n beginning BlocksDS install')