Changeset 180

Timestamp:

Nov 7, 2017, 7:12:43 AM (8 years ago)

Author:

Ben Rietbroek

Message:

Fixed 'echo' quirk when building under Linux [v1.1.1-testing]

When building on 64-bit Linux with 32-bit Open Watcom,
the '-e' flag to enable ANSI escape sequences for 'echo' is not
interpreted anymore by WMake. Instead, it is passed verbatim together
with the string to echo. Maybe WMake now uses an internal version of
'echo' which does not understand '-e'.
Anyway, feeding it all to 'bash' solves the issue.

CAUTION:
This is a testbuild !
AirBoot uses the BIOS to access disks and a small coding error can trash
partition tables or other vital disk structures. You are advised to make
backups of TRACK0 and EBRs before using this testbuild. More info at:
​https://rousseaux.github.io/netlabs.air-boot/pdf/AirBoot-v1.1.0-manual.pdf

File:

• trunk/bootcode/Makefile (modified) (1 diff)

trunk/bootcode/Makefile

@@ -305 +305 @@
 # by the $(BLD_LANGUAGES) target.
 !ifdef __LINUX__
-        @echo -e "include text/$(%BLD_LANG)/mbr.asm\r">   text$(DS)txtmbr.asm
-        @echo -e "include text/$(%BLD_LANG)/menus.asm\r"> text$(DS)txtmenus.asm
-        @echo -e "include text/$(%BLD_LANG)/other.asm\r"> text$(DS)txtother.asm
+        @bash -c 'echo -e "include text/$(%BLD_LANG)/mbr.asm\r">   text$(DS)txtmbr.asm'
+        @bash -c 'echo -e "include text/$(%BLD_LANG)/menus.asm\r"> text$(DS)txtmenus.asm'
+        @bash -c 'echo -e "include text/$(%BLD_LANG)/other.asm\r"> text$(DS)txtother.asm'
 !else
         @echo include text/$(%BLD_LANG)/mbr.asm>   text$(DS)txtmbr.asm