Changeset 188 for trunk/include


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/include
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • 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.