Changeset 188


Ignore:
Timestamp:
Nov 7, 2017, 7:12:56 AM (8 years ago)
Author:
Ben Rietbroek
Message:

Added 'RELEASE' option for building a RELEASE version [v1.1.1-testing]

Formerly this was done by editing the related files, which is kinda
annoying when using versioning. With this new method it is more easy
to test release builds while developing.

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

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/bootcode/airboot.md5

    r182 r188  
    1 7611b247c861439e5e1819e403099ccf  airboot.bin
     17af8922d9ad553da88e32c98ee2717cd  airboot.bin

  • trunk/bootcode/bldlevel.inc

    r182 r188  
    3232
    3333;
    34 ; For some reason JWasm and Tasm don't accept 'EN' for instance, but need
     34; For some reason JWasm and Tasm do not accept 'EN' for instance, but need
    3535; it to be split-up. While 'iEN' does work. So all the strings that were not
    3636; accepted are split-up.

  • trunk/bootcode/fc.mnu

    r186 r188  
    33#
    44
    5 B:      Build Development Version [EN]
     5I:      Information
     6        make dev-info
     7-:      -------------------------------------
     8B:      Build Anonymous Dev Version  [EN]
    69        wmake -h dev DEV_BLD_LANG=en %BLDLVL_VENDOR= %BLDLVL_MACHINE= %CRC_IGNORE=y
    7 V:      Build Vendor Dev  Version [EN]
    8         wmake -h dev DEV_BLD_LANG=en
    9 M:      Build Development Version [??]
     10V:      Build Vendor    Dev Version  [EN]
     11        wmake -h dev DEV_BLD_LANG=en %CRC_IGNORE=y
     12F:      Build Fake  Release Version  [EN]
     13        wmake dev DEV_BLD_LANG=en %RELEASE=y
     14-:      -------------------------------------
     15L:      Build Anonymous Dev Version  [LANG]
    1016{
    11171:      English
    12         wmake -h dev DEV_BLD_LANG=en
    13 2:      German
    14         wmake -h dev DEV_BLD_LANG=de
    15 3:      Dutch
    16         wmake -h dev DEV_BLD_LANG=nl
    17 4:      French
    18         wmake -h dev DEV_BLD_LANG=fr
    19 5:      Italian
    20         wmake -h dev DEV_BLD_LANG=it
    21 6:      Swedish
    22         wmake -h dev DEV_BLD_LANG=sw
    23 7:      Russian
    24         wmake -h dev DEV_BLD_LANG=ru
     18        wmake -h dev DEV_BLD_LANG=en %BLDLVL_VENDOR= %BLDLVL_MACHINE= %CRC_IGNORE=y
     192:      German    (without FX)
     20        wmake -h dev DEV_BLD_LANG=de %BLDLVL_VENDOR= %BLDLVL_MACHINE= %CRC_IGNORE=y
     213:      Dutch     (without FX)
     22        wmake -h dev DEV_BLD_LANG=nl %BLDLVL_VENDOR= %BLDLVL_MACHINE= %CRC_IGNORE=y
     234:      French    (without FX)
     24        wmake -h dev DEV_BLD_LANG=fr %BLDLVL_VENDOR= %BLDLVL_MACHINE= %CRC_IGNORE=y
     255:      Italian   (without FX)
     26        wmake -h dev DEV_BLD_LANG=it %BLDLVL_VENDOR= %BLDLVL_MACHINE= %CRC_IGNORE=y
     276:      Swedish   (without FX)
     28        wmake -h dev DEV_BLD_LANG=sw %BLDLVL_VENDOR= %BLDLVL_MACHINE= %CRC_IGNORE=y
     297:      Russian   (without FX)
     30        wmake -h dev DEV_BLD_LANG=ru %BLDLVL_VENDOR= %BLDLVL_MACHINE= %CRC_IGNORE=y
    2531}
     32-:      -------------------------------------
    2633C:      Clean
    2734        wmake -h clean
    28 -:      --------------------------------
     35-:      -------------------------------------
    2936I:      Install (/forcecode)
    3037        airboot2.exe /forcecode

  • trunk/bootcode/fcl.mnu

    r184 r188  
    33#
    44
    5 B:      Build Development Version [EN]
     5I:      Information
     6        make dev-info
     7-:      -------------------------------------
     8B:      Build Anonymous Dev Version  [EN]
    69        make dev DEV_BLD_LANG=en BLDLVL_VENDOR= BLDLVL_MACHINE= USE_GNU_MAKE=y CRC_IGNORE=y
    7 V:      Build Vendor Dev  Version [EN]
     10V:      Build Vendor    Dev Version [EN]
    811        make dev DEV_BLD_LANG=en BLDLVL_VENDOR=${USER} BLDLVL_MACHINE=${HOSTNAME} USE_GNU_MAKE=y
    9 -:      ------------------------------
    10 M:      Build Development Version [??]
     12F:      Build Fake  Release Version  [EN]
     13        make dev DEV_BLD_LANG=en RELEASE=y USE_GNU_MAKE=y
     14-:      -------------------------------------
     15L:      Build Anonymous Dev Version  [LANG]
    1116{
    12171:      English
    13         make dev DEV_BLD_LANG=en USE_GNU_MAKE=y CRC_IGNORE=y
    14 2:      German
    15         make dev DEV_BLD_LANG=de USE_GNU_MAKE=y CRC_IGNORE=y
    16 3:      Dutch
    17         make dev DEV_BLD_LANG=nl USE_GNU_MAKE=y CRC_IGNORE=y
    18 4:      French
    19         make dev DEV_BLD_LANG=fr USE_GNU_MAKE=y CRC_IGNORE=y
    20 5:      Italian
    21         make dev DEV_BLD_LANG=it USE_GNU_MAKE=y CRC_IGNORE=y
    22 6:      Swedish
    23         make dev DEV_BLD_LANG=sw USE_GNU_MAKE=y CRC_IGNORE=y
    24 7:      Russian
    25         make dev DEV_BLD_LANG=ru USE_GNU_MAKE=y CRC_IGNORE=y
     18        make dev DEV_BLD_LANG=en BLDLVL_VENDOR= BLDLVL_MACHINE= USE_GNU_MAKE=y CRC_IGNORE=y
     192:      German    (without FX)
     20        make dev DEV_BLD_LANG=de BLDLVL_VENDOR= BLDLVL_MACHINE= USE_GNU_MAKE=y CRC_IGNORE=y
     213:      Dutch     (without FX)
     22        make dev DEV_BLD_LANG=nl BLDLVL_VENDOR= BLDLVL_MACHINE= USE_GNU_MAKE=y CRC_IGNORE=y
     234:      French    (without FX)
     24        make dev DEV_BLD_LANG=fr BLDLVL_VENDOR= BLDLVL_MACHINE= USE_GNU_MAKE=y CRC_IGNORE=y
     255:      Italian   (without FX)
     26        make dev DEV_BLD_LANG=it BLDLVL_VENDOR= BLDLVL_MACHINE= USE_GNU_MAKE=y CRC_IGNORE=y
     276:      Swedish   (without FX)
     28        make dev DEV_BLD_LANG=sw BLDLVL_VENDOR= BLDLVL_MACHINE= USE_GNU_MAKE=y CRC_IGNORE=y
     297:      Russian   (without FX)
     30        make dev DEV_BLD_LANG=ru BLDLVL_VENDOR= BLDLVL_MACHINE= USE_GNU_MAKE=y CRC_IGNORE=y
    2631}
     32-:      -------------------------------------
    2733C:      Clean
    2834        make clean USE_GNU_MAKE=y

  • trunk/bootcode/regular/std_text.asm

    r165 r188  
    2727; I'm going to sue your cheap ass, rape your dog and blow up your house. =)
    2828
    29 CopyrightVersionLen   equ   6
    30 ;Copyright             db ' AiR-BOOT v1.06 - (c) 1998-2009 M. Kiewitz, Dedicated to Gerd Kiewitz', 0
    31 ;Copyright             db ' AiR-BOOT v1.07 - (c) 2011 M. Kiewitz - Rousseau test-version >502G (build: #24)', 0
    32 ;Copyright             db ' AiR-BOOT v1.07 - (c) 2011 M. Kiewitz   -  Release Candidate 1  -  (build: #25)', 0
    33 ;Copyright             db ' AiR-BOOT v1.07 - (c) 1998-2011 M. Kiewitz, Dedicated to Gerd Kiewitz (rc2-b27)', 0
    34 ;Copyright             db ' AiR-BOOT v1.07 - (c) 1998-2011 M. Kiewitz, Dedicated to Gerd Kiewitz (rc3-b31)', 0
    35 ;Copyright             db ' AiR-BOOT v1.07 - (c) 1998-2011 M. Kiewitz, Dedicated to Gerd Kiewitz (rc4-b33)', 0
    36 ;Copyright             db ' AiR-BOOT v1.07 - (c) 1998-2011 M. Kiewitz, Dedicated to Gerd Kiewitz (rc5-b35)', 0
    37 ;Copyright             db ' AiR-BOOT v1.07 - (c) 1998-2011 M. Kiewitz, Dedicated to Gerd Kiewitz', 0
    38 ;Copyright             db ' AiR-BOOT v1.0.8 - (c) 1998-2011 M. Kiewitz, Dedicated to Gerd Kiewitz', 0
    39 
    40 ;Copyright             db ' AiR-BOOT v1.0.8-internal-beta - ** !! NOT FOR DISTRIBUTION !! **', 0
    41 ;Copyright             db ' AiR-BOOT v1.0.8 - (c) 2012 M. Kiewitz    <<Release Candidate>>    (build: #18)', 0
    42 ;Copyright             db ' AiR-BOOT v1.0.8 - (c) 2012 M. Kiewitz  <<Release Candidate 1>> (bld: 20120124)', 0
    43 ;Copyright             db ' AiR-BOOT v1.0.8 - (c) 2012 M. Kiewitz  <<Release Candidate 2>> (bld: 20120224)', 0
    44 
    45 
    46 ;~ Copyright             db ' AiR-BOOT v',BLDLVL_MAJOR_VERSION,'.',BLDLVL_MIDDLE_VERSION,'.',BLDLVL_MINOR_VERSION,' - (c) ',BLDLVL_YEAR,' M. Kiewitz  <<Internal Release 2l>> (bld: ',BLDLVL_YEAR,BLDLVL_MONTH,BLDLVL_DAY,')', 0
    4729
    4830;
    49 ; Masm found the above to be too complex, so we broke it up.
     31; Copyright header on top of screen
    5032;
    5133Copyright:
     34IFDEF   RELEASE
     35            ;
     36            ; Copyright header as displayed on RELEASE version
     37            ;
    5238            db ' AiR-BOOT v'
    5339            db BLDLVL_MAJOR_VERSION,'.'
    … …  
    5541            db BLDLVL_MINOR_VERSION,' - (c) 1998-'
    5642            db BLDLVL_YEAR
    57             ;~ db ' M. Kiewitz  <<Release Candidate 4>>  (bld: '
     43            db ' Martin Kiewitz, Dedicated to Gerd Kiewitz'
     44            db 0
     45ELSE
     46            ;
     47            ; Copyright header as displayed on TESTBUILD version
     48            ;
     49            db ' AiR-BOOT v'
     50            db BLDLVL_MAJOR_VERSION,'.'
     51            db BLDLVL_MIDDLE_VERSION,'.'
     52            db BLDLVL_MINOR_VERSION,' - (c) 1998-'
     53            db BLDLVL_YEAR
    5854            db ' M. Kiewitz   << Test Build >>   (bld:'
    59             ;~ db ' Martin Kiewitz, Dedicated to Gerd Kiewitz'
    6055            db BLDLVL_YEAR
    6156            db BLDLVL_MONTH
    6257            db BLDLVL_DAY,')'
    6358            db 0
     59ENDIF
    6460
    65 ;
    66 ; Normal copyright notice.
    67 ;
    68 ;~ Copyright   db ' AiR-BOOT v1.0.8 - (c) 1998-2012 M. Kiewitz, Dedicated to Gerd Kiewitz', 0
    69 
    70 
     61; Length of version string to copy when displayed in menu and just before
     62; booting the selected system.
     63CopyrightVersionLen   equ   6
    7164
    7265; License and source info.
    … …  
    10598; Build Information string.
    10699build_date      db  'Build Date: ',0
    107 jwasm_txt       db  'JWasm',0
    108 masm_txt        db  'Masm',0
    109 wasm_txt        db  'Wasm',0
    110 tasm_txt        db  'Tasm',0
    111100scanning_txt    db  'Scanning...',0
    112 unknown_txt     db  '????',0

  • trunk/fc.mnu

    r182 r188  
    33#
    44
    5 A:      Build All Languages
    6         wmake -h
     5I:      Information
     6        wmake -h info
    77
    8 C:      Clean All
     8-:      -------------
     9
     10B:      Build
     11        wmake -h %RELEASE=y
     12
     13P:      Package
     14        wmake -h package
     15
     16C:      Clean
    917        wmake -h clean

  • trunk/fcl.mnu

    r183 r188  
    33#
    44
    5 A:      Build All
    6         make build USE_GNU_MAKE=y
     5I:      Information
     6        make info USE_GNU_MAKE=y
    77
    8 C:      Clean All
     8-:      -------------
     9
     10B:      Build
     11        make build RELEASE=y USE_GNU_MAKE=y
     12
     13P:      Package
     14        make package USE_GNU_MAKE=y
     15
     16C:      Clean
    917        make clean USE_GNU_MAKE=y
     18
     19-:      -------------
    1020
    1121S:      Git Status

  • trunk/include/makefile.mif

    r184 r188  
    117117
    118118#
     119# Clear the ASM and CC definitions
     120#
     121%JWASM_DEFINES=
     122%CC_DEFINES=
     123
     124#
     125# Force a RELEASE build if specified
     126#
     127!if     "$(%RELEASE)"=="y"
     128%JWASM_DEFINES += -DRELEASE
     129%CC_DEFINES += -dRELEASE
     130!endif
     131
     132#
    119133# Compose JWasm defines to pass on command-line
    120134#
    121 %JWASM_DEFINES=
    122135%JWASM_DEFINES += -DBLDLVL_VENDOR="'$(%BLDLVL_VENDOR)'"
    123136%JWASM_DEFINES += -DBLDLVL_MACHINE="'$(%BLDLVL_MACHINE)'"
    … …  
    133146# Compose C-Compiler defines to pass on command-line
    134147#
    135 %CC_DEFINES=
    136148!ifdef  __LINUX__
    137149%CC_DEFINES += -dBLDLVL_VENDOR='"$(%BLDLVL_VENDOR)"'

  • trunk/include/version.h

    r182 r188  
    1818
    1919
     20
    2021/*
    21 // OS/2 BLDLEVEL Information.
     22// OS/2 BLDLEVEL Information
    2223*/
    2324
    … …  
    3233#endif
    3334
     35// Build language
     36#define     BLDLVL_LANGUAGE         "EN"
     37
     38
     39// Release and TestBuild variants
     40#ifdef  RELEASE
     41
     42// Version
     43#define     BLDLVL_MAJOR_VERSION    "1"
     44#define     BLDLVL_MIDDLE_VERSION   "1"
     45#define     BLDLVL_MINOR_VERSION    "2"
     46
     47// Build date
     48#define     BLDLVL_YEAR             "2017"
     49#define     BLDLVL_MONTH            "04"
     50#define     BLDLVL_DAY              "13"
     51
     52// Build time
     53#define     BLDLVL_HOURS            "01"
     54#define     BLDLVL_MINUTES          "01"
     55#define     BLDLVL_SECONDS          "02"
     56
     57#else
     58
    3459// Version
    3560#define     BLDLVL_MAJOR_VERSION    "1"
    … …  
    4368
    4469// Build time
    45 //~ #define     BLDLVL_HOURS            "01"
    46 //~ #define     BLDLVL_MINUTES          "01"
    47 //~ #define     BLDLVL_SECONDS          "00"
    4870#define     BLDLVL_HOURS            "23"
    4971#define     BLDLVL_MINUTES          "59"
    5072#define     BLDLVL_SECONDS          "59"
    5173
    52 // Build language
    53 #define     BLDLVL_LANGUAGE         "EN"
     74#endif

  • trunk/include/version.inc

    r179 r188  
    1717;  AiR-BOOT. If not, see <http://www.gnu.org/licenses/>.
    1818;
     19
     20
     21;
     22; AiR-BOOT Version Information.
     23;
     24; First we define the numeric (BCD) AiR-BOOT version information.
     25; This is used to derive ASCII and other representations.
     26;
     27
     28IFDEF   RELEASE
     29
     30; AiR-BOOT version conform WarpIN format with implicit 0 as fourth number.
     31; Note that the config-version is managed manually.
     32AB_MAJOR_VERSION    EQU     1
     33AB_MIDDLE_VERSION   EQU     1
     34AB_MINOR_VERSION    EQU     2
     35
     36; The Year, Month and Day in BCD so we can easily extract nibbles.
     37AB_YEAR             EQU     2017h
     38AB_MONTH            EQU     04h
     39AB_DAY              EQU     13h
     40
     41; The Hours, Minutes and Seconds, again in BCD for easy manipulation.
     42AB_HOURS            EQU     01h
     43AB_MINUTES          EQU     01h
     44AB_SECONDS          EQU     02h
     45
     46ELSE
     47
     48; AiR-BOOT version conform WarpIN format with implicit 0 as fourth number.
     49; Note that the config-version is managed manually.
     50AB_MAJOR_VERSION    EQU     1
     51AB_MIDDLE_VERSION   EQU     1
     52AB_MINOR_VERSION    EQU     1
     53
     54; The Year, Month and Day in BCD so we can easily extract nibbles.
     55AB_YEAR             EQU     2017h
     56AB_MONTH            EQU     04h
     57AB_DAY              EQU     13h
     58
     59; The Hours, Minutes and Seconds, again in BCD for easy manipulation.
     60AB_HOURS            EQU     23h
     61AB_MINUTES          EQU     59h
     62AB_SECONDS          EQU     59h
     63
     64ENDIF
     65
     66; The AiR-BOOT signature uses big-endian so we shuffle some bits around.
     67AB_SIG_VERSION      EQU     (((AB_MIDDLE_VERSION SHL 4) OR AB_MINOR_VERSION) SHL 8) OR AB_MAJOR_VERSION
     68AB_SIG_YEAR         EQU     ((AB_YEAR SHR 8) OR (AB_YEAR SHL 8) AND 0FFFFh)
     69AB_SIG_DATE         EQU     (AB_MONTH SHL 8) OR AB_DAY
     70
    1971
    2072;
    … …  
    51103; e0h bright yellow
    52104; f0h bright white
    53 
    54 ;
    55 ; AiR-BOOT Version Information.
    56 ;
    57 
    58 ;
    59 ; First we define the numeric (BCD) AiR-BOOT version information.
    60 ; This is used to derive ASCII and other representations.
    61 ;
    62 
    63 ; AiR-BOOT version conform WarpIN format with implicit 0 as fourth number.
    64 ; Note that the config-version is managed manually.
    65 AB_MAJOR_VERSION    EQU     1
    66 AB_MIDDLE_VERSION   EQU     1
    67 AB_MINOR_VERSION    EQU     1
    68 
    69 ; The Year, Month and Day in BCD so we can easily extract nibbles.
    70 AB_YEAR             EQU     2017h
    71 AB_MONTH            EQU     04h
    72 AB_DAY              EQU     13h
    73 
    74 ; The Hours, Minutes and Seconds, again in BCD for easy manipulation.
    75 ;~ AB_HOURS            EQU     01h
    76 ;~ AB_MINUTES          EQU     01h
    77 ;~ AB_SECONDS          EQU     01h
    78 AB_HOURS            EQU     23h
    79 AB_MINUTES          EQU     59h
    80 AB_SECONDS          EQU     59h
    81 
    82 ; The AiR-BOOT signature uses big-endian so we shuffle some bits around.
    83 AB_SIG_VERSION      EQU     (((AB_MIDDLE_VERSION SHL 4) OR AB_MINOR_VERSION) SHL 8) OR AB_MAJOR_VERSION
    84 AB_SIG_YEAR         EQU     ((AB_YEAR SHR 8) OR (AB_YEAR SHL 8) AND 0FFFFh)
    85 AB_SIG_DATE         EQU     (AB_MONTH SHL 8) OR AB_DAY
    86 
Note: See TracChangeset for help on using the changeset viewer.