Updated Windows build script

Author: lupyuen

scripts/build-app.cmd

@@ -1,23 +1,33 @@
 ::  Windows script to build Rust application hosted on Mynewt OS
 
+::  TODO: STM32L4
+set mynewt_build_app=stm32l4_my_sensor
+set rust_build_target=thumbv7em-none-eabihf
+copy /y .vscode\launch-stm32l4.json .vscode\launch.json
+
+::  TODO: STM32 Blue Pill
+::  set mynewt_build_app=bluepill_my_sensor
+::  ser rust_build_target=%rust_build_target%
+::  copy /y .vscode\launch-bluepill.json .vscode\launch.json
+
 @echo "----- Building Rust app and Mynewt OS..."
 
 ::  Rust build profile: debug or release
-::  set rust_build_profile=debug
-set rust_build_profile=release
+set rust_build_profile=debug
+::  set rust_build_profile=release
 
 ::  Location of the compiled ROM image.  We will remove this to force relinking the Rust app with Mynewt OS.
-set app_build=%cd%\bin\targets\bluepill_my_sensor\app\apps\my_sensor_app\my_sensor_app.elf
+set app_build=%cd%\bin\targets\%mynewt_build_app%\app\apps\my_sensor_app\my_sensor_app.elf
 
 ::  Location of the compiled Rust app and external libraries.  The Rust compiler generates a *.rlib archive for the Rust app and each external Rust library here.
-set rust_build_dir=%cd%\target\thumbv7m-none-eabi\%rust_build_profile%\deps
+set rust_build_dir=%cd%\target\%rust_build_target%\%rust_build_profile%\deps
 
 ::  Location of the libs\rust_app stub library built by Mynewt.  We will replace this stub by the Rust app and external libraries.
-set rust_app_dir=%cd%\bin\targets\bluepill_my_sensor\app\libs\rust_app
+set rust_app_dir=%cd%\bin\targets\%mynewt_build_app%\app\libs\rust_app
 set rust_app_dest=%rust_app_dir%\libs_rust_app.a
 
 ::  Location of the libs\rust_libcore stub library built by Mynewt.  We will replace this stub by the Rust core library libcore.
-set rust_libcore_dir=%cd%\bin\targets\bluepill_my_sensor\app\libs\rust_libcore
+set rust_libcore_dir=%cd%\bin\targets\%mynewt_build_app%\app\libs\rust_libcore
 set rust_libcore_dest=%rust_libcore_dir%\libs_rust_libcore.a
 
 if %rust_build_profile%==release (
@@ -31,7 +41,7 @@ if %rust_build_profile%==release (
 ::  If this is the very first build, do the Mynewt build to generate the rust_app and rust_libcore stubs.  This build will not link successfully but it's OK.
 if not exist %rust_app_dest% (
     @echo "----- Build Mynewt stubs for Rust app and Rust libcore (ignore error)"
-    newt\newt.exe build bluepill_my_sensor
+    newt\newt.exe build %mynewt_build_app%
 )
 
 ::  Delete the compiled ROM image to force the Mynewt build to relink the Rust app with Mynewt OS.
@@ -101,7 +111,7 @@ popd
 ::  Copy Rust libcore to libs_rust_libcore.a, which is originally generated by libs\rust_libcore.
 @echo "----- Copy Rust libcore"
 ::  Get the Rust compiler sysroot e.g. C:\Users\guppy\.rustup\toolchains\nightly-x86_64-pc-windows-msvc
-for /f %%l in ('rustc --print sysroot --target thumbv7m-none-eabi') do set rust_sysroot=%%l
+for /f %%l in ('rustc --print sysroot --target %rust_build_target%') do set rust_sysroot=%%l
 ::  Copy libcore to the Mynewt build folder.
 if not exist %rust_libcore_dir% (
     mkdir %rust_libcore_dir%
@@ -113,24 +123,24 @@ if exist %rust_libcore_dest% (
 )
 ::  Get the Rust compiler sysroot e.g. C:\Users\guppy\.rustup\toolchains\nightly-x86_64-pc-windows-msvc\lib\rustlib\thumbv7m-none-eabi\lib\libcore-6ea1de1c8a090cbc.rlib
 ::  Overwrite our custom libs_rust_libcore.a to inject Rust libcore into the build.
-for %%f in (%rust_sysroot%\lib\rustlib\thumbv7m-none-eabi\lib\libcore-*.rlib) do copy %%f %rust_libcore_dest%
+for %%f in (%rust_sysroot%\lib\rustlib\%rust_build_target\lib\libcore-*.rlib) do copy %%f %rust_libcore_dest%
 if errorlevel 1 goto :EOF
 
 ::  Update the timestamp on libs_rust_libcore.a so that Mynewt build won't overwrite the Rust libcore we have copied.
 arm-none-eabi-ar s %rust_libcore_dest%
 if errorlevel 1 goto :EOF
 
 ::  Dump the ELF and disassembly for the compiled Rust application.
-arm-none-eabi-readelf -a --wide target\thumbv7m-none-eabi\%rust_build_profile%\libapp.rlib >logs\libapp.elf 2>&1
-arm-none-eabi-objdump -t -S            --line-numbers --wide target\thumbv7m-none-eabi\%rust_build_profile%\libapp.rlib >logs\libapp.S 2>&1
-arm-none-eabi-objdump -t -S --demangle --line-numbers --wide target\thumbv7m-none-eabi\%rust_build_profile%\libapp.rlib >logs\libapp-demangle.S 2>&1
+arm-none-eabi-readelf -a --wide target\%rust_build_target%\%rust_build_profile%\libapp.rlib >logs\libapp.elf 2>&1
+arm-none-eabi-objdump -t -S            --line-numbers --wide target\%rust_build_target%\%rust_build_profile%\libapp.rlib >logs\libapp.S 2>&1
+arm-none-eabi-objdump -t -S --demangle --line-numbers --wide target\%rust_build_target%\%rust_build_profile%\libapp.rlib >logs\libapp-demangle.S 2>&1
 
 ::  Run the Mynewt build, which will link with the Rust app, Rust libraries and libcore.
-::  For verbose build: newt build -v -p bluepill_my_sensor
+::  For verbose build: newt build -v -p %mynewt_build_app%
 @echo "----- Build and link Mynewt with Rust app"
-newt\newt.exe build bluepill_my_sensor
+newt\newt.exe build %mynewt_build_app%
 if errorlevel 1 goto :EOF
 
 ::  Display the image size.
-newt\newt.exe size -v bluepill_my_sensor
+newt\newt.exe size -v %mynewt_build_app%
 if errorlevel 1 goto :EOF