Changeset 63


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
Files:
2 added
21 edited

Legend:

Unmodified
Added
Removed
  • trunk/.gitignore

    r61 r63  
    1111# Ignore Geany Project Files
    1212/*.geany
     13
     14# Ignore prepared commit message
     15/commit.msg
     16
     17# Ignore scratch files and directories
     18...
  • trunk/GNUmakefile

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

    r60 r63  
    11###############################################################################
    2 # Makefile :: Builds complete AiR-BOOT; all supported Languages and Platforms #
     2# Makefile :: Builds complete AiR-BOOT -- all platforms and languages (WMake) #
     3# --------------------------------------------------------------------------- #
     4#                                                                             #
     5# This is the Master Makefile and it builds the whole AiR-BOOT she-bang:      #
     6# - The AiR-BOOT Loader Code for all supported languages.                     #
     7# - The MBR Protection Image that get's embedded in the loader.               #
     8# - The 'fixcode' program that embeds the MBR Protection Image.               #
     9# - The Installers for all supported platforms.                               #
     10# - The 'set(a)boot' program for all supported platforms. (OS/2 only)         #
     11#                                                                             #
     12# Note:                                                                       #
     13# AiR-BOOT and it's helpers are relatively small to build.                    #
     14# So, although Makefiles are being used to build the lot, there's no explicit #
     15# separation between assembling/compiling from source or just only linking.   #
     16# In fact, because of multiple languages for the Loader and cross-platform    #
     17# support for the Helpers, any target will almost always be built from source #
     18# everytime.                                                                  #
     19#                                                                             #
     20# Also:                                                                       #
     21# While WMake does it's job, running it on Linux takes a bit of extra effort  #
     22# with regard to case sensitivity, directory separators, escape characters    #
     23# and other platform differences.                                             #
     24# This is handled in makefile.mif.                                            #
     25#                                                                             #
    326###############################################################################
    4 # rousseau@ecomstation.com
    5 #
    6 
    7 # This is the Master Makefile and it builds the whole AiR-BOOT she-bang:
    8 # - The AiR-BOOT Loader Code for all supported languages.
    9 # - The MBR Protection Image that get's embedded in the loader.
    10 # - The 'fixcode' program that embeds the MBR Protection Image.
    11 # - The Installers for all supported platforms.
    12 # - The 'set(a)boot' program for all supported platforms. (currently only OS/2)
    13 
    14 
    15 # Note:
    16 # AiR-BOOT and it's helpers are relatively small to build.
    17 # So, although Makefiles are being used to build the lot, there is no explicit
    18 # separation between assembling/compiling from source or just only linking.
    19 # In fact, because of multiple languages for the Loader and cross-platform
    20 # support for the Helpers, any target will almost always be built from source
    21 # everytime.
    22 
    23 # Also:
    24 # While WMake does it's job, running it on Linux requires a bit of extra effort
    25 # with regard to case sensitivity, directory separators, escape characters
    26 # and other platform differences.
    27 # This is handled in makefile.mif.
    28 
    29 
    30 
    31 #                                                       DEFINITIONS AND STUFF
     27
     28
     29
     30#                           DEFINITIONS AND STUFF
    3231# _____________________________________________________________________________
    3332
     
    4544# Include a Master Makefile with several cross-platform definitions and macros.
    4645# This is used to compensate for the differences between the target platforms.
    47 !include        include/makefile.mif
     46!include include/makefile.mif
    4847
    4948
     
    5554# The order of these Build Directories matters !
    5655#
    57 # - mbr-prot            ; MBR Protection Image later to be embedded.     (mbr-prot)
    58 # - internal            ; Helper program to embed the MBR PI. (fixboot[d][2][w][l])
    59 # - bootcode            ; AiR-BOOT Boot Manager itself.               (airboot.bin)
    60 # - install/c           ; Installer for multiple platforms.   (install[d][2][w][l])
    61 # - setaboot            ; The AiR-BOOT setboot replacement for OS/2.     (setaboot)
     56# - mbr-prot        ; MBR Protection Image later to be embedded.     (mbr-prot)
     57# - internal        ; Helper program to embed the MBR PI. (fixboot[d][2][w][l])
     58# - bootcode        ; AiR-BOOT Boot Manager itself.               (airboot.bin)
     59# - install/c       ; Installer for multiple platforms.   (install[d][2][w][l])
     60# - setaboot        ; The AiR-BOOT setboot replacement for OS/2.     (setaboot)
    6261#
    6362COMPONENTS=&
    64         bootcode$(DS)mbr-prot&
    65         tools$(DS)internal&
    66         bootcode&
    67         install$(DS)c&
    68         tools$(DS)os2$(DS)setaboot&
     63 bootcode$(DS)mbr-prot&
     64 tools$(DS)internal&
     65 bootcode&
     66 install$(DS)c&
     67 tools$(DS)os2$(DS)setaboot&
    6968
    7069
     
    7473# and the OS/2 setboot replacement (setaboot).
    7574COMPONENTS2DIST=&
    76         bootcode&
    77         install$(DS)c&
    78         tools$(DS)os2$(DS)setaboot&
    79 
    80 
    81 
    82 
    83 
    84 #                                                               MAIN ACTIONS
     75 bootcode&
     76 install$(DS)c&
     77 tools$(DS)os2$(DS)setaboot&
     78
     79
     80
     81
     82
     83#                               MAIN ACTIONS
    8584# _____________________________________________________________________________
    8685
     
    9291# Using wmake build would be equivalent.
    9392# -----------------------------------------------------------------------------
    94 all:    .SYMBOLIC Makefile.bu
     93all: .SYMBOLIC Makefile.bu
    9594        @%MAKE build
    9695
     
    106105# when parsing the Makefile. It needs to be a command related to the target.
    107106# -----------------------------------------------------------------------------
    108 build:  .SYMBOLIC
     107build: .SYMBOLIC
    109108        @SET ACTION=BUILD
    110109        @for %%i in ($(COMPONENTS)) do @$(MAKE) -h %%i
     
    138137# distribution directory.
    139138# -----------------------------------------------------------------------------
    140 dist:   .SYMBOLIC
     139dist: .SYMBOLIC
    141140        @SET ACTION=DIST
    142141        @for %%i in ($(COMPONENTS2DIST)) do @$(MAKE) -h %%i
     
    154153# when parsing the Makefile. It needs to be a command related to the target.
    155154# -----------------------------------------------------------------------------
    156 clean:  .SYMBOLIC
     155clean: .SYMBOLIC
    157156        @cd release
    158157        @$(MAKE) -h clean
     
    169168# SHOW HELP ON USING THIS MAKEFILE
    170169# -----------------------------------------------------------------------------
    171 help:   .SYMBOLIC
    172         @echo.
    173         @echo           The following actions are available:
    174         @echo           wmake           to build all targets and all languages
    175         @echo           wmake dev       to build a develoopment target
    176         @echo           wmake [LANG]    to build EN,DE,NL,FR,IT or RU versions
    177         @echo           wmake list      to show the list of buildable targets
    178         @echo           wmake clean     to remove almost all generated files
    179         @echo           wmake rmbin     to remove all residual BIN files
    180         @echo           wmake rebuild   to rebuild all targets
    181         @echo           wmake dist      to populate the dist directories
    182         @echo           wmake help      for this information
     170help: .SYMBOLIC
     171        @echo.
     172        @echo The following actions are available:
     173        @echo wmake         to build all targets and all languages
     174        @echo wmake dev     to build a develoopment target
     175        @echo wmake [LANG]  to build EN,DE,NL,FR,IT or RU versions
     176        @echo wmake list    to show the list of buildable targets
     177        @echo wmake clean   to remove almost all generated files
     178        @echo wmake rmbin   to remove all residual BIN files
     179        @echo wmake rebuild to rebuild all targets
     180        @echo wmake dist    to populate the dist directories
     181        @echo wmake help    to show this information
    183182        @echo.
    184183
     
    191190# This also forces a rebuild of all targets.
    192191# -----------------------------------------------------------------------------
    193 Makefile.bu:    Makefile
     192Makefile.bu: Makefile
    194193        @echo.
    195194        @echo Makefile modified, forcing rebuild of all targets !
     
    200199
    201200
    202 #                                                               GENERIC HANDLERS
     201#                               GENERIC HANDLERS
    203202# _____________________________________________________________________________
    204203
     
    211210# It functions like a "switch".
    212211# -----------------------------------------------------------------------------
    213 $(COMPONENTS):  .SYMBOLIC
     212$(COMPONENTS): .SYMBOLIC
    214213        @echo.
    215214        @echo.
  • trunk/README.md

    r62 r63  
    3939
    4040After the v1.1.1-testing traject, <b>AirBoot v1.1.2</b> will be released.<br>
    41 
    42 The <b>AirBoot Project</b> is part of <b>[Bens Bits](http://www.bensbits.nl)</b> OS/2 Development.<br>
  • trunk/bootcode/GNUmakefile

    r60 r63  
    66# Include the forwarder.
    77#
    8 include         ../include/makefrwd.mif
     8include ../include/makefrwd.mif
  • trunk/bootcode/Makefile

    r60 r63  
    11###############################################################################
    2 # Makefile :: Builds the 'airboot.bin' 16-bits RAW Loader Image               #
     2# Makefile :: Builds the 'airboot.bin' 16-bits RAW Loader Image       (WMake) #
     3# --------------------------------------------------------------------------- #
     4#                                                                             #
     5# This Makefile builds the 'airboot.bin' program.                             #
     6# This is the actual AiR-BOOT that you see when starting your system.         #
     7# It operates at the BIOS level and thus without any operating-system         #
     8# being active. It's first 512 bytes get loaded by the BIOS at address        #
     9# 0000:7C00 and then control is transferred. This first 512 bytes constitute  #
     10# the AiR-BOOT MBR-code, and this code loads the rest of the AiR-BOOT image.  #
     11#                                                                             #
     12# AiR-BOOT, as designed by Martin Kiewitz, boosts a lot of powerful features  #
     13# in a tiny space (just over 31kB). One of this features is detecting         #
     14# possible virusses. This detection code is "hooked" into the interrupt-chain #
     15# and therefore has it's own relocations which are not related to the main    #
     16# loader image. For this reason, when the main source 'air-boot.asm' is       #
     17# assembled to a RAW image, this virus-protection code is "embedded" as the   #
     18# last step. You could compare this to binding a resource-file to an OS/2     #
     19# executable.                                                                 #
     20#                                                                             #
     21# When AiR-BOOT gets control, this virus-protection code is copied elsewhere  #
     22# and hooked into the interrupt-system. So it functions kinda like a DOS TSR. #
     23#                                                                             #
     24# This embedding proccess consists of three parts:                            #
     25# - Assembling the virus-detection code, 'mbrprot.asm', which always results  #
     26#   in a 1024 bytes image.                                                    #
     27# - Compiling the 'fixcode' program that does the actual embedding.           #
     28# - Running the 'fixcode' program against 'air-boot.com' creating the         #
     29#       final 'airboot.bin' image.                                                #
     30#                                                                             #
     31# After these operations have been completed, the 'airboot.bin' image         #
     32# is ready to be installed.                                                   #
     33#                                                                             #
    334###############################################################################
    4 # rousseau@ecomstation.com
    5 
    6 #
    7 # This Makefile builds the 'airboot.bin' program.
    8 # This is the actual AiR-BOOT that you see when starting your system.
    9 # It operates at the BIOS level and thus without any operating-system
    10 # being active. It's first 512 bytes get loaded by the BIOS at address
    11 # 0000:7C00 and then control is transferred. This first 512 bytes constitute
    12 # the AiR-BOOT MBR-code, and this code loads the rest of the AiR-BOOT image.
    13 #
    14 
    15 #
    16 # AiR-BOOT, as designed by Martin Kiewitz, boosts a lot of powerful features
    17 # in a tiny space (just over 31kB). One of this features is detecting
    18 # possible virusses. This detection code is "hooked" into the interrupt-chain
    19 # and therefore has it's own relocations which are not related to the main
    20 # loader image. For this reason, when the main source 'air-boot.asm' is
    21 # assembled to a RAW image, this virus-protection code is "embedded" as the
    22 # last step. You could compare this to binding a resource-file to an OS/2
    23 # executable.
    24 #
    25 # When AiR-BOOT gets control, this virus-protection code is copied elsewhere
    26 # and hooked into the interrupt-system. So it functions kinda like a DOS TSR.
    27 #
    28 
    29 #
    30 # This embedding proccess consists of three parts:
    31 # - Assembling the virus-detection code, 'mbrprot.asm', which always results
    32 #   in a 1024 bytes image.
    33 # - Compiling the 'fixcode' program that does the actual embedding.
    34 # - Running the 'fixcode' program against 'air-boot.com' creating the
    35 #       final 'airboot.bin' image.
    36 #
    37 
    38 #
    39 # After these operations have been completed, the 'airboot.bin' image
    40 # is ready to be installed.
    41 #
    42 
    43 
    44 
    45 
    46 #                                                       DEFINITIONS AND STUFF
     35
     36
     37
     38#                           DEFINITIONS AND STUFF
    4739# _____________________________________________________________________________
    4840
     
    5042# Include a Master Makefile with several cross-platform definitions and macros.
    5143# This is used to compensate for the differences between the target platforms.
    52 !include        ../include/makefile.mif
     44!include ../include/makefile.mif
    5345
    5446# On my system, JWasm takes forever to generate a list-file when on a network
     
    5648# makes no difference. If you experience the same, then put a '#' in front of
    5749# the variable below to keep JWasm from generating a list-file.
    58 JWASM_LIST_FILE=-Fl=$^&.lst
     50#~ JWASM_LIST_FILE=-Fl=$^&.lst
    5951
    6052# Specifies the level of debugging.
     
    136128
    137129# If no assembler is specified then default to JWasm.
    138 !ifndef ASM
     130!ifndef ASM
    139131ASM=jwasm
    140132!endif
     
    144136# set the XMS memory limit to 0.
    145137# JWasmR will probably run out of memory and cannot be used.
    146 !ifdef  __MSDOS__
     138!ifdef __MSDOS__
    147139ASM=tasm
    148140!endif
     
    151143# So we override to jwasm when a non-jwasm assembler is specified and
    152144# we are building on Linux.
    153 !ifdef  __LINUX__
     145!ifdef __LINUX__
    154146!if "$(ASM)"=="masm" | "$(ASM)"=="tasm" | "$(ASM)"=="alp"
    155147ASM=jwasm
     
    163155# JWASM
    164156!if "$(ASM)"=="jwasm"
    165 # -Cp   = case sensitive symbols
    166 # -zcw  = no _ prefix on symbols (C model)
    167 # -Zm   = Masm51 compat -- don't use ! (Will generate incorrect offsets)
    168 # -Zd   = line number debug info
    169 # -Zi   = symbolic debug info
     157# -Cp   = case sensitive symbols
     158# -zcw  = no _ prefix on symbols (C model)
     159# -Zm   = Masm51 compat -- don't use ! (Will generate incorrect offsets)
     160# -Zd   = line number debug info
     161# -Zi   = symbolic debug info
    170162ASM_FLAGS_D0=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -q -W0 -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
    171163ASM_FLAGS_D1=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -q -W4 -Cp -zcw -Zd -Zi -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
    172164ASM_FLAGS_D2=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -q -W4 -Cp -zcw -Zd -Zi -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
     165# Workaround for JWasm list-file generation.
     166# Generate the list-file on a local drive so JWasm doen't take forever.
     167# This is done in the recipe.
     168JWASM_LIST_FILE_LOC=$(%TEMP)\
     169JWASM_LIST_FILE=-Fl=$(JWASM_LIST_FILE_LOC)$^&.lst
    173170
    174171# WASM
    175172!elseif "$(ASM)"=="wasm"
    176 # -w0   = suppress warnings (wasm is nice to check for missing size qualifiers)
     173# -w0   = suppress warnings (wasm is nice to check for missing size qualifiers)
    177174ASM_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dWASM -zq -w4 -fo=$^. -fr=$^&.err
    178175ASM_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dWASM -zq -w4 -d1 -fo=$^. -fr=$^&.err
     
    181178# TASM
    182179!elseif "$(ASM)"=="tasm"
    183 # -ml   = case sensitive symbols
     180# -ml   = case sensitive symbols
    184181ASM_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dTASM -t -ml -m9 -l
    185182ASM_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dTASM -t -ml -m9 -z -zi -c -la
     
    242239
    243240
    244 #                                                       BEFORE AND AFTER TARGETS
     241#                           BEFORE AND AFTER TARGETS
    245242# _____________________________________________________________________________
    246243
     
    257254# -----------------------------------------------------------------------------
    258255.AFTER
    259 #       @echo == AFTER ==
    260 !ifdef  __MSDOS__
     256# @echo == AFTER ==
     257!ifdef __MSDOS__
    261258        @echo $(WARN_DOS_BLD_ENV)
    262259!endif
     
    268265
    269266
    270 #                                               PSEUDO TARGETS FOR PREPARATION
     267#                       PSEUDO TARGETS FOR PREPARATION
    271268# _____________________________________________________________________________
    272269
     
    281278# the intermediate files intact.
    282279# -----------------------------------------------------------------------------
    283 all:    .SYMBOLIC Makefile.bu $(BLD_LANGUAGES) footer
     280all: .SYMBOLIC Makefile.bu $(BLD_LANGUAGES) footer
    284281#       @echo ALL !!
    285282#       @#MAKE $(BLD_LANGUAGES)
     
    296293# This is a 'pre-action' before assembling the AiR-BOOT.ASM source.
    297294# -----------------------------------------------------------------------------
    298 langsetup:      .SYMBOLIC .MULTIPLE
     295langsetup: .SYMBOLIC .MULTIPLE
    299296# Default to development language is none defined.
    300297!if "$(%BLD_LANG)"==""
     
    305302# Note that this target is not used as a 'dependency' but 'called' explicitly
    306303# by the $(BLD_LANGUAGES) target.
    307         @echo include text/$(%BLD_LANG)/mbr.asm                 > text$(DS)txtmbr.asm
    308         @echo include text/$(%BLD_LANG)/menus.asm               > text$(DS)txtmenus.asm
    309         @echo include text/$(%BLD_LANG)/other.asm               > text$(DS)txtother.asm
     304        @echo include text/$(%BLD_LANG)/mbr.asm text$(DS)txtmbr.asm
     305        @echo include text/$(%BLD_LANG)/menus.asm> text$(DS)txtmenus.asm
     306        @echo include text/$(%BLD_LANG)/other.asm> text$(DS)txtother.asm
    310307
    311308
     
    318315# depends on it.
    319316# -----------------------------------------------------------------------------
    320 $(BLD_LANGUAGES):       .SYMBOLIC
     317$(BLD_LANGUAGES): .SYMBOLIC
    321318        @SET BLD_LANG=$@
    322319        @%MAKE header
     
    330327#       @echo $(%AB_DEV)
    331328# Do not rename for dev-build
    332 !if     "$(%AB_DEV)"!="TRUE"
     329!if "$(%AB_DEV)"!="TRUE"
    333330#~ !ifndef %AB_DEV
    334331        @echo.
     
    353350# SHOW THE HEADER FOR THE TARGET BEING BUILT
    354351# -----------------------------------------------------------------------------
    355 header: .SYMBOLIC .MULTIPLE
     352header: .SYMBOLIC .MULTIPLE
    356353        @echo.
    357354        @echo =====================================================================
     
    364361# SHOW THE FOOTER
    365362# -----------------------------------------------------------------------------
    366 footer: .SYMBOLIC
     363footer: .SYMBOLIC
    367364#       $(RM) $(TARGET)
    368365        @echo All targets up to date !
     
    378375# using the new level.
    379376# -----------------------------------------------------------------------------
    380 Makefile.bu:    Makefile
     377Makefile.bu: Makefile
    381378        @echo.
    382379        @echo Makefile modified, forcing rebuild of all targets !
     
    421418# It will be embedded into the final AiR-BOOT binary. (airboot.bin)
    422419#
    423 mbrprot:        .symbolic
     420mbrprot: .symbolic
    424421        @echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
    425422        @echo @ Building MBR Protection Image and FixCode first @
     
    434431# FixCode embeds the MBR Protection Image into the final AiR-BOOT binary.
    435432#
    436 fixcode:        .procedure
     433fixcode: .procedure
    437434        cd ..$(DS)tools$(DS)internal
    438435        $(MAKE) -h
    439436        cd ..$(DS)..$(DS)bootcode
    440437
    441 
    442 #                                                               MAIN TARGETS
     438#
     439# Installer installs the loader to disk
     440#
     441installer2: .procedure
     442        cd ..$(DS)install$(DS)c
     443        $(MAKE) -h airboot2.exe
     444        cd ..$(DS)..$(DS)bootcode
     445
     446#                               MAIN TARGETS
    443447# _____________________________________________________________________________
    444448
     
    454458# with NDISASM for cross reference.
    455459# -----------------------------------------------------------------------------
    456 $(TARGET):      .MULTIPLE Makefile.bu $(BASENAME).com
     460$(TARGET): .MULTIPLE Makefile.bu $(BASENAME).com
    457461        @echo $^.:      [Final 16-bits raw Binary Image]
    458 !ifdef  __MSDOS__
     462!ifdef __MSDOS__
    459463        ..$(DS)tools$(DS)internal$(DS)fixcoded.exe
    460464!endif
    461 !ifdef  __OS2__
     465!ifdef __OS2__
    462466        ..$(DS)tools$(DS)internal$(DS)fixcode2.exe
    463467!endif
    464 !ifdef  __NT__
     468!ifdef __NT__
    465469        ..$(DS)tools$(DS)internal$(DS)fixcodew.exe
    466470!endif
    467 !ifdef  __LINUX__
     471!ifdef __LINUX__
    468472#       ..$(DS)tools$(DS)internal$(DS)fixcode
    469473        @chmod +x ..$(DS)tools$(DS)internal$(DS)fixcodel.elf
     
    472476!endif
    473477        @echo.
    474 !ifndef __MSDOS__
     478!ifndef __MSDOS__
    475479        ndisasm $(BASENAME).com > $(BASENAME).com.nda
    476480        ndisasm $(TARGET) > $(TARGET).nda
    477481!endif
    478482        @echo.
    479         @if exist $^. @echo             ** $^. $(MSG_SUCCESS) - [$(%BLD_LANG) version] **
     483        @if exist $^. @echo ** $^. $(MSG_SUCCESS) - [$(%BLD_LANG) version] **
    480484
    481485
     
    491495# So we use DOS COM linkage to proteced us from overflow incorrect fixups.
    492496# -----------------------------------------------------------------------------
    493 $(BASENAME).com:        .MULTIPLE $(BASENAME).obj
    494         @echo $^.:      [16-bits non-100h Intermediate Image]
     497$(BASENAME).com: .MULTIPLE $(BASENAME).obj
     498        @echo $^.: [16-bits non-100h Intermediate Image]
    495499        $(LNK) $(LNK_FLAGS) file $^&.obj name $^. sys dos com
    496500#       $(LNK) $(LNK_FLAGS) file $^&.obj name $^. form raw
     
    505509# - once as a disassembly with opcodes in it
    506510# -----------------------------------------------------------------------------
    507 $(BASENAME).obj:        .MULTIPLE $(BASENAME).asm
    508         @echo $^.:      [16-bits OMF Object File]
     511$(BASENAME).obj: .MULTIPLE $(BASENAME).asm
     512        @echo $^.: [16-bits OMF Object File]
    509513        $(ASM) $(ASM_FLAGS) $(BASENAME).asm
    510 !ifndef __MSDOS__
     514!if "$(%AB_DEV)"=="TRUE"
     515        @copy ..\install\c\airboot2.exe .
     516!endif
     517!if "$(ASM)"=="jwasm"
     518# Workaround for generating JWasm list-files.
     519# Command 'move' does not work across drives.
     520# So we do a 'copy' then 'del' instead.
     521        @if not exist $^&.lst copy $(JWASM_LIST_FILE_LOC)$^&.lst .
     522        @if exist $(JWASM_LIST_FILE_LOC)$^&.lst del $(JWASM_LIST_FILE_LOC)$^&.lst
     523!endif
     524!ifndef __MSDOS__
    511525        @wdis -fi $^. > $^..wda
    512526!endif
     
    515529
    516530
    517 #                                                               MAIN ACTIONS
     531#                               MAIN ACTIONS
    518532# _____________________________________________________________________________
    519533
     
    527541# This is the main target when developing.
    528542# -----------------------------------------------------------------------------
    529 dev:    .SYMBOLIC
     543dev: .SYMBOLIC
    530544        @%MAKE rmbin
    531545        @%MAKE mbrprot
    532546        @%MAKE fixcode
     547        @%MAKE installer2
    533548        SET AB_DEV=TRUE
    534549#       @%MAKE $(DEV_BLD_LANG)
     
    538553        @$(MAKE) -h $(DEV_BLD_LANG)
    539554# Display the BLDLEVEL information if we are building on OS/2.
    540 !ifdef  __OS2__
     555!ifdef __OS2__
    541556        @echo.
    542557        @bldlevel $(TARGET)
     
    546561        @type airboot.md5
    547562!endif
    548 !ifdef  __LINUX__
     563!ifdef __LINUX__
    549564        @echo.
    550565        @if exist air-boot.lst @grep ^zzz_code_space air-boot.lst
     
    559574# REBUILD ALL TARGETS
    560575# -----------------------------------------------------------------------------
    561 rebuild:        .SYMBOLIC
     576rebuild: .SYMBOLIC
    562577        @%MAKE clean
    563578        @%MAKE all
     
    567582# CLEANUP (intermediate files)
    568583# -----------------------------------------------------------------------------
    569 clean:  .SYMBOLIC .MULTIPLE
     584clean: .SYMBOLIC .MULTIPLE
    570585#       @echo CLEANING UP
    571586        @for %%i in ($(TARGET)) do @if exist %%i $(RM) %%i
    572587        @if exist *.com $(RM) *.com
    573         @if exist *.com $(RM) *.exe
     588        @if exist *.exe $(RM) *.exe
    574589        @if exist *.obj $(RM) *.obj
    575590        @if exist *.wda $(RM) *.wda
     
    584599# REMOVE ALL RESIDUAL .bin FILES (old builds)
    585600# -----------------------------------------------------------------------------
    586 rmbin:  .SYMBOLIC
     601rmbin: .SYMBOLIC
    587602        @if exist *.bin $(RM) *.bin
    588603
     
    594609# Then it installs the English version to 'release' as 'airboot.bin'.
    595610# -----------------------------------------------------------------------------
    596 dist:   .SYMBOLIC
     611dist: .SYMBOLIC
    597612        @if exist *.bin $(CP) *.bin ..$(DS)release$(DS)bootcode
    598613        @if exist airbt-en.bin $(CP) airbt-en.bin ..$(DS)release$(DS)dos$(DS)$(TARGET)
     
    605620# SHOW HELP ON USING THIS MAKEFILE
    606621# -----------------------------------------------------------------------------
    607 help:   .SYMBOLIC
    608         @echo.
    609         @echo           The following actions are available:
    610         @echo           wmake           to build all targets and all languages
    611         @echo           wmake dev       to build a develoopment target
    612         @echo           wmake [LANG]    to build EN,DE,NL,FR,IT or RU versions
    613         @echo           wmake list      to show the list of buildable targets
    614         @echo           wmake clean     to remove almost all generated files
    615         @echo           wmake rmbin     to remove all residual 'bin' files
    616         @echo           wmake rebuild   to rebuild all targets
    617         @echo           wmake dist      to populate the dist directories
    618         @echo           wmake help      for this information
     622help: .SYMBOLIC
     623        @echo.
     624        @echo The following actions are available:
     625        @echo wmake         to build all targets and all languages
     626        @echo wmake dev     to build a develoopment target
     627        @echo wmake [LANG]  to build EN,DE,NL,FR,IT or RU versions
     628        @echo wmake list    to show the list of buildable targets
     629        @echo wmake clean   to remove almost all generated files
     630        @echo wmake rmbin   to remove all residual 'bin' files
     631        @echo wmake rebuild to rebuild all targets
     632        @echo wmake dist    to populate the dist directories
     633        @echo wmake help    to show this information
    619634        @echo.
    620635
     
    623638# SHOW LIST OF BUILDABLE TARGETS
    624639# -----------------------------------------------------------------------------
    625 show:   .SYMBOLIC
    626         @echo.
    627         @echo           The following [case sensitive] targets can be built:
     640show: .SYMBOLIC
     641        @echo.
     642        @echo The following [case sensitive] targets can be built:
    628643        @for %%i in ($(TARGET)) do @echo        %%i
    629644        @echo.
    630645# Alias for show
    631 list:   .SYMBOLIC
     646list: .SYMBOLIC
    632647        @%MAKE show
    633648
     
    638653.ERROR
    639654        @echo.
    640         @echo           Oops!
    641         @echo           Some error occured in this build session.
    642         @echo           If you see stuff about "positive count"
    643         @echo           you have a section overlap.
    644         @echo           Check the z_* values at the end of the list-file
    645         @echo           and look for a negative gap.
    646         @echo           Type 'wmake help' in the target dir for a list of actions.
     655        @echo Oops!
     656        @echo Some error occured in this build session.
     657        @echo If you see stuff about "positive count"
     658        @echo you have a section overlap.
     659        @echo Check the z_* values at the end of the list-file
     660        @echo and look for a negative gap.
     661        @echo Type 'wmake help' in the target dir for a list of actions.
    647662#       @%MAKE help
    648663        @echo.
    649664
    650 
    651 # -----------------------------------------------------------------------------
    652 # How the hell can we use more than one command in the for-loop ??
    653 # -----------------------------------------------------------------------------
    654 ttt:    .SYMBOLIC
    655 # This does not work...
    656 #       @for %%i in ($(BLD_LANGUAGES)) do %%i=X; $%WMAKE;
  • trunk/bootcode/airboot.md5

    r60 r63  
    1 92fc6c0fd19a5e86b7359da216663576  airboot.bin
     1ceb2087429349e3c619e30c238982c65 *airboot.bin
  • trunk/bootcode/bldlevel.inc

    r57 r63  
    4141
    4242; Vendor
    43 BLDLVL_VENDOR           EQU     'KIEWITZ'
     43;~ BLDLVL_VENDOR           TEXTEQU <'KIEWITZ'>
     44;~ BLDLVL_VENDOR           TEXTEQU <'RDPe'>
     45BLDLVL_VENDOR           TEXTEQU <'*UNKNOWN*'>
    4446; Version
    4547BLDLVL_MAJOR_VERSION    EQU     AB_MAJOR_VERSION    + '0'
     
    5557BLDLVL_SECONDS          EQU     (AB_SECONDS SHR 4)+'0',(AB_SECONDS AND 0Fh)+'0'
    5658; Build machine
     59;~ BLDLVL_MACHINE          EQU     'OS2BLDBOX'    ; 16 chars max.
    5760BLDLVL_MACHINE          EQU     '*UNKNOWN*'    ; 16 chars max.
    5861; Build language
  • trunk/bootcode/mbr-prot/GNUmakefile

    r60 r63  
    66# Include the forwarder.
    77#
    8 include         ../../include/makefrwd.mif
     8include ../../include/makefrwd.mif
  • trunk/bootcode/mbr-prot/Makefile

    r60 r63  
    11###############################################################################
    22# Makefile :: Builds the 'mbr-prot.bin' 16-bits RAW Protection Image          #
    3 ###############################################################################
    4 # rousseau@ecomstation.com
    5 
    6 #
    7 # This Makefile builds the 'mbr_prot.bin' image.
    8 # This image is embedded in the 'airboot.bin' image to provide virus protection.
    9 # The 'fixcode' program embeds this image in 'airboot.bin'.
    10 #
     3# --------------------------------------------------------------------------- #
     4#                                                                             #
     5# This Makefile builds the 'mbr_prot.bin' image.                              #
     6# This image is embedded in 'airboot.bin' to provide virus protection.        #
     7# The 'fixcode' program embeds this image in 'airboot.bin'.                   #
     8#                                                                             #
     9###############################################################################
     10
    1111
    1212
     
    1515# This is used to compensate for the differences between the target platforms.
    1616#
    17 !include        ../../include/makefile.mif
     17!include ../../include/makefile.mif
    1818
    1919#
     
    6969# we are building on Linux.
    7070#
    71 !ifdef  __LINUX__
     71!ifdef __LINUX__
    7272!if "$(ASM)"=="masm" | "$(ASM)"=="tasm" | "$(ASM)"=="alp"
    7373ASM=jwasm
     
    7676
    7777!if "$(ASM)"=="jwasm"
    78 # -Cp   = case sensitive symbols
    79 # -zcw  = no _ prefix on symbols (C model)
     78# -Cp   = case sensitive symbols
     79# -zcw  = no _ prefix on symbols (C model)
    8080ASM_FLAGS_D0=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -q -Cp -zcw -Fo$^&.obj -Sa -Fl=$^&.lst -Fw$^&.err
    8181ASM_FLAGS_D1=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -q -Cp -zcw -Zd -Zi -Fo$^&.obj -Sa -Fl=$^&.lst -Fw$^&.err
     
    9090ASM_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dWASM -zq -d1 -fo=$^&.obj -fr=$^&.err
    9191!elseif "$(ASM)"=="tasm"
    92 # -ml   = case sensitive symbols
     92# -ml   = case sensitive symbols
    9393ASM_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dTASM -t -ml -m9 -l
    9494ASM_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dTASM -t -ml -m9 -z -zi -c -la
     
    124124.AFTER
    125125#       @echo == AFTER ==
    126 !ifdef  __MSDOS__
     126!ifdef __MSDOS__
    127127        @echo $(WARN_DOS_BLD_ENV)
    128128!endif
     
    133133# If this Makefile was modified, all targets are forcefully rebuilt.
    134134#
    135 all:    .SYMBOLIC Makefile.bu header $(TARGET) footer
     135all: .SYMBOLIC Makefile.bu header $(TARGET) footer
    136136
    137137
     
    139139# Show the header.
    140140#
    141 header: .SYMBOLIC
     141header: .SYMBOLIC
    142142        @echo.
    143143        @echo =====================================================================
     
    150150# Show the footer.
    151151#
    152 footer: .SYMBOLIC
     152footer: .SYMBOLIC
    153153#       $(RM) $(TARGET)
    154154        @echo All targets up to date !
     
    162162# using the new level.
    163163#
    164 Makefile.bu:    Makefile
     164Makefile.bu: Makefile
    165165        @echo.
    166166        @echo Makefile modified, forcing rebuild of all targets !
     
    191191# 16-bits RAW :: MBR virus protection to be embedded in the 'airboot.bin' image
    192192###############################################################################
    193 $(TARGET):      $(BASENAME).asm
    194         @echo TARGET: $^.       [DOS 16-bits Raw Image]
     193$(TARGET): $(BASENAME).asm
     194        @echo TARGET: $^. [DOS 16-bits Raw Image]
    195195        $(ASM) $(ASM_FLAGS) $(BASENAME).asm
    196196        @wdis -fi $^&.obj > $^&.wda
    197197        $(LNK) $(LNK_FLAGS) file $^&.obj name $^. sys dos com
    198198#       $(LNK) $(LNK_FLAGS) file $^&.obj name $^. form raw
    199         @if exist $^. @echo             $^. $(MSG_SUCCESS)
     199        @if exist $^. @echo $^. $(MSG_SUCCESS)
    200200        @ndisasm -k9,0 $^. > $^&.nda
    201201#       @echo.
    202202
    203 #$(BASENAME).obj:       $(BASENAME).asm
    204 #       @echo.
    205 #       @echo TARGET: $^.       [DOS 16-bits Raw Image]
     203#$(BASENAME).obj: $(BASENAME).asm
     204#       @echo.
     205#       @echo TARGET: $^. [DOS 16-bits Raw Image]
    206206#       $(ASM) $(ASM_FLAGS) $(BASENAME).asm
    207207#       @wdis -fi $^. > $^&.wda
     
    217217# Rebuild all targets.
    218218#
    219 rebuild:        .SYMBOLIC
     219rebuild: .SYMBOLIC
    220220        @%MAKE clean
    221221        @%MAKE all
     
    224224# Remove all generated files.
    225225#
    226 clean:  .SYMBOLIC
     226clean: .SYMBOLIC
    227227#       @echo CLEANING UP
    228228#       @for %%i in ($(TARGET)) do @if exist %%i $(RM) %%i
     
    240240# Remove all residual .BIN files.
    241241#
    242 rmbin:  .SYMBOLIC
     242rmbin: .SYMBOLIC
    243243        @if exist *.bin $(RM) *.bin
    244244
     
    247247# Help on using this Makefile.
    248248#
    249 help:   .SYMBOLIC
    250         @echo.
    251         @echo           The following actions are available:
    252         @echo           wmake           to build all targets and all languages
    253         @echo           wmake list      to show the list of buildable targets
    254         @echo           wmake clean     to remove almost all generated files
    255         @echo           wmake rmbin     to remove all residual BIN files
    256         @echo           wmake rebuild   to rebuild all targets
    257         @echo           wmake help      for this information
     249help: .SYMBOLIC
     250        @echo.
     251        @echo The following actions are available:
     252        @echo wmake         to build all targets and all languages
     253        @echo wmake list    to show the list of buildable targets
     254        @echo wmake clean   to remove almost all generated files
     255        @echo wmake rmbin   to remove all residual BIN files
     256        @echo wmake rebuild to rebuild all targets
     257        @echo wmake help    to show this information
    258258        @echo.
    259259
     
    263263show:   .SYMBOLIC
    264264        @echo.
    265         @echo           The following [case sensitive] targets can be built:
    266         @for %%i in ($(TARGET)) do @echo        %%i
     265        @echo The following [case sensitive] targets can be built:
     266        @for %%i in ($(TARGET)) do @echo %%i
    267267        @echo.
    268268# Alias for show
    269 list:   .SYMBOLIC
     269list: .SYMBOLIC
    270270        @%MAKE show
    271271
     
    275275.ERROR
    276276        @echo.
    277         @echo           Oops!
    278         @echo           Some error occured in this build session.
    279         @echo           If it's a linker problem, it could be
    280         @echo           the result of out-of-sync object files.
    281         @echo           Doing a wmake rebuild might solve the problem.
     277        @echo Oops!
     278        @echo Some error occured in this build session.
     279        @echo If it's a linker problem, it could be
     280        @echo the result of out-of-sync object files.
     281        @echo Doing a wmake rebuild might solve the problem.
    282282        @%MAKE help
    283283        @echo.
  • trunk/bootcode/regular/std_text.asm

    r57 r63  
    5555            db BLDLVL_MINOR_VERSION,' - (c) 1998-'
    5656            db BLDLVL_YEAR
    57             ;~ db ' M. Kiewitz  <<Release Candidate 4>> (bld: '
    58             db ' Martin Kiewitz, Dedicated to Gerd Kiewitz'
    59             ;~ db BLDLVL_YEAR
    60             ;~ db BLDLVL_MONTH
    61             ;~ db BLDLVL_DAY,')'
     57            ;~ db ' M. Kiewitz  <<Release Candidate 4>>  (bld: '
     58            db ' M. Kiewitz   << Test Build >>   (bld:'
     59            ;~ db ' Martin Kiewitz, Dedicated to Gerd Kiewitz'
     60            db BLDLVL_YEAR
     61            db BLDLVL_MONTH
     62            db BLDLVL_DAY,')'
    6263            db 0
    6364
  • trunk/bootcode/version.inc

    r57 r63  
    3232AB_MAJOR_VERSION    EQU     1
    3333AB_MIDDLE_VERSION   EQU     1
    34 AB_MINOR_VERSION    EQU     0
     34AB_MINOR_VERSION    EQU     1
    3535
    3636; The Year, Month and Day in BCD so we can easily extract nibbles.
    37 AB_YEAR             EQU     2013h
    38 AB_MONTH            EQU     04h
    39 AB_DAY              EQU     05h
     37AB_YEAR             EQU     2016h
     38AB_MONTH            EQU     10h
     39AB_DAY              EQU     09h
    4040
    4141; The Hours, Minutes and Seconds, again in BCD for easy manipulation.
    42 AB_HOURS            EQU     01h
    43 AB_MINUTES          EQU     01h
    44 AB_SECONDS          EQU     00h
     42;~ AB_HOURS            EQU     01h
     43;~ AB_MINUTES          EQU     01h
     44;~ AB_SECONDS          EQU     01h
     45AB_HOURS            EQU     99h
     46AB_MINUTES          EQU     99h
     47AB_SECONDS          EQU     99h
    4548
    4649; The AiR-BOOT signature uses big-endian so we shuffle some bits around.
  • trunk/install/c/GNUmakefile

    r60 r63  
    66# Include the forwarder.
    77#
    8 include         ../../include/makefrwd.mif
     8include ../../include/makefrwd.mif
  • trunk/install/c/Makefile

    r60 r63  
    11###############################################################################
    2 # Makefile :: Builds the Installer for several platforms.             [wmake] #
    3 ###############################################################################
    4 # rousseau@ecomstation.com
    5 
    6 #
    7 # This Makefile builds the Installer for DOS, Windows, OS/2 and Linux.
    8 # Like 'fixcode', each platform version has a letter appended it:
    9 # 'D' for DOS, 'W' for Windows, '2' for OS/2 and 'L' for Linux.
    10 #
     2# Makefile :: Builds the Installer for several platforms              [WMake] #
     3# --------------------------------------------------------------------------- #
     4#                                                                             #
     5# This Makefile builds the Installer for DOS, Windows, OS/2 and Linux.        #
     6# Like 'fixcode', each platform version has a letter appended it:             #
     7# 'D' for DOS, 'W' for Windows, '2' for OS/2 and 'L' for Linux.               #
     8#                                                                             #
     9###############################################################################
     10
    1111
    1212#
     
    1414# This is used to compensate for the differences between the target platforms.
    1515#
    16 !include        ../../include/makefile.mif
     16!include ../../include/makefile.mif
    1717
    1818
     
    7777# we are building on Linux.
    7878#
    79 !ifdef  __LINUX__
     79!ifdef __LINUX__
    8080!if "$(ASM)"=="masm" | "$(ASM)"=="tasm" | "$(ASM)"=="alp"
    8181ASM=jwasm
     
    8484
    8585!if "$(ASM)"=="jwasm"
    86 # -Cp   = case sensitive symbols
    87 # -zcw  = no _ prefix on symbols (C model)
     86# -Cp   = case sensitive symbols
     87# -zcw = no _ prefix on symbols (C model)
    8888ASM_FLAGS_D0=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Cp -Fo$^. -Fl=$^&.lst -Fw$^&.err
    8989ASM_FLAGS_D1=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Zd -Zi -Fo$^. -Sa -Fl=$^&.lst -Fw$^&.err
     
    140140LNK_FLAGS_D0=op q op v op map=$^&.map
    141141#~ LNK_FLAGS_D1=op q op v d all &
    142         #~ order clname CODE clname FAR_CONST clname FAR_DATA clnam BEGDATA clname DATA clname BSS clname STACK clname BLAP NOE &
    143         #~ op map=$^&.MAP
     142#~ order clname CODE clname FAR_CONST clname FAR_DATA clnam BEGDATA clname DATA clname BSS clname STACK clname BLAP NOE &
     143#~ op map=$^&.MAP
    144144LNK_FLAGS_D1=op q op v d all op map=$^&.map
    145145LNK_FLAGS_D2=op q op v d all op map=$^&.map
     
    158158.AFTER
    159159#       @echo == AFTER ==
    160 !ifdef  __MSDOS__
     160!ifdef __MSDOS__
    161161        @echo $(WARN_DOS_BLD_ENV)
    162162!endif
     
    167167# If this Makefile was modified, all targets are forcefully rebuilt.
    168168#
    169 all:    .SYMBOLIC Makefile.bu header $(TARGETS) footer
     169all: .SYMBOLIC Makefile.bu header $(TARGETS) footer
    170170
    171171
     
    189189# Show the header.
    190190#
    191 header: .SYMBOLIC
     191header: .SYMBOLIC
    192192        @echo.
    193193        @echo =====================================================================
     
    200200# Show the footer.
    201201#
    202 footer: .SYMBOLIC
     202footer: .SYMBOLIC
    203203        @echo All targets up to date !
    204204        @echo.
     
    211211# using the new level.
    212212#
    213 Makefile.bu:    Makefile
     213Makefile.bu: Makefile
    214214        @echo.
    215215        @echo Makefile modified, forcing rebuild of all targets !
     
    255255# DOS 16-bits (MZ)
    256256###############################################################################
    257 $(MODULE)d.exe: $(MODULE)d.obj
     257$(MODULE)d.exe: $(MODULE)d.obj
    258258#       @cat $^&.MD5
    259259        $(LNK) $(LNK_FLAGS) op stack=8192 file $^&.obj name $^. sys dos
     
    261261#       @cat $^&.md5
    262262        @wdump $^. > $^&.wdu
    263         @if exist $^. @echo             $^. $(MSG_SUCCESS)
     263        @if exist $^. @echo $^. $(MSG_SUCCESS)
    264264        @echo.
    265265        #~ wstrip $^.
    266266
    267 $(MODULE)d.obj: $(BASENAME).c $(BASENAME).h
     267$(MODULE)d.obj: $(BASENAME).c $(BASENAME).h
    268268#       @echo.
    269         @echo TARGET: $^&.exe   [DOS 16-bits Executable]
     269        @echo TARGET: $^&.exe [DOS 16-bits Executable]
    270270        $(CC16) $(CC16_FLAGS) -I$(%WATCOM)$(DS)h$(DS)os21x -bt=dos $(BASENAME).c
    271271        @wdis -fi $^. > $^&.wda
     
    275275# NT 32-bits (PE)
    276276###############################################################################
    277 $(MODULE)w.exe: $(MODULE)w.obj
     277$(MODULE)w.exe: $(MODULE)w.obj
    278278        $(LNK) $(LNK_FLAGS) file $^&.obj name $^. sys nt
    279279        @wdump $^. > $^&.wdu
    280         @if exist $^. @echo             $^. $(MSG_SUCCESS)
    281         @echo.
    282 
    283 $(MODULE)w.obj: $(BASENAME).c $(BASENAME).h
     280        @if exist $^. @echo $^. $(MSG_SUCCESS)
     281        @echo.
     282
     283$(MODULE)w.obj: $(BASENAME).c $(BASENAME).h
    284284#       @echo.
    285         @echo TARGET: $^&.exe   [NT 32-bits Executable]
     285        @echo TARGET: $^&.exe [NT 32-bits Executable]
    286286        $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)nt -bt=nt $(BASENAME).c
    287287        @wdis -fi $^. > $^&.wda
     
    291291# OS/2 32-bits (LX)
    292292###############################################################################
    293 $(MODULE)2.exe: $(MODULE)2.obj
     293$(MODULE)2.exe: $(MODULE)2.obj
    294294        $(LNK) $(LNK_FLAGS) file $^&.obj name $^. sys os2v2
    295295        @wdump $^. > $^&.wdu
    296         @if exist $^. @echo             $^. $(MSG_SUCCESS)
     296        @if exist $^. @echo $^. $(MSG_SUCCESS)
    297297        @echo.
    298298        #~ wstrip $^.
    299299
    300 $(MODULE)2.obj: $(BASENAME).c $(BASENAME).h
     300$(MODULE)2.obj: $(BASENAME).c $(BASENAME).h
    301301#       @echo.
    302         @echo TARGET: $^&.exe   [OS/2 32-bits Executable]
     302        @echo TARGET: $^&.exe [OS/2 32-bits Executable]
    303303        $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)os2 -bt=os2 $(BASENAME).c
    304304        @wdis -fi $^. > $^&.wda
     
    308308# Linux 32-bits (ELF)
    309309###############################################################################
    310 $(MODULE)l.elf: $(MODULE)l.obj
     310$(MODULE)l.elf: $(MODULE)l.obj
    311311        $(LNK) $(LNK_FLAGS) file $^&.obj name $^&.elf sys linux
    312312        @wdump $^. > $^&.wdu
    313313#       $(MV) $^&.elf $^.
    314         @if exist $^. @echo             $^. $(MSG_SUCCESS)
    315         @echo.
    316 
    317 $(MODULE)l.obj: $(BASENAME).c $(BASENAME).h
     314        @if exist $^. @echo $^. $(MSG_SUCCESS)
     315        @echo.
     316
     317$(MODULE)l.obj: $(BASENAME).c $(BASENAME).h
    318318#       @echo.
    319         @echo TARGET: $^&.elf   [Linux 32-bits Executable]
     319        @echo TARGET: $^&.elf [Linux 32-bits Executable]
    320320        $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)os2 -bt=linux $(BASENAME).c
    321321        @wdis -fi $^. > $^&.wda
     
    337337# Then it installs the English version to 'releases' as 'airboot.bin'.
    338338# -----------------------------------------------------------------------------
    339 dist:   .SYMBOLIC
     339dist: .SYMBOLIC
    340340        @if exist airboot2.exe $(CP) airboot2.exe ..$(DS)..$(DS)release$(DS)os2
    341341        @if exist airbootd.exe $(CP) airbootd.exe ..$(DS)..$(DS)release$(DS)dos
     
    346346# Rebuild all targets.
    347347#
    348 rebuild:        .SYMBOLIC
     348rebuild: .SYMBOLIC
    349349        @%MAKE clean
    350350        @%MAKE all
     
    353353# Remove all generated files.
    354354#
    355 clean:  .SYMBOLIC
     355clean: .SYMBOLIC
    356356        @for %%i in ($(TARGETS)) do @if exist %%i $(RM) %%i
    357357        @if exist *.obj $(RM) *.obj
     
    367367# Help on using this Makefile.
    368368#
    369 help:   .SYMBOLIC
    370         @echo.
    371         @echo           The following actions are available:
    372         @echo           wmake           to build all targets
    373         @echo           wmake show      to show the list of buildable targets
    374         @echo           wmake clean     to remove all generated files
    375         @echo           wmake rebuild   to rebuild all targets
    376         @echo           wmake help      for this information
     369help: .SYMBOLIC
     370        @echo.
     371        @echo The following actions are available:
     372        @echo wmake         to build all targets
     373        @echo wmake show    to show the list of buildable targets
     374        @echo wmake clean   to remove all generated files
     375        @echo wmake rebuild to rebuild all targets
     376        @echo wmake help    to show this information
    377377        @echo.
    378378
     
    380380# Show the list of buildable targets.
    381381#
    382 show:   .SYMBOLIC
    383         @echo.
    384         @echo           The following [case sensitive] targets can be built:
    385         @for %%i in ($(TARGETS)) do @echo       %%i
     382show: .SYMBOLIC
     383        @echo.
     384        @echo The following [case sensitive] targets can be built:
     385        @for %%i in ($(TARGETS)) do @echo %%i
    386386        @echo.
    387387# Alias for show
    388 list:   .SYMBOLIC
     388list: .SYMBOLIC
    389389        @%MAKE show
    390390
     
    394394.ERROR
    395395        @echo.
    396         @echo           Oops!
    397         @echo           Some error occured in this build session.
    398         @echo           If it's a linker problem, it could be
    399         @echo           the result of out-of-sync object files.
    400         @echo           Doing a wmake rebuild might resolve the problem.
     396        @echo Oops!
     397        @echo Some error occured in this build session.
     398        @echo If it's a linker problem, it could be
     399        @echo the result of out-of-sync object files.
     400        @echo Doing a wmake rebuild might resolve the problem.
    401401        @%MAKE help
    402402        @echo.
    403 
    404 
  • trunk/install/c/install.h

    r60 r63  
    2222*/
    2323// Vendor
    24 #define     BLDLVL_VENDOR           "KIEWITZ"
     24//~ #define     BLDLVL_VENDOR           "KIEWITZ"
     25//~ #define     BLDLVL_VENDOR           "RDPe"
     26#define     BLDLVL_VENDOR           "*UNKNOWN*"
    2527// Version
    2628#define     BLDLVL_MAJOR_VERSION    "1"
    2729#define     BLDLVL_MIDDLE_VERSION   "1"
    28 #define     BLDLVL_MINOR_VERSION    "0"
     30#define     BLDLVL_MINOR_VERSION    "1"
    2931// Build date
    30 #define     BLDLVL_YEAR             "2013"
    31 #define     BLDLVL_MONTH            "04"
    32 #define     BLDLVL_DAY              "05"
     32#define     BLDLVL_YEAR             "2016"
     33#define     BLDLVL_MONTH            "10"
     34#define     BLDLVL_DAY              "09"
    3335// Build time
    34 #define     BLDLVL_HOURS            "01"
    35 #define     BLDLVL_MINUTES          "01"
    36 #define     BLDLVL_SECONDS          "00"
     36//~ #define     BLDLVL_HOURS            "01"
     37//~ #define     BLDLVL_MINUTES          "01"
     38//~ #define     BLDLVL_SECONDS          "00"
     39#define     BLDLVL_HOURS            "99"
     40#define     BLDLVL_MINUTES          "99"
     41#define     BLDLVL_SECONDS          "99"
    3742// Build machine
     43//~ #define     BLDLVL_MACHINE          "OS2BLDBOX"
    3844#define     BLDLVL_MACHINE          "*UNKNOWN*"
    3945// Build language
     
    122128#define     CONFIG_OFFSET           0x6C00                              // Byte offset of config-sector
    123129#define     SECTORS_BEFORE_CONFIG   CONFIG_OFFSET / BYTES_PER_SECTOR    // Nr of sectors before config-sector
    124 
    125 
    126 
    127 
  • trunk/release/Makefile

    r60 r63  
    55# Include a Master Makefile with several cross-platform definitions and macros.
    66# This is used to compensate for the differences between the target platforms.
    7 !include        ../include/makefile.mif
     7!include ../include/makefile.mif
    88
    9 default:        .SYMBOLIC
     9default: .SYMBOLIC
    1010        @echo.
    1111        @echo Use wmake clean to remove the distribution files
    1212        @echo.
    1313
    14 clean:          .SYMBOLIC
     14clean: .SYMBOLIC
    1515#       @for %%i in ($(RELDIRS)) do @$(MAKE) -h %%i
    1616        @echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
  • 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.