Changeset 186 for trunk/bootcode/Makefile

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/Makefile (modified) (3 diffs)

trunk/bootcode/Makefile

@@ -160 +160 @@
 # -Zd   = line number debug info
 # -Zi   = symbolic debug info
-ASM_FLAGS_D0=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -DBLD_LANG="'$(%BLD_LANG)'" $(%JWASM_DEFINES) -q -W0 -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
-ASM_FLAGS_D1=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -DBLD_LANG="'$(%BLD_LANG)'" $(%JWASM_DEFINES) -q -W4 -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
-ASM_FLAGS_D2=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -DBLD_LANG="'$(%BLD_LANG)'" $(%JWASM_DEFINES) -q -WX -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
+ASM_FLAGS_D0=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -DBLD_LANG="$(%BLD_LANG)" $(%JWASM_DEFINES) -q -W0 -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
+ASM_FLAGS_D1=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -DBLD_LANG="$(%BLD_LANG)" $(%JWASM_DEFINES) -q -W4 -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
+ASM_FLAGS_D2=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -DBLD_LANG="$(%BLD_LANG)" $(%JWASM_DEFINES) -q -WX -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
 # Workaround for JWasm list-file generation.
 # Generate the list-file on a local drive so JWasm doen't take forever.
@@ -289 +289 @@
 
 # -----------------------------------------------------------------------------
-# LANGUAGE SETUP
-# -----------------------------------------------------------------------------
-# Setup the relevant language files.
-# This is done by generating include-files for the specified language.
-# This is a 'pre-action' before assembling the AiR-BOOT.ASM source.
-# -----------------------------------------------------------------------------
-langsetup: .SYMBOLIC .MULTIPLE
-# Default to development language is none defined.
-!if "$(%BLD_LANG)"==""
-#~ %BLD_LANG=DEV_BLD_LANG
-!endif
-# Generate include-files for specified language.
-# After this, the Assembly sources are setup for the specified language.
-# Note that this target is not used as a 'dependency' but 'called' explicitly
-# by the $(BLD_LANGUAGES) target.
-!ifdef __LINUX__
-        @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
-        @echo include text/$(%BLD_LANG)/menus.asm> text$(DS)txtmenus.asm
-        @echo include text/$(%BLD_LANG)/other.asm> text$(DS)txtother.asm
-!endif
-
-
-# -----------------------------------------------------------------------------
 # BUILD ALL LANGUAGES
 # -----------------------------------------------------------------------------
@@ -328 +301 @@
         @%MAKE clean
         @%MAKE rmbin
-        @%MAKE langsetup
         @%MAKE $(TARGET)
 # Checking %AB_DEV does not work from target 'dev:' when non-recursively