Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix uvision collapse error #23

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions records/tools/uvision.uvproj.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@
</BeforeMake>
<AfterMake>
<RunUserProg1>1</RunUserProg1>
<RunUserProg2>1</RunUserProg2>
<UserProg1Name>..\..\..\scripts\post_build.bat "#KARM\ARMCC\bin\fromelf --bin [email protected] -o $L@L" "#KARM\ARMCC\bin\fromelf --text -s [email protected] -o $L@L\symbols" "#KARM\ARMCC\bin\armar --create $L@L\@L.ar $L*.o"</UserProg1Name>
<UserProg2Name>python ..\..\..\scripts\generate_blobs.py $L@L</UserProg2Name>
<RunUserProg2>0</RunUserProg2>
<UserProg1Name>..\..\..\scripts\post_build.bat $KARM $L @L</UserProg1Name>
<UserProg2Name></UserProg2Name>
<UserProg1Dos16Mode>0</UserProg1Dos16Mode>
<UserProg2Dos16Mode>0</UserProg2Dos16Mode>
</AfterMake>
Expand Down
17 changes: 11 additions & 6 deletions scripts/post_build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,14 @@
:: 2 user commands are not enough so this allows passing the control string
::

::echo %1
::echo %2
::echo %3
cmd /c %1
cmd /c %2
cmd /c %3
set KEIL_ARM=%1
REM make sure fromelf is part of path
set path=%KEIL_ARM%\ARMCC\bin;%path%
set base_path=%2
set trgt_name=%3
set base_name=%base_path%%trgt_name%
fromelf --bin %base_name%.axf -o %base_name%
fromelf --text -s %base_name%.axf -o %base_name%\symbols
armar --create %base_name%\%trgt_name%.ar %base_path%*.o
set SCRIPTS=..\..\..\scripts
python %SCRIPTS%\generate_blobs.py %base_name%