Changeset 63 for trunk/tools


Ignore:
Timestamp:
Oct 9, 2016, 10:53:41 PM (9 years ago)
Author:
Ben Rietbroek
Message:

Updated Build Info and added File Commander Build Menus [v1.1.1-testing]

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

Changes:
o Updated Build Info
o Added simple File Commander Build Menus
o Removed tabs from non-recipe sections in Makefiles

Notes:
o RU version currently does not build due to lack of code-space

Will be resolved when FX-code is removed from build.

Location:
trunk/tools
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/tools/internal/GNUmakefile

    r60 r63  
    66# Include the forwarder.
    77#
    8 include         ../../include/makefrwd.mif
     8include ../../include/makefrwd.mif

  • trunk/tools/internal/Makefile

    r60 r63  
    11###############################################################################
    2 # Makefile :: Builds 'fixcode' program for several platforms.         [wmake] #
    3 ###############################################################################
    4 
    5 #
    6 # This Makefile builds the 'fixcode' program for DOS, Windows, OS/2 and Linux.
    7 # It is used to embed the anti-virus code into the AiR-BOOT image.
    8 # This anti-virus code protects the MBR and is installed as a TSR by the
    9 # loader. That's why it cannot be included at the source level.
    10 #
     2# Makefile :: Builds 'fixcode' program for several platforms.         [WMake] #
     3# --------------------------------------------------------------------------- #
     4#                                                                             #
     5# This Makefile builds the 'fixcode' program for DOS, Windows, OS/2 & Linux.  #
     6# It is used to embed the anti-virus code into the AiR-BOOT image.            #
     7# This anti-virus code protects the MBR and is installed as a TSR by the      #
     8# loader. That's why it cannot be included at the source level.               #
     9#                                                                             #
     10###############################################################################
     11
    1112
    1213#
    … …  
    1415# This is used to compensate for the differences between the target platforms.
    1516#
    16 !include        ../../include/makefile.mif
     17!include ../../include/makefile.mif
    1718
    1819
    … …  
    6970# we are building on Linux.
    7071#
    71 !ifdef  __LINUX__
     72!ifdef __LINUX__
    7273!if "$(ASM)"=="masm" | "$(ASM)"=="tasm" | "$(ASM)"=="alp"
    7374ASM=jwasm
    … …  
    7677
    7778!if "$(ASM)"=="jwasm"
    78 # -Cp   = case sensitive symbols
    79 # -zcw  = no _ prefix on symbols (C model)
     79# -Cp   = case sensitive symbols
     80# -zcw  = no _ prefix on symbols (C model)
    8081ASM_FLAGS_D0=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Cp -Fo$^. -Fl=$^&.lst -Fw$^&.err
    8182ASM_FLAGS_D1=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Zd -Zi -Fo$^. -Sa -Fl=$^&.lst -Fw$^&.err
    … …  
    8687ASM_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -zq -d1 -fo=$^. -fr=$^&.err
    8788!elseif "$(ASM)"=="tasm"
    88 # -ml   = case sensitive symbols
     89# -ml  = case sensitive symbols
    8990ASM_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -t -l
    9091ASM_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -t -z -zi -c -la
    … …  
    141142.AFTER
    142143#       @echo == AFTER ==
    143 !ifdef  __MSDOS__
     144!ifdef __MSDOS__
    144145        @echo $(WARN_DOS_BLD_ENV)
    145146!endif
    … …  
    150151# If this Makefile was modified, all targets are forcefully rebuilt.
    151152#
    152 all:    .SYMBOLIC Makefile.bu header $(TARGETS) footer
     153all: .SYMBOLIC Makefile.bu header $(TARGETS) footer
    153154
    154155
    … …  
    172173# Show the header.
    173174#
    174 header: .SYMBOLIC
     175header: .SYMBOLIC
    175176        @echo.
    176177        @echo =====================================================================
    … …  
    183184# Show the footer.
    184185#
    185 footer: .SYMBOLIC
     186footer: .SYMBOLIC
    186187        @echo All targets up to date !
    187188        @echo.
    … …  
    194195# using the new level.
    195196#
    196 Makefile.bu:    Makefile
     197Makefile.bu: Makefile
    197198        @echo.
    198199        @echo Makefile modified, forcing rebuild of all targets !
    … …  
    222223# DOS 16-bits (COM)
    223224###############################################################################
    224 $(BASENAME).com:        $(BASENAME).obj
     225$(BASENAME).com: $(BASENAME).obj
    225226        $(LNK) $(LNK_FLAGS) file $^&.obj name $^. sys dos com
    226         @if exist $^. @echo             $^. $(MSG_SUCCESS)
    227         @echo.
    228 
    229 $(BASENAME).obj:        $(BASENAME).asm
    230 #       @echo.
    231         @echo TARGET: $^&.com   [DOS 16-bits COM-file]
     227        @if exist $^. @echo $^. $(MSG_SUCCESS)
     228        @echo.
     229
     230$(BASENAME).obj: $(BASENAME).asm
     231#       @echo.
     232        @echo TARGET: $^&.com [DOS 16-bits COM-file]
    232233        $(ASM) $(ASM_FLAGS) $(BASENAME).asm
    233234        @wdis -fi $^. > $^&.wda
    … …  
    237238# DOS 16-bits (MZ)
    238239###############################################################################
    239 $(BASENAME)d.exe:       $(BASENAME)d.obj
     240$(BASENAME)d.exe: $(BASENAME)d.obj
    240241        $(LNK) $(LNK_FLAGS) file $^&.obj name $^. sys dos
    241         @if exist $^. @echo             $^. $(MSG_SUCCESS)
    242         @echo.
    243 
    244 $(BASENAME)d.obj:       $(BASENAME).c $(BASENAME).h
    245 #       @echo.
    246         @echo TARGET: $^&.exe   [DOS 16-bits Executable]
     242        @if exist $^. @echo $^. $(MSG_SUCCESS)
     243        @echo.
     244
     245$(BASENAME)d.obj: $(BASENAME).c $(BASENAME).h
     246#       @echo.
     247        @echo TARGET: $^&.exe [DOS 16-bits Executable]
    247248        $(CC16) $(CC16_FLAGS) -bt=dos $(BASENAME).c
    248249        @wdis -fi $^. > $^&.wda
    … …  
    252253# NT 32-bits (PE)
    253254###############################################################################
    254 $(BASENAME)w.exe:       $(BASENAME)w.obj
     255$(BASENAME)w.exe: $(BASENAME)w.obj
    255256        $(LNK) $(LNK_FLAGS) file $^&.obj name $^. sys nt
    256         @if exist $^. @echo             $^. $(MSG_SUCCESS)
    257         @echo.
    258 
    259 $(BASENAME)w.obj:       $(BASENAME).c $(BASENAME).h
    260 #       @echo.
    261         @echo TARGET: $^&.exe   [NT 32-bits Executable]
     257        @if exist $^. @echo $^. $(MSG_SUCCESS)
     258        @echo.
     259
     260$(BASENAME)w.obj: $(BASENAME).c $(BASENAME).h
     261#       @echo.
     262        @echo TARGET: $^&.exe [NT 32-bits Executable]
    262263        $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)nt -bt=nt $(BASENAME).c
    263264        @wdis -fi $^. > $^&.wda
    … …  
    267268# OS/2 32-bits (LX)
    268269###############################################################################
    269 $(BASENAME)2.exe:       $(BASENAME)2.obj
     270$(BASENAME)2.exe: $(BASENAME)2.obj
    270271        $(LNK) $(LNK_FLAGS) file $^&.obj name $^. sys os2v2
    271         @if exist $^. @echo             $^. $(MSG_SUCCESS)
    272         @echo.
    273 
    274 $(BASENAME)2.obj:       $(BASENAME).c $(BASENAME).h
    275 #       @echo.
    276         @echo TARGET: $^&.exe   [OS/2 32-bits Executable]
     272        @if exist $^. @echo $^. $(MSG_SUCCESS)
     273        @echo.
     274
     275$(BASENAME)2.obj: $(BASENAME).c $(BASENAME).h
     276#       @echo.
     277        @echo TARGET: $^&.exe [OS/2 32-bits Executable]
    277278        $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)os2 -bt=os2 $(BASENAME).c
    278279        @wdis -fi $^. > $^&.wda
    … …  
    282283# Linux 32-bits (ELF)
    283284###############################################################################
    284 $(BASENAME)l.elf:       $(BASENAME)l.obj
     285$(BASENAME)l.elf: $(BASENAME)l.obj
    285286        $(LNK) $(LNK_FLAGS) file $^&.obj name $^&.elf sys linux
    286287#       $(MV) $^&.elf $^.
    287         @if exist $^. @echo             $^. $(MSG_SUCCESS)
    288         @echo.
    289 
    290 $(BASENAME)l.obj:       $(BASENAME).c $(BASENAME).h
    291 #       @echo.
    292         @echo TARGET: $^&.elf   [Linux 32-bits Executable]
     288        @if exist $^. @echo $^. $(MSG_SUCCESS)
     289        @echo.
     290
     291$(BASENAME)l.obj: $(BASENAME).c $(BASENAME).h
     292#       @echo.
     293        @echo TARGET: $^&.elf [Linux 32-bits Executable]
    293294        $(CC32) $(CC32_FLAGS) -bt=linux $(BASENAME).c
    294295        @wdis -fi $^. > $^&.wda
    … …  
    306307# Rebuild all targets.
    307308#
    308 rebuild:        .SYMBOLIC
     309rebuild: .SYMBOLIC
    309310        @%MAKE clean
    310311        @%MAKE all
    … …  
    313314# Remove all generated files.
    314315#
    315 clean:  .SYMBOLIC
     316clean: .SYMBOLIC
    316317        @for %%i in ($(TARGETS)) do @if exist %%i $(RM) %%i
    317318        @if exist *.obj $(RM) *.obj
    … …  
    326327# Help on using this Makefile.
    327328#
    328 help:   .SYMBOLIC
    329         @echo.
    330         @echo           The following actions are available:
    331         @echo           wmake           to build all targets
    332         @echo           wmake show      to show the list of buildable targets
    333         @echo           wmake clean     to remove all generated files
    334         @echo           wmake rebuild   to rebuild all targets
    335         @echo           wmake help      for this information
     329help: .SYMBOLIC
     330        @echo.
     331        @echo The following actions are available:
     332        @echo wmake         to build all targets
     333        @echo wmake show    to show the list of buildable targets
     334        @echo wmake clean   to remove all generated files
     335        @echo wmake rebuild to rebuild all targets
     336        @echo wmake help    to show this information
    336337        @echo.
    337338
    … …  
    339340# Show the list of buildable targets.
    340341#
    341 show:   .SYMBOLIC
    342         @echo.
    343         @echo           The following [case sensitive] targets can be built:
    344         @for %%i in ($(TARGETS)) do @echo       %%i
     342show: .SYMBOLIC
     343        @echo.
     344        @echo The following [case sensitive] targets can be built:
     345        @for %%i in ($(TARGETS)) do @echo %%i
    345346        @echo.
    346347# Alias for show
    347 list:   .SYMBOLIC
     348list: .SYMBOLIC
    348349        @%MAKE show
    349350
    … …  
    353354.ERROR
    354355        @echo.
    355         @echo           Oops!
    356         @echo           Some error occured in this build session.
    357         @echo           If it's a linker problem, it could be
    358         @echo           the result of out-of-sync object files.
    359         @echo           Doing a wmake rebuild might resolve the problem.
     356        @echo Oops!
     357        @echo Some error occured in this build session.
     358        @echo If it's a linker problem, it could be
     359        @echo the result of out-of-sync object files.
     360        @echo Doing a wmake rebuild might resolve the problem.
    360361        @%MAKE help
    361362        @echo.
    362 
    363 

  • trunk/tools/os2/setaboot/GNUmakefile

    r60 r63  
    66# Include the forwarder.
    77#
    8 include         ../../../include/makefrwd.mif
     8include ../../../include/makefrwd.mif

  • trunk/tools/os2/setaboot/Makefile

    r60 r63  
    11###############################################################################
    2 # Makefile :: Builds the 'set(a)boot' 'setboot' replacement for OS/2  [wmake] #
     2# Makefile :: Builds the 'set(a)boot' 'setboot' replacement for OS/2  [WMake] #
     3# --------------------------------------------------------------------------- #
     4#                                                                             #
     5# This Makefile builds the 'set(a)boot' 'setboot' replacement for OS/2.       #
     6#                                                                             #
    37###############################################################################
    4 # rousseau@ecomstation.com
    5 
    6 
    7 #
    8 # This Makefile builds the 'set(a)boot' 'setboot' replacement for OS/2.
    9 #
     8
    109
    1110#
    … …  
    1312# This is used to compensate for the differences between the target platforms.
    1413#
    15 !include        ../../../include/makefile.mif
     14!include ../../../include/makefile.mif
    1615
    1716
    … …  
    7069# we are building on Linux.
    7170#
    72 !ifdef  __LINUX__
     71!ifdef __LINUX__
    7372!if "$(ASM)"=="masm" | "$(ASM)"=="tasm" | "$(ASM)"=="alp"
    7473ASM=jwasm
    … …  
    7776
    7877!if "$(ASM)"=="jwasm"
    79 # -Cp   = case sensitive symbols
    80 # -zcw  = no _ prefix on symbols (C model)
     78# -Cp   = case sensitive symbols
     79# -zcw = no _ prefix on symbols (C model)
    8180ASM_FLAGS_D0=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Cp -Fo$^. -Fl=$^&.lst -Fw$^&.err
    8281ASM_FLAGS_D1=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Cp -Zd -Zi -Fo$^. -Sa -Fl=$^&.lst -Fw$^&.err
    … …  
    159158# If this Makefile was modified, all targets are forcefully rebuilt.
    160159#
    161 all:    .SYMBOLIC Makefile.bu header $(TARGETS) footer
     160all: .SYMBOLIC Makefile.bu header $(TARGETS) footer
    162161
    163162
    … …  
    170169# The second method uses the procedure method, no concatenation problem.
    171170#
    172 #all:   .SYMBOLIC
     171#all: .SYMBOLIC
    173172#       Recursive method (concatenation problem)
    174173#       @for %%i in (header $(TARGETS) footer) do @$(MAKE) -h %%i
    … …  
    181180# Show the header.
    182181#
    183 header: .SYMBOLIC
     182header: .SYMBOLIC
    184183        @echo.
    185184        @echo =====================================================================
    … …  
    192191# Show the footer.
    193192#
    194 footer: .SYMBOLIC
     193footer: .SYMBOLIC
    195194        @echo All targets up to date !
    196195        @echo.
    … …  
    203202# using the new level.
    204203#
    205 Makefile.bu:    Makefile
     204Makefile.bu: Makefile
    206205        @echo.
    207206        @echo Makefile modified, forcing rebuild of all targets !
    … …  
    247246# OS/2 32-bits (LX)
    248247###############################################################################
    249 $(MODULE).exe:  $(MODULE).obj
     248$(MODULE).exe: $(MODULE).obj
    250249        $(LNK) $(LNK_FLAGS) file $^&.obj name $^. sys os2v2
    251         @if exist $^. @echo             $^. $(MSG_SUCCESS)
     250        @if exist $^. @echo $^. $(MSG_SUCCESS)
    252251        @echo.
    253252        #~ wstrip $^.
    … …  
    255254$(MODULE).obj:  $(BASENAME).c $(BASENAME).h
    256255#       @echo.
    257         @echo TARGET: $^&.exe   [OS/2 32-bits Executable]
     256        @echo TARGET: $^&.exe [OS/2 32-bits Executable]
    258257        $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)os2 -bt=os2 $(BASENAME).c
    259258        @wdis -fi $^. > $^&.wda
    … …  
    268267# Rebuild all targets.
    269268#
    270 rebuild:        .SYMBOLIC
     269rebuild: .SYMBOLIC
    271270        @%MAKE clean
    272271        @%MAKE all
    … …  
    275274# Remove all generated files.
    276275#
    277 clean:  .SYMBOLIC
     276clean: .SYMBOLIC
    278277        @for %%i in ($(TARGETS)) do @if exist %%i $(RM) %%i
    279278        @if exist *.obj $(RM) *.obj
    … …  
    290289# This distributes 'setaboot' 'release'.
    291290# -----------------------------------------------------------------------------
    292 dist:   .SYMBOLIC
     291dist: .SYMBOLIC
    293292        @if exist *.exe $(CP) *.exe ..$(DS)..$(DS)..$(DS)release$(DS)os2
    294293#
    295294# Help on using this Makefile.
    296295#
    297 help:   .SYMBOLIC
    298         @echo.
    299         @echo           The following actions are available:
    300         @echo           wmake           to build all targets
    301         @echo           wmake show      to show the list of buildable targets
    302         @echo           wmake clean     to remove all generated files
    303         @echo           wmake rebuild   to rebuild all targets
    304         @echo           wmake help      for this information
     296help: .SYMBOLIC
     297        @echo.
     298        @echo The following actions are available:
     299        @echo wmake         to build all targets
     300        @echo wmake show    to show the list of buildable targets
     301        @echo wmake clean   to remove all generated files
     302        @echo wmake rebuild to rebuild all targets
     303        @echo wmake help    to show this information
    305304        @echo.
    306305
    … …  
    308307# Show the list of buildable targets.
    309308#
    310 show:   .SYMBOLIC
    311         @echo.
    312         @echo           The following [case sensitive] targets can be built:
    313         @for %%i in ($(TARGETS)) do @echo       %%i
     309show: .SYMBOLIC
     310        @echo.
     311        @echo The following [case sensitive] targets can be built:
     312        @for %%i in ($(TARGETS)) do @echo %%i
    314313        @echo.
    315314# Alias for show
    316 list:   .SYMBOLIC
     315list: .SYMBOLIC
    317316        @%MAKE show
    318317
    … …  
    322321.ERROR
    323322        @echo.
    324         @echo           Oops!
    325         @echo           Some error occured in this build session.
    326         @echo           If it's a linker problem, it could be
    327         @echo           the result of out-of-sync object files.
    328         @echo           Doing a wmake rebuild might resolve the problem.
     323        @echo Oops!
     324        @echo Some error occured in this build session.
     325        @echo If it's a linker problem, it could be
     326        @echo the result of out-of-sync object files.
     327        @echo Doing a wmake rebuild might resolve the problem.
    329328        @%MAKE help
    330329        @echo.
    331 
    332 

  • trunk/tools/os2/setaboot/setaboot.h

    r57 r63  
    88*/
    99// Vendor
    10 #define     BLDLVL_VENDOR           "KIEWITZ"
     10//~ #define     BLDLVL_VENDOR           "KIEWITZ"
     11//~ #define     BLDLVL_VENDOR           "RDPe"
     12#define     BLDLVL_VENDOR           "*UNKNOWN*"
    1113// Version
    1214#define     BLDLVL_MAJOR_VERSION    "1"
    1315#define     BLDLVL_MIDDLE_VERSION   "1"
    14 #define     BLDLVL_MINOR_VERSION    "0"
     16#define     BLDLVL_MINOR_VERSION    "1"
    1517// Build date
    16 #define     BLDLVL_YEAR             "2013"
    17 #define     BLDLVL_MONTH            "04"
    18 #define     BLDLVL_DAY              "05"
     18#define     BLDLVL_YEAR             "2016"
     19#define     BLDLVL_MONTH            "10"
     20#define     BLDLVL_DAY              "09"
    1921// Build time
    20 #define     BLDLVL_HOURS            "01"
    21 #define     BLDLVL_MINUTES          "01"
    22 #define     BLDLVL_SECONDS          "00"
     22//~ #define     BLDLVL_HOURS            "01"
     23//~ #define     BLDLVL_MINUTES          "01"
     24//~ #define     BLDLVL_SECONDS          "00"
     25#define     BLDLVL_HOURS            "99"
     26#define     BLDLVL_MINUTES          "99"
     27#define     BLDLVL_SECONDS          "99"
    2328// Build machine
     29//~ #define     BLDLVL_MACHINE          "OS2BLDBOX"
    2430#define     BLDLVL_MACHINE          "*UNKNOWN*"
    2531// Build language
    … …  
    4450
    4551
    46 
    47 
    4852#ifdef  __cplusplus
    4953};
Note: See TracChangeset for help on using the changeset viewer.