Changeset 186 for trunk/bootcode/airboot.asm

Timestamp:

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

Author:

Ben Rietbroek

Message:

Improved language selection [v1.1.1-testing]

The old method copied the language specific files to a central location
before starting the build. This is a bit annoying when using version
control because the copied files get marked as changed, blurring the
current state of the work directory. Also, the specific language files
from the last build are always the active ones.

The new method conditionally includes the specific language files based
upon the BLD_LANG definition, which is passed on the cli. No more file
copying for specific language builds.

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/airboot.asm (modified) (5 diffs)

trunk/bootcode/airboot.asm

@@ -29 +29 @@
 
 ;
+; This one should never be undefined, but if so, then default to English.
+;
+IFNDEF  BLD_LANG
+BLD_LANG    EQU     en
+ENDIF
+
+;
 ; Include AiR-BOOT Version Information.
 ; This version-info is defined using simpel EQU's so it can serve as a
@@ -48 +55 @@
 include ../include/asm.inc
 
+;
+; The BLD_LANG is passed as an unquoted string so it can be used with
+; the 'include' directive. But for other language conditional actions a quoted
+; version is needed. This macro creates BLD_LANG_TXT holding the language
+; in single quotes.
+;
+enquote BLD_LANG,%BLD_LANG
 
 ; We actually don't want to use this directive because it generates extra
@@ -101 +115 @@
 ; different from being 'slash-dotted' ... ;)
 ;
-IF  BLD_LANG EQ 'en'
+IF  BLD_LANG_TXT EQ 'en'
 IFNDEF  AUX_DEBUG
 FX_ENABLED      EQU
@@ -884 +898 @@
 
 ;------------------------------------------------------------------------------
-include text/txtmbr.asm                        ; All translateable Text in MBR
+include_from text/%BLD_LANG,mbr.asm            ; All translateable Text in MBR
 ;------------------------------------------------------------------------------
 
@@ -1738 +1752 @@
 
 b_txtother:
-include text/txtother.asm       ; All translateable Text-Strings
+include_from text/%BLD_LANG,other.asm   ; All translateable Text-Strings
 size_txtother = $-b_txtother
 
 b_txtmenus:
-include text/txtmenus.asm       ; All translateable Menu-text
+include_from text/%BLD_LANG,menus.asm   ; All translateable Menu-text
 size_txtmenus = $-b_txtmenus