Drunkbatya/python3 wrapper

.gitattributes

@@ -1 +1,4 @@
 * text=auto eol=lf
+*.bat eol=crlf
+*.ps1 eol=crlf
+*.cmd eol=crlf

.gitignore

@@ -46,4 +46,5 @@ dist
 build/
 
 # Toolchain
-toolchain*/
+/toolchain
+

SConstruct

@@ -8,6 +8,8 @@
 
 import os
 
+EnsurePythonVersion(3, 8)
+
 DefaultEnvironment(tools=[])
 # Progress(["OwO\r", "owo\r", "uwu\r", "owo\r"], interval=15)
 

applications/about/about.c

@@ -206,4 +206,4 @@ int32_t about_settings_app(void* p) {
     furi_record_close("gui");
 
     return 0;
-}
+}

applications/extapps.scons

@@ -3,7 +3,6 @@ Import("ENV")
 
 from fbt.appmanifest import FlipperAppType
 
-
 appenv = ENV.Clone(tools=["fbt_extapps"])
 
 appenv.Replace(

fbt

@@ -1,18 +1,22 @@
-#!/bin/bash
+#!/bin/sh
 
-set -e
+# shellcheck disable=SC2086 source=/dev/null
+# unofficial strict mode
+set -eu;
 
-SCRIPTDIR="$( dirname -- "$0"; )";
-SCONS_EP=${SCRIPTDIR}/lib/scons/scripts/scons.py
+SCONS_DEFAULT_FLAGS="-Q --warn=target-not-built";
+SCRIPT_PATH="$(cd "$(dirname "$0")" && pwd -P)";
 
-if [[ -z "${FBT_NO_SYNC:-}" ]] ; then
-    if [[ -d .git ]]; then
-        git submodule update --init
-    else
-        echo Not in a git repo, please clone with git clone --recursive
-        exit 1
+if [ -z "${FBT_NOENV:-}" ]; then
+    . "$SCRIPT_PATH/scripts/toolchain/fbtenv.sh";
+fi
+
+if [ -z "${FBT_NO_SYNC:-}" ]; then
+    if [ ! -d "$SCRIPT_PATH/.git" ]; then
+        echo "\".git\" directory not found, please clone repo via \"git clone --recursive\"";
+        exit 1;
     fi
+    git submodule update --init;
 fi
 
-SCONS_DEFAULT_FLAGS="-Q --warn=target-not-built"
-python3 ${SCONS_EP} ${SCONS_DEFAULT_FLAGS} "$@"
+python3 "$SCRIPT_PATH/lib/scons/scripts/scons.py" $SCONS_DEFAULT_FLAGS "$@"

fbt.cmd

@@ -1,15 +1,17 @@
 @echo off
+call %~dp0scripts\toolchain\fbtenv.cmd env
 
 set SCONS_EP=%~dp0\lib\scons\scripts\scons.py
 
 if [%FBT_NO_SYNC%] == [] (
-	if exist ".git" (
-		git submodule update --init
-	) else (
-		echo Not in a git repo, please clone with git clone --recursive
-		exit /b 1
-	)
+    if exist ".git" (
+        git submodule update --init
+    ) else (
+        echo Not in a git repo, please clone with git clone --recursive
+        exit /b 1
+    )
 )
+git submodule update --init
 
 set "SCONS_DEFAULT_FLAGS=-Q --warn=target-not-built"
-python %SCONS_EP% %SCONS_DEFAULT_FLAGS% %*
+python lib\scons\scripts\scons.py %SCONS_DEFAULT_FLAGS% %*

fbt_options.py

@@ -10,8 +10,8 @@
 ## Optimize for debugging experience
 DEBUG = 1
 
-# Suffix to add to files when building distribution.
-# If OS environment has DIST_SUFFIX set, it will be used instead..
+# Suffix to add to files when building distribution
+# If OS environment has DIST_SUFFIX set, it will be used instead
 DIST_SUFFIX = "local"
 
 # Coprocessor firmware
@@ -27,7 +27,7 @@
 # Firmware also supports "ble_full", but it might not fit into debug builds
 COPRO_STACK_TYPE = "ble_light"
 
-# Leave 0 to lets scripts automatically calculate it
+# Leave 0 to let scripts automatically calculate it
 COPRO_STACK_ADDR = "0x0"
 
 # If you override COPRO_CUBE_DIR on commandline, override this aswell
@@ -56,7 +56,7 @@
 
 SVD_FILE = "debug/STM32WB55_CM4.svd"
 
-# Look for blackmagic probe on serial ports
+# Look for blackmagic probe on serial ports and local network
 BLACKMAGIC = "auto"
 
 FIRMWARE_APPS = {

firmware.scons

@@ -207,19 +207,20 @@ def link_elf_dir_as_latest(env, elf_target):
     # Ugly way to check if updater-related targets were requested
     elf_dir = elf_target.Dir(".")
     explicitly_building_updater = False
-    # print("BUILD_TARGETS:", ','.join(BUILD_TARGETS))
+    # print("BUILD_TARGETS:", ",".join(BUILD_TARGETS))
     for build_target in BUILD_TARGETS:
         # print(">>> ", str(build_target))
         if "updater" in str(build_target):
             explicitly_building_updater = True
 
     latest_dir = env.Dir("#build/latest")
 
-    link_this_dir = True
-    if explicitly_building_updater:
-        # If updater is explicitly requested, link to the latest updater
-        # Otherwise, link to the latest firmware
-        link_this_dir = not env["IS_BASE_FIRMWARE"]
+    is_updater = not env["IS_BASE_FIRMWARE"]
+    # If updater is explicitly requested, link to the latest updater
+    # Otherwise, link to the latest firmware
+    link_this_dir = (is_updater and explicitly_building_updater) or (
+        not is_updater and not explicitly_building_updater
+    )
 
     if link_this_dir:
         print(f"Setting {elf_dir} as latest built dir")
@@ -261,7 +262,7 @@ artifacts = [
     fwhex,
     fwbin,
     fwdfu,
-    env["FW_VERSION_JSON"],
+    fwenv["FW_VERSION_JSON"],
     fwcdb,
 ]
 fwenv["FW_ARTIFACTS"] = artifacts

scripts/toolchain/fbtenv.cmd

@@ -0,0 +1,45 @@
+@echo off
+
+if not [%FBT_ROOT%] == [] (
+    goto already_set
+)
+
+set "FBT_ROOT=%~dp0\..\..\"
+pushd %FBT_ROOT%
+set "FBT_ROOT=%cd%"
+popd
+
+if not [%FBT_NOENV%] == [] (
+    exit /b 0
+)
+
+set "FLIPPER_TOOLCHAIN_VERSION=2"
+set "FBT_TOOLCHAIN_ROOT=%FBT_ROOT%\toolchain\i686-windows"
+
+
+if not exist "%FBT_TOOLCHAIN_ROOT%" (
+    powershell -ExecutionPolicy Bypass -File %FBT_ROOT%\scripts\toolchain\windows-toolchain-download.ps1 "%flipper_toolchain_version%"
+)
+if not exist "%FBT_TOOLCHAIN_ROOT%\VERSION" (
+    powershell -ExecutionPolicy Bypass -File %FBT_ROOT%\scripts\toolchain\windows-toolchain-download.ps1 "%flipper_toolchain_version%"
+)
+set /p REAL_TOOLCHAIN_VERSION=<%FBT_TOOLCHAIN_ROOT%\VERSION
+if not "%REAL_TOOLCHAIN_VERSION%" == "%FLIPPER_TOOLCHAIN_VERSION%" (
+    powershell -ExecutionPolicy Bypass -File %FBT_ROOT%\scripts\toolchain\windows-toolchain-download.ps1 "%flipper_toolchain_version%"
+)
+
+
+set "HOME=%USERPROFILE%"
+set "PYTHONHOME=%FBT_TOOLCHAIN_ROOT%\python"
+set "PATH=%FBT_TOOLCHAIN_ROOT%\python;%FBT_TOOLCHAIN_ROOT%\bin;%FBT_TOOLCHAIN_ROOT%\protoc\bin;%FBT_TOOLCHAIN_ROOT%\openocd\bin;%PATH%"
+set "PROMPT=(fbt) %PROMPT%"
+
+:already_set
+
+if not "%1" == "env" (
+    echo *********************************
+    echo *     fbt build environment     *
+    echo *********************************
+    cd %FBT_ROOT%
+    cmd /k
+)

scripts/toolchain/fbtenv.sh

@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# unofficial strict mode
+set -eu;
+
+FLIPPER_TOOLCHAIN_VERSION="2";
+
+get_kernel_type()
+{
+    SYS_TYPE="$(uname -s)"
+    if [ "$SYS_TYPE" = "Darwin" ]; then
+        TOOLCHAIN_PATH="toolchain/x86_64-darwin";
+    elif [ "$SYS_TYPE" = "Linux" ]; then
+        TOOLCHAIN_PATH="toolchain/x86_64-linux";
+    elif echo "$SYS_TYPE" | grep -q "MINGW"; then
+        echo "In MinGW shell use \"fbt.cmd\" instead of \"fbt\"";
+        exit 1;
+    else
+        echo "Your system is not supported. Sorry. Please report us your configuration.";
+        exit 1;
+    fi
+}
+
+check_download_toolchain()
+{
+    if [ ! -d "$SCRIPT_PATH/$TOOLCHAIN_PATH" ]; then
+        download_toolchain;
+    elif [ ! -f "$SCRIPT_PATH/$TOOLCHAIN_PATH/VERSION" ]; then
+        download_toolchain;
+    elif [ "$(cat "$SCRIPT_PATH/$TOOLCHAIN_PATH/VERSION")" -ne "$FLIPPER_TOOLCHAIN_VERSION" ]; then
+        download_toolchain;
+    fi
+}
+
+download_toolchain()
+{
+    chmod 755 "$SCRIPT_PATH/scripts/toolchain/unix-toolchain-download.sh";
+    "$SCRIPT_PATH/scripts/toolchain/unix-toolchain-download.sh" "$FLIPPER_TOOLCHAIN_VERSION" || exit 1;
+}
+
+main()
+{
+    if [ -z "${SCRIPT_PATH:-}" ]; then
+        echo "Mannual running this script is now allowed.";
+        exit 1;
+    fi
+    get_kernel_type;  # sets TOOLCHAIN_PATH
+    check_download_toolchain;
+    PATH="$SCRIPT_PATH/$TOOLCHAIN_PATH/python/bin:$PATH";
+    PATH="$SCRIPT_PATH/$TOOLCHAIN_PATH/bin:$PATH";
+    PATH="$SCRIPT_PATH/$TOOLCHAIN_PATH/protobuf/bin:$PATH";
+    PATH="$SCRIPT_PATH/$TOOLCHAIN_PATH/openocd/bin:$PATH";
+}
+main;