Changeset 6068476 in mainline for boot


Ignore:
Timestamp:
2019-08-17T12:49:44Z (6 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
05d97eef
Parents:
7749646
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-07-20 15:13:22)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:44)
Message:

Modify HelenOS version variables to use unambiguous names

Location:
boot
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • boot/generic/src/version.c

    r7749646 r6068476  
    3232
    3333static const char *project = "HelenOS bootloader";
    34 static const char *copyright = STRING(COPYRIGHT);
    35 static const char *release = STRING(RELEASE);
    36 static const char *name = STRING(NAME);
     34static const char *copyright = STRING(HELENOS_COPYRIGHT);
     35static const char *release = STRING(HELENOS_RELEASE);
     36static const char *name = STRING(HELENOS_CODENAME);
    3737static const char *arch = STRING(KARCH);
    3838

  • boot/meson.build

    r7749646 r6068476  
    5656                '-D_HELENOS_SOURCE',
    5757                '-DBOOT',
    58                 '-DRELEASE=' + HELENOS_RELEASE,
    59                 '-DCOPYRIGHT=' + HELENOS_COPYRIGHT,
    60                 '-DNAME=' + HELENOS_NAME,
     58                '-DHELENOS_RELEASE=' + HELENOS_RELEASE,
     59                '-DHELENOS_COPYRIGHT=' + HELENOS_COPYRIGHT,
     60                '-DHELENOS_CODENAME=' + HELENOS_CODENAME,
    6161                '-D__@0@_BITS__'.format(meson.get_cross_property('bits')),
    6262        ]
Note: See TracChangeset for help on using the changeset viewer.