Changeset 2109961 in mainline


Ignore:
Timestamp:
2020-11-08T22:29:06Z (4 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b41564c
Parents:
a09d401
Message:

Rename vlaunch to launcher

Files:
3 edited
5 moved

Legend:

Unmodified
Added
Removed

  • meson/part/initrd_manifest/meson.build

    ra09d401 r2109961  
    6060if CONFIG_FB
    6161        rd_essential += [
    62                 'app/vlaunch',
     62                'app/launcher',
    6363                'app/vterm',
    6464

  • uspace/app/init/init.c

    ra09d401 r2109961  
    472472                if (rc == EOK) {
    473473                        app_start("/app/barber");
    474                         app_start("/app/vlaunch");
     474                        app_start("/app/launcher");
    475475                        app_start("/app/vterm");
    476476                }

  • uspace/app/launcher/doc/doxygroups.h

    ra09d401 r2109961  
    1 /** @addtogroup vlaunch vlaunch
     1/** @addtogroup launcher launcher
    22 * @brief Application launcher
    33 * @ingroup apps

  • uspace/app/launcher/launcher.c

    ra09d401 r2109961  
    2828 */
    2929
    30 /** @addtogroup vlaunch
     30/** @addtogroup launcher
    3131 * @{
    3232 */
    … …  
    5757
    5858#include "images.h"
    59 #include "vlaunch.h"
    60 
    61 #define NAME  "vlaunch"
     59#include "launcher.h"
     60
     61#define NAME  "launcher"
    6262
    6363static char *display_spec = UI_DISPLAY_DEFAULT;
    … …  
    105105                app_launch("/app/uidemo");
    106106        } else if (pbutton == launcher->pb4) {
    107                 app_launch("/app/vlaunch");
     107                app_launch("/app/launcher");
    108108        }
    109109}

  • uspace/app/launcher/launcher.h

    ra09d401 r2109961  
    2727 */
    2828
    29 /** @addtogroup vlaunch
     29/** @addtogroup launcher
    3030 * @{
    3131 */
    … …  
    3434 */
    3535
    36 #ifndef UIDEMO_H
    37 #define UIDEMO_H
     36#ifndef LAUNCHER_H
     37#define LAUNCHER_H
    3838
    3939#include <display.h>

  • uspace/app/launcher/meson.build

    ra09d401 r2109961  
    3131_images = files('gfx/helenos.tga')
    3232
    33 _images_zip = custom_target('vlaunch_images.zip',
     33_images_zip = custom_target('launcher_images.zip',
    3434        input : _images,
    3535        output : [ 'images.zip' ],
    3636        command : [ mkarray, '@OUTDIR@', 'images', 'image', uspace_as_prolog, '.data', '@INPUT@' ],
    3737)
    38 _imgs_s = custom_target('vlaunch_images.s',
     38_imgs_s = custom_target('launcher_images.s',
    3939        input : _images_zip,
    4040        output : [ 'images.s' ],
    … …  
    4242        capture : true,
    4343)
    44 _imgs_h = custom_target('vlaunch_images.h',
     44_imgs_h = custom_target('launcher_images.h',
    4545        input : _images_zip,
    4646        output : [ 'images.h' ],
    … …  
    4848        capture : true,
    4949)
    50 _imgs_desc_c = custom_target('vlaunch_images_desc.c',
     50_imgs_desc_c = custom_target('launcher_images_desc.c',
    5151        input : _images_zip,
    5252        output : [ 'images_desc.c' ],
    … …  
    5555)
    5656
    57 src = [ files('vlaunch.c'), _imgs_s, _imgs_h, _imgs_desc_c ]
     57src = [ files('launcher.c'), _imgs_s, _imgs_h, _imgs_desc_c ]

  • uspace/app/meson.build

    ra09d401 r2109961  
    5454        'killall',
    5555        'kio',
     56        'launcher',
    5657        'loc',
    5758        'logset',
    … …  
    9293        'vdemo',
    9394        'viewer',
    94         'vlaunch',
    9595        'vol',
    9696        'vterm',
Note: See TracChangeset for help on using the changeset viewer.