fbt: Fixed build for users with space in username (#1437)
Co-authored-by: あく <alleteam@gmail.com> Co-authored-by: hedger <hedger@users.noreply.github.com>
This commit is contained in:
parent
d085af31c3
commit
27b698f081
@ -97,7 +97,7 @@ if assetsenv["IS_BASE_FIRMWARE"]:
|
|||||||
"#/assets/resources/Manifest",
|
"#/assets/resources/Manifest",
|
||||||
assetsenv.GlobRecursive("*", "resources", exclude="Manifest"),
|
assetsenv.GlobRecursive("*", "resources", exclude="Manifest"),
|
||||||
action=Action(
|
action=Action(
|
||||||
'${PYTHON3} ${ASSETS_COMPILER} manifest "${TARGET.dir.posix}"',
|
'${PYTHON3} "${ASSETS_COMPILER}" manifest "${TARGET.dir.posix}"',
|
||||||
"${RESMANIFESTCOMSTR}",
|
"${RESMANIFESTCOMSTR}",
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
4
fbt.cmd
4
fbt.cmd
@ -1,5 +1,5 @@
|
|||||||
@echo off
|
@echo off
|
||||||
call %~dp0scripts\toolchain\fbtenv.cmd env
|
call "%~dp0scripts\toolchain\fbtenv.cmd" env
|
||||||
|
|
||||||
set SCONS_EP=%~dp0\lib\scons\scripts\scons.py
|
set SCONS_EP=%~dp0\lib\scons\scripts\scons.py
|
||||||
|
|
||||||
@ -14,4 +14,4 @@ if [%FBT_NO_SYNC%] == [] (
|
|||||||
git submodule update --init
|
git submodule update --init
|
||||||
|
|
||||||
set "SCONS_DEFAULT_FLAGS=-Q --warn=target-not-built"
|
set "SCONS_DEFAULT_FLAGS=-Q --warn=target-not-built"
|
||||||
python lib\scons\scripts\scons.py %SCONS_DEFAULT_FLAGS% %*
|
python lib\scons\scripts\scons.py %SCONS_DEFAULT_FLAGS% %*
|
||||||
|
@ -18,14 +18,14 @@ set "FBT_TOOLCHAIN_ROOT=%FBT_ROOT%\toolchain\i686-windows"
|
|||||||
|
|
||||||
|
|
||||||
if not exist "%FBT_TOOLCHAIN_ROOT%" (
|
if not exist "%FBT_TOOLCHAIN_ROOT%" (
|
||||||
powershell -ExecutionPolicy Bypass -File %FBT_ROOT%\scripts\toolchain\windows-toolchain-download.ps1 "%flipper_toolchain_version%"
|
powershell -ExecutionPolicy Bypass -File "%FBT_ROOT%\scripts\toolchain\windows-toolchain-download.ps1" "%flipper_toolchain_version%"
|
||||||
)
|
)
|
||||||
if not exist "%FBT_TOOLCHAIN_ROOT%\VERSION" (
|
if not exist "%FBT_TOOLCHAIN_ROOT%\VERSION" (
|
||||||
powershell -ExecutionPolicy Bypass -File %FBT_ROOT%\scripts\toolchain\windows-toolchain-download.ps1 "%flipper_toolchain_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
|
set /p REAL_TOOLCHAIN_VERSION=<"%FBT_TOOLCHAIN_ROOT%\VERSION"
|
||||||
if not "%REAL_TOOLCHAIN_VERSION%" == "%FLIPPER_TOOLCHAIN_VERSION%" (
|
if not "%REAL_TOOLCHAIN_VERSION%" == "%FLIPPER_TOOLCHAIN_VERSION%" (
|
||||||
powershell -ExecutionPolicy Bypass -File %FBT_ROOT%\scripts\toolchain\windows-toolchain-download.ps1 "%flipper_toolchain_version%"
|
powershell -ExecutionPolicy Bypass -File "%FBT_ROOT%\scripts\toolchain\windows-toolchain-download.ps1" "%flipper_toolchain_version%"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -40,6 +40,6 @@ if not "%1" == "env" (
|
|||||||
echo *********************************
|
echo *********************************
|
||||||
echo * fbt build environment *
|
echo * fbt build environment *
|
||||||
echo *********************************
|
echo *********************************
|
||||||
cd %FBT_ROOT%
|
cd "%FBT_ROOT%"
|
||||||
cmd /k
|
cmd /k
|
||||||
)
|
)
|
||||||
|
@ -109,14 +109,14 @@ def generate(env):
|
|||||||
BUILDERS={
|
BUILDERS={
|
||||||
"IconBuilder": Builder(
|
"IconBuilder": Builder(
|
||||||
action=Action(
|
action=Action(
|
||||||
"${PYTHON3} ${ASSETS_COMPILER} icons ${SOURCE.posix} ${TARGET.dir.posix}",
|
'${PYTHON3} "${ASSETS_COMPILER}" icons ${SOURCE.posix} ${TARGET.dir.posix}',
|
||||||
"${ICONSCOMSTR}",
|
"${ICONSCOMSTR}",
|
||||||
),
|
),
|
||||||
emitter=icons_emitter,
|
emitter=icons_emitter,
|
||||||
),
|
),
|
||||||
"ProtoBuilder": Builder(
|
"ProtoBuilder": Builder(
|
||||||
action=Action(
|
action=Action(
|
||||||
"${PYTHON3} ${NANOPB_COMPILER} -q -I${SOURCE.dir.posix} -D${TARGET.dir.posix} ${SOURCES.posix}",
|
'${PYTHON3} "${NANOPB_COMPILER}" -q -I${SOURCE.dir.posix} -D${TARGET.dir.posix} ${SOURCES.posix}',
|
||||||
"${PROTOCOMSTR}",
|
"${PROTOCOMSTR}",
|
||||||
),
|
),
|
||||||
emitter=proto_emitter,
|
emitter=proto_emitter,
|
||||||
@ -125,14 +125,14 @@ def generate(env):
|
|||||||
),
|
),
|
||||||
"DolphinSymBuilder": Builder(
|
"DolphinSymBuilder": Builder(
|
||||||
action=Action(
|
action=Action(
|
||||||
'${PYTHON3} ${ASSETS_COMPILER} dolphin -s dolphin_${DOLPHIN_RES_TYPE} "${SOURCE}" "${_DOLPHIN_OUT_DIR}"',
|
'${PYTHON3} "${ASSETS_COMPILER}" dolphin -s dolphin_${DOLPHIN_RES_TYPE} "${SOURCE}" "${_DOLPHIN_OUT_DIR}"',
|
||||||
"${DOLPHINCOMSTR}",
|
"${DOLPHINCOMSTR}",
|
||||||
),
|
),
|
||||||
emitter=dolphin_emitter,
|
emitter=dolphin_emitter,
|
||||||
),
|
),
|
||||||
"DolphinExtBuilder": Builder(
|
"DolphinExtBuilder": Builder(
|
||||||
action=Action(
|
action=Action(
|
||||||
'${PYTHON3} ${ASSETS_COMPILER} dolphin "${SOURCE}" "${_DOLPHIN_OUT_DIR}"',
|
'${PYTHON3} "${ASSETS_COMPILER}" dolphin "${SOURCE}" "${_DOLPHIN_OUT_DIR}"',
|
||||||
"${DOLPHINCOMSTR}",
|
"${DOLPHINCOMSTR}",
|
||||||
),
|
),
|
||||||
emitter=dolphin_emitter,
|
emitter=dolphin_emitter,
|
||||||
|
@ -74,7 +74,7 @@ def DistCommand(env, name, source, **kw):
|
|||||||
command = env.Command(
|
command = env.Command(
|
||||||
target,
|
target,
|
||||||
source,
|
source,
|
||||||
'@${PYTHON3} ${ROOT_DIR.abspath}/scripts/sconsdist.py copy -p ${DIST_PROJECTS} -s "${DIST_SUFFIX}" ${DIST_EXTRA}',
|
'@${PYTHON3} "${ROOT_DIR.abspath}/scripts/sconsdist.py" copy -p ${DIST_PROJECTS} -s "${DIST_SUFFIX}" ${DIST_EXTRA}',
|
||||||
**kw,
|
**kw,
|
||||||
)
|
)
|
||||||
env.Pseudo(target)
|
env.Pseudo(target)
|
||||||
@ -96,7 +96,7 @@ def generate(env):
|
|||||||
"UsbInstall": Builder(
|
"UsbInstall": Builder(
|
||||||
action=[
|
action=[
|
||||||
Action(
|
Action(
|
||||||
"${PYTHON3} ${ROOT_DIR.abspath}/scripts/selfupdate.py dist/${DIST_DIR}/f${TARGET_HW}-update-${DIST_SUFFIX}/update.fuf"
|
'${PYTHON3} "${ROOT_DIR.abspath}/scripts/selfupdate.py" dist/${DIST_DIR}/f${TARGET_HW}-update-${DIST_SUFFIX}/update.fuf'
|
||||||
),
|
),
|
||||||
Touch("${TARGET}"),
|
Touch("${TARGET}"),
|
||||||
]
|
]
|
||||||
@ -105,7 +105,7 @@ def generate(env):
|
|||||||
action=Action(
|
action=Action(
|
||||||
[
|
[
|
||||||
Mkdir("$TARGET"),
|
Mkdir("$TARGET"),
|
||||||
"${PYTHON3} ${ROOT_DIR.abspath}/scripts/assets.py "
|
'${PYTHON3} "${ROOT_DIR.abspath}/scripts/assets.py" '
|
||||||
"copro ${COPRO_CUBE_DIR} "
|
"copro ${COPRO_CUBE_DIR} "
|
||||||
"${TARGET} ${COPRO_MCU_FAMILY} "
|
"${TARGET} ${COPRO_MCU_FAMILY} "
|
||||||
"--cube_ver=${COPRO_CUBE_VERSION} "
|
"--cube_ver=${COPRO_CUBE_VERSION} "
|
||||||
|
@ -16,7 +16,7 @@ def generate(env):
|
|||||||
BUILDERS={
|
BUILDERS={
|
||||||
"VersionBuilder": Builder(
|
"VersionBuilder": Builder(
|
||||||
action=Action(
|
action=Action(
|
||||||
"${PYTHON3} ${ROOT_DIR.abspath}/scripts/version.py generate -t ${TARGET_HW} -o ${TARGET.dir.posix} --dir ${ROOT_DIR}",
|
'${PYTHON3} "${ROOT_DIR.abspath}/scripts/version.py" generate -t ${TARGET_HW} -o ${TARGET.dir.posix} --dir "${ROOT_DIR}"',
|
||||||
"${VERSIONCOMSTR}",
|
"${VERSIONCOMSTR}",
|
||||||
),
|
),
|
||||||
emitter=version_emitter,
|
emitter=version_emitter,
|
||||||
|
@ -30,7 +30,7 @@ def generate(env):
|
|||||||
),
|
),
|
||||||
"DFUBuilder": Builder(
|
"DFUBuilder": Builder(
|
||||||
action=Action(
|
action=Action(
|
||||||
'${PYTHON3} ${BIN2DFU} -i "${SOURCE}" -o "${TARGET}" -a ${IMAGE_BASE_ADDRESS} -l "Flipper Zero F${TARGET_HW}"',
|
'${PYTHON3} "${BIN2DFU}" -i "${SOURCE}" -o "${TARGET}" -a ${IMAGE_BASE_ADDRESS} -l "Flipper Zero F${TARGET_HW}"',
|
||||||
"${DFUCOMSTR}",
|
"${DFUCOMSTR}",
|
||||||
),
|
),
|
||||||
suffix=".dfu",
|
suffix=".dfu",
|
||||||
|
Loading…
Reference in New Issue
Block a user