Commit d57da497 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix ToolOptions to detect old versions of objasm properly

Detail:
  ToolOptions/APCS-32,feb - Apart from checking the 'objasm -h' return code, the script now also does a grep of the output to look for 'Target cpu not recognised' errors, since those don't seem to cause a non-zero return code to be set
Admin:
  Fixes wrong options being used with objasm 3.32.
  I haven't actually tested a full build yet, but I'm guessing it'll work now.


Version 1.49. Tagged as 'Library-1_49'
parent a366d7f5
...@@ -31,8 +31,13 @@ if "<Machine>"="ARM11ZF" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit/fpe3 -c ...@@ -31,8 +31,13 @@ if "<Machine>"="ARM11ZF" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit/fpe3 -c
if "<Machine>"="CortexA8" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit/fpe3 -cpu Cortex-A8 %%*0 if "<Machine>"="CortexA8" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit/fpe3 -cpu Cortex-A8 %%*0
if "<Machine>"="CortexA9" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit/fpe3 -cpu Cortex-A9 %%*0 if "<Machine>"="CortexA9" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit/fpe3 -cpu Cortex-A9 %%*0
| Fall back to -cpu 5TEJ for older versions of objasm | Fall back to -cpu 5TEJ for older versions of objasm
objasm -h { > null: } objasm -h { > <Wimp$ScrapDir>.ToolOptions }
| 1 will be returned for unrecognised parameters, e.g. -fpu
if "<Sys$ReturnCode>"="1" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit -cpu 5TEJ %%*0 if "<Sys$ReturnCode>"="1" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit -cpu 5TEJ %%*0
| 0 will be returned for unrecognised -cpu options, so check any warning output
grep -F "Target cpu not recognised" <Wimp$ScrapDir>.ToolOptions { > null: }
if "<Sys$ReturnCode>"="0" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit -cpu 5TEJ %%*0
remove <Wimp$ScrapDir>.ToolOptions
Set Alias$CMHG %%CMHG -32bit %%*0 Set Alias$CMHG %%CMHG -32bit %%*0
Set Alias$ResGen %%ResGen -32bit %%*0 Set Alias$ResGen %%ResGen -32bit %%*0
Set Alias$DefMod %%DefMod.!Run -32bit %%*0 Set Alias$DefMod %%DefMod.!Run -32bit %%*0
......
/* (1.48) /* (1.49)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1. * Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 1.48 #define Module_MajorVersion_CMHG 1.49
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 12 Sep 2011 #define Module_Date_CMHG 14 Sep 2011
#define Module_MajorVersion "1.48" #define Module_MajorVersion "1.49"
#define Module_Version 148 #define Module_Version 149
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "12 Sep 2011" #define Module_Date "14 Sep 2011"
#define Module_ApplicationDate "12-Sep-11" #define Module_ApplicationDate "14-Sep-11"
#define Module_ComponentName "Library" #define Module_ComponentName "Library"
#define Module_ComponentPath "mixed/RiscOS/Library" #define Module_ComponentPath "mixed/RiscOS/Library"
#define Module_FullVersion "1.48" #define Module_FullVersion "1.49"
#define Module_HelpVersion "1.48 (12 Sep 2011)" #define Module_HelpVersion "1.49 (14 Sep 2011)"
#define Module_LibraryVersionInfo "1:48" #define Module_LibraryVersionInfo "1:49"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment