More working in ninja.
This commit is contained in:
@ -233,7 +233,7 @@ rule run
|
||||
command = $in >$out
|
||||
|
||||
rule cmd
|
||||
description = CMD
|
||||
description = CMD $out
|
||||
command = $cmd
|
||||
|
||||
rule resize
|
||||
@ -264,7 +264,7 @@ rule forth_test
|
||||
description = FORTH_TEST $test
|
||||
depfile = $out.d
|
||||
deps = gcc
|
||||
command = $src/tools/importation.py -i $test -o $out --depsout $depfile --no-out && $interp $forth $test >$out
|
||||
command = $src/tools/importation.py -i $test -o $out --depsout $depfile --no-out && $interp $forth $test 2>&1 | cat >$out
|
||||
|
||||
rule clean
|
||||
description = CLEAN
|
||||
|
||||
@ -16,7 +16,7 @@ OPTIONS = '-I $src/esp32'
|
||||
ESP32_FILES = []
|
||||
ESP32_ZIP_FILES = []
|
||||
|
||||
# Main .ino file.
|
||||
# Main files.
|
||||
ESP32_ZIP_FILES += [
|
||||
Importation('$dst/esp32/ESP32forth/README.txt',
|
||||
'$src/esp32/README.txt'),
|
||||
|
||||
@ -15,11 +15,12 @@
|
||||
PICO_ICE_FILES = []
|
||||
PICO_ICE_ZIP_FILES = []
|
||||
|
||||
# Main .ino file.
|
||||
# Main files.
|
||||
PICO_ICE_ZIP_FILES += [
|
||||
Importation('$dst/pico-ice/ueforth-pico-ice/README.txt',
|
||||
'$src/pico-ice/README.txt'),
|
||||
# TODO: .uf2
|
||||
Copy('$dst/pico-ice/ueforth-pico-ice/ueforth-pico-ice.uf2',
|
||||
'$dst/pico-ice/ueforth_pico_ice.uf2'),
|
||||
Copy('$dst/pico-ice/ueforth-pico-ice/LICENSE', '$src/LICENSE'),
|
||||
Copy('$dst/pico-ice/ueforth-pico-ice/pico-ice-sdk-LICENSE.md',
|
||||
'$src/pico-ice/pico-ice-sdk/LICENSE.md'),
|
||||
@ -27,6 +28,28 @@ PICO_ICE_ZIP_FILES += [
|
||||
'$src/pico-ice/pico-sdk/LICENSE.TXT'),
|
||||
]
|
||||
|
||||
# Build the uf2.
|
||||
Command(' '.join(['$dst/pico-ice/ueforth_pico_ice.uf2',
|
||||
'$dst/pico-ice/ueforth_pico_ice.err']),
|
||||
' '.join(['$dst/pico-ice/build.ninja',
|
||||
'$dst/gen/pico_ice_boot.h']),
|
||||
'ninja -C $dst/pico-ice ueforth_pico_ice 2>&1 | cat >$dst/pico-ice/ueforth_pico_ice.err')
|
||||
Command(' '.join(['$dst/pico-ice/build.ninja',
|
||||
'$dst/pico-ice/cmake.err']),
|
||||
' '.join(['$src/pico-ice/pico-sdk/README.md',
|
||||
'$src/pico-ice/pico-ice-sdk/README.md',
|
||||
'$src/pico-ice/pico-sdk/lib/tinyusb/README.rst']),
|
||||
'cmake $dst/pico-ice -G Ninja -S pico-ice -B $dst/pico-ice 2>&1 | cat >$dst/pico-ice/cmake.err')
|
||||
|
||||
# Check out submodules if needed.
|
||||
Command('$src/pico-ice/pico-sdk/README.md',
|
||||
'', 'git submodule update --init pico-ice/pico-sdk')
|
||||
Command('$src/pico-ice/pico-sdk/lib/tinyusb/README.rst',
|
||||
'$src/pico-ice/pico-sdk/README.md',
|
||||
'cd $src/pico-ice/pico-sdk && git submodule update --init lib/tinyusb')
|
||||
Command('pico-ice/pico-ice-sdk/README.md',
|
||||
'', 'git submodule update --init pico-ice/pico-ice-sdk')
|
||||
|
||||
# Zip it.
|
||||
PICO_ICE_FILES += [
|
||||
Zip('$dst/pico-ice/ueforth-pico-ice.zip', PICO_ICE_ZIP_FILES,
|
||||
|
||||
Reference in New Issue
Block a user