Changeset 6068476 in mainline


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

Files:
9 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        ]

  • kernel/generic/src/main/version.c

    r7749646 r6068476  
    3838
    3939static const char *project = "SPARTAN kernel";
    40 static const char *copyright = STRING(COPYRIGHT);
    41 static const char *release = STRING(RELEASE);
    42 static const char *name = STRING(NAME);
     40static const char *copyright = STRING(HELENOS_COPYRIGHT);
     41static const char *release = STRING(HELENOS_RELEASE);
     42static const char *name = STRING(HELENOS_CODENAME);
    4343static const char *arch = STRING(KARCH);
    4444

  • kernel/meson.build

    r7749646 r6068476  
    3131        '-D_HELENOS_SOURCE',
    3232        '-DKERNEL',
    33         '-DRELEASE=' + HELENOS_RELEASE,
    34         '-DCOPYRIGHT=' + HELENOS_COPYRIGHT,
    35         '-DNAME=' + HELENOS_NAME,
     33        '-DHELENOS_RELEASE=' + HELENOS_RELEASE,
     34        '-DHELENOS_COPYRIGHT=' + HELENOS_COPYRIGHT,
     35        '-DHELENOS_CODENAME=' + HELENOS_CODENAME,
    3636        '-D__@0@_BITS__'.format(meson.get_cross_property('bits')),
    3737]

  • meson/part/read_config/meson.build

    r7749646 r6068476  
    101101# Also read version information.
    102102_version_variables = [
    103         'COPYRIGHT',
    104         'NAME',
    105         'PATCHLEVEL',
    106         'SUBLEVEL',
    107         'VERSION',
     103        'HELENOS_COPYRIGHT',
     104        'HELENOS_CODENAME',
     105        'HELENOS_RELEASE',
    108106]
    109107
    … …  
    112110        _val = _line.split('=')[1].strip()
    113111
    114         _realvarname = 'HELENOS_' + _varname
    115         set_variable(_realvarname, _val)
     112        set_variable(_varname, _val)
    116113        if debug_options
    117                 message([ _realvarname, get_variable(_realvarname) ])
     114                message([ _varname, get_variable(_varname) ])
    118115        endif
    119116endforeach
    120 
    121 HELENOS_RELEASE = HELENOS_VERSION + '.' + HELENOS_PATCHLEVEL + '.' + HELENOS_SUBLEVEL

  • uspace/app/download/main.c

    r7749646 r6068476  
    4949#define NAME "download"
    5050#ifdef TIMESTAMP_UNIX
    51 #define VERSION STRING(RELEASE) "-" STRING(TIMESTAMP_UNIX)
     51#define VERSION STRING(HELENOS_RELEASE) "-" STRING(TIMESTAMP_UNIX)
    5252#else
    53 #define VERSION STRING(RELEASE)
     53#define VERSION STRING(HELENOS_RELEASE)
    5454#endif
    5555#define USER_AGENT "HelenOS-" NAME "/" VERSION

  • uspace/app/getterm/meson.build

    r7749646 r6068476  
    1 c_args += [ '-DRELEASE=' + HELENOS_RELEASE, '-DCOPYRIGHT=' + HELENOS_COPYRIGHT, '-DNAME=' + HELENOS_NAME ]
     1c_args += [ '-DHELENOS_RELEASE=' + HELENOS_RELEASE, '-DHELENOS_COPYRIGHT=' + HELENOS_COPYRIGHT, '-DHELENOS_CODENAME=' + HELENOS_CODENAME ]
    22src = files(
    33        'getterm.c',

  • uspace/app/getterm/version.c

    r7749646 r6068476  
    3939#include "version.h"
    4040
    41 static const char *copyright = STRING(COPYRIGHT);
    42 static const char *release = STRING(RELEASE);
    43 static const char *name = STRING(NAME);
     41static const char *copyright = STRING(HELENOS_COPYRIGHT);
     42static const char *release = STRING(HELENOS_RELEASE);
     43static const char *name = STRING(HELENOS_CODENAME);
    4444static const char *arch = STRING(UARCH);
    4545

  • version

    r7749646 r6068476  
    2727#
    2828
    29 ## This file defines the release information of HelenOS.
    30 #
    31 # The release string RELEASE consists of three or four components
    32 # (version, patch level, sublevel and optionally an extra level).
    33 #
    34 # The NAME string is the code name of the given release.
    35 #
    3629
    37 VERSION = 0
    38 PATCHLEVEL = 9
    39 SUBLEVEL = 1
    40 
    41 ifdef EXTRAVERSION
    42         RELEASE = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL).$(EXTRAVERSION)
    43 else
    44         RELEASE = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
    45 endif
    46 
    47 NAME = Armonia
    48 COPYRIGHT = Copyright (c) 2001-2019 HelenOS project
     30HELENOS_RELEASE = 0.9.1
     31HELENOS_CODENAME = Armonia
     32HELENOS_COPYRIGHT = Copyright (c) 2001-2019 HelenOS project
Note: See TracChangeset for help on using the changeset viewer.