Changeset 32b4302 in mainline for uspace/app


Ignore:
Timestamp:
2019-08-18T19:06:02Z (7 years ago)
Author:
GitHub <noreply@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
1c39d33b
Parents:
fa70134 (diff), 6c2fac18 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-18 19:06:02)
git-committer:
GitHub <noreply@…> (2019-08-18 19:06:02)
Message:

Merge pull request #174 from le-jzr/meson3

Convert HelenOS build system to Meson

Location:
uspace/app
Files:
41 added
29 deleted
2 edited
29 moved

Legend:

Unmodified
Added
Removed

  • uspace/app/bdsh/meson.build

    rfa70134 r32b4302  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 LIBS = clui fmtutil
    32 EXTRA_CFLAGS = -I. -Icmds/ -Icmds/builtins -Icmds/modules
    33 BINARY = bdsh
     30deps = [ 'clui', 'fmtutil' ]
     31includes += include_directories('.', 'cmds', 'cmds/builtins', 'cmds/modules')
     32src = files(
     33        'cmds/builtin_cmds.c',
     34        'cmds/builtins/batch/batch.c',
     35        'cmds/builtins/builtin_aliases.c',
     36        'cmds/builtins/builtins.c',
     37        'cmds/builtins/cd/cd.c',
     38        'cmds/builtins/exit/exit.c',
     39        'cmds/mod_cmds.c',
     40        'cmds/modules/alias/alias.c',
     41        'cmds/modules/cat/cat.c',
     42        'cmds/modules/cmp/cmp.c',
     43        'cmds/modules/cp/cp.c',
     44        'cmds/modules/echo/echo.c',
     45        'cmds/modules/help/help.c',
     46        'cmds/modules/kcon/kcon.c',
     47        'cmds/modules/ls/ls.c',
     48        'cmds/modules/mkdir/mkdir.c',
     49        'cmds/modules/mkfile/mkfile.c',
     50        'cmds/modules/module_aliases.c',
     51        'cmds/modules/modules.c',
     52        'cmds/modules/mount/mount.c',
     53        'cmds/modules/mv/mv.c',
     54        'cmds/modules/printf/printf.c',
     55        'cmds/modules/pwd/pwd.c',
     56        'cmds/modules/rm/rm.c',
     57        'cmds/modules/sleep/sleep.c',
     58        'cmds/modules/touch/touch.c',
     59        'cmds/modules/unalias/unalias.c',
     60        'cmds/modules/unmount/unmount.c',
     61        'compl.c',
     62        'errors.c',
     63        'exec.c',
     64        'input.c',
     65        'scli.c',
     66        'tok.c',
     67        'util.c',
     68)
    3469
    35 SOURCES = \
    36         cmds/modules/module_aliases.c \
    37         cmds/modules/modules.c \
    38         cmds/modules/alias/alias.c \
    39         cmds/modules/unalias/unalias.c \
    40         cmds/modules/help/help.c \
    41         cmds/modules/mkdir/mkdir.c \
    42         cmds/modules/mkfile/mkfile.c \
    43         cmds/modules/rm/rm.c \
    44         cmds/modules/cat/cat.c \
    45         cmds/modules/touch/touch.c \
    46         cmds/modules/ls/ls.c \
    47         cmds/modules/pwd/pwd.c \
    48         cmds/modules/sleep/sleep.c \
    49         cmds/modules/cp/cp.c \
    50         cmds/modules/mv/mv.c \
    51         cmds/modules/printf/printf.c \
    52         cmds/modules/echo/echo.c \
    53         cmds/modules/mount/mount.c \
    54         cmds/modules/unmount/unmount.c \
    55         cmds/modules/kcon/kcon.c \
    56         cmds/modules/cmp/cmp.c \
    57         cmds/builtins/builtin_aliases.c \
    58         cmds/builtins/builtins.c \
    59         cmds/builtins/batch/batch.c \
    60         cmds/builtins/exit/exit.c \
    61         cmds/builtins/cd/cd.c \
    62         cmds/mod_cmds.c \
    63         cmds/builtin_cmds.c \
    64         compl.c \
    65         errors.c \
    66         input.c \
    67         util.c \
    68         exec.c \
    69         scli.c \
    70         tok.c
     70test_src = files(
     71        'tok.c',
     72        'test/toktest.c',
     73)
    7174
    72 TEST_SOURCES = \
    73         tok.c \
    74         test/toktest.c
    75 
    76 include $(USPACE_PREFIX)/Makefile.common
     75# TODO: install this file somewhere sane
     76installed_data += { 'name': 'demo.txt', 'dir': '/' }

  • uspace/app/blkdump/meson.build

    rfa70134 r32b4302  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 BINARY = klog
    32 
    33 SOURCES = \
    34         klog.c
    35 
    36 include $(USPACE_PREFIX)/Makefile.common
     30deps = [ 'block', 'scsi' ]
     31src = files('blkdump.c')

  • uspace/app/contacts/meson.build

    rfa70134 r32b4302  
    11#
    2 # Copyright (c) 2010 Martin Decky
     2# Copyright (c) 2018 Jiri Svoboda
    33# All rights reserved.
    44#
    … …  
    2727#
    2828
    29 BOOT_OUTPUT =
    30 RAW =
    31 JOB =
    32 MAP =
    33 PREBUILD =
    34 BUILD = Makefile.empty
     29deps = [ 'clui', 'sif' ]
     30src = files('contacts.c')

  • uspace/app/date/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 USPACE_PREFIX = ../..
    30 BINARY = date
    31 
    32 SOURCES = \
    33         date.c
    34 
    35 include $(USPACE_PREFIX)/Makefile.common
     29src = files('date.c')

  • uspace/app/devctl/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 USPACE_PREFIX = ../..
    30 BINARY = loc
    31 
    32 SOURCES = \
    33         loc.c
    34 
    35 include $(USPACE_PREFIX)/Makefile.common
     29src = files('devctl.c')

  • uspace/app/df/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 USPACE_PREFIX = ../..
    30 BINARY = df
    31 
    32 SOURCES = \
    33         df.c
    34 
    35 include $(USPACE_PREFIX)/Makefile.common
     29src = files('df.c')

  • uspace/app/download/main.c

    rfa70134 r32b4302  
    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/download/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 USPACE_PREFIX = ../../..
    30 LIBS = graph
    31 BINARY = rfb
    32 
    33 SOURCES = \
    34         main.c \
    35         rfb.c
    36 
    37 include $(USPACE_PREFIX)/Makefile.common
     29deps = [ 'http', 'uri' ]
     30c_args += ('-DRELEASE=' + HELENOS_RELEASE)
     31src = files('main.c')

  • uspace/app/edit/meson.build

    rfa70134 r32b4302  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 BINARY = stats
    32 
    33 SOURCES = \
    34         stats.c
    35 
    36 include $(USPACE_PREFIX)/Makefile.common
     30src = files(
     31        'edit.c',
     32        'search.c',
     33        'sheet.c',
     34)

  • uspace/app/getterm/version.c

    rfa70134 r32b4302  
    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

  • uspace/app/gunzip/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 USPACE_PREFIX = ../..
    30 BINARY = vol
    31 
    32 SOURCES = \
    33         vol.c
    34 
    35 include $(USPACE_PREFIX)/Makefile.common
     29deps = [ 'compress' ]
     30src = files('gunzip.c')

  • uspace/app/hbench/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 USPACE_PREFIX = ../..
    30 BINARY = contacts
    31 LIBS = clui sif
    32 
    33 SOURCES = \
    34         contacts.c
    35 
    36 include $(USPACE_PREFIX)/Makefile.common
     29deps = [ 'math' ]
     30src = files(
     31        'benchlist.c',
     32        'csv.c',
     33        'env.c',
     34        'main.c',
     35        'utils.c',
     36        'fs/dirread.c',
     37        'fs/fileread.c',
     38        'ipc/ns_ping.c',
     39        'ipc/ping_pong.c',
     40        'malloc/malloc1.c',
     41        'malloc/malloc2.c',
     42        'synch/fibril_mutex.c',
     43)

  • uspace/app/inet/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 USPACE_PREFIX = ../..
    30 BINARY = inet
    31 
    32 SOURCES = \
    33         inet.c
    34 
    35 include $(USPACE_PREFIX)/Makefile.common
     29src = files('inet.c')

  • uspace/app/init/meson.build

    rfa70134 r32b4302  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 BINARY = redir
    32 
    33 SOURCES = \
    34         redir.c
    35 
    36 include $(USPACE_PREFIX)/Makefile.common
     30deps = [ 'untar', 'block' ]
     31link_args += '-static'
     32src = files('init.c', 'untar.c')

  • uspace/app/killall/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 ENDIANESS = LE
     29src = files('killall.c')

  • uspace/app/kio/meson.build

    rfa70134 r32b4302  
    11#
    22# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 COMMON_CFLAGS += -fno-unwind-tables
    30 LDFLAGS += -Wl,--gc-sections
    31 
    32 ENDIANESS = LE
    33 
     30deps = [ 'clui' ]
     31src = files('kio.c')

  • uspace/app/logset/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 USPACE_PREFIX = ../..
    30 BINARY = logset
    31 
    32 SOURCES = \
    33         main.c
    34 
    35 include $(USPACE_PREFIX)/Makefile.common
     29src = files('main.c')

  • uspace/app/meson.build

    rfa70134 r32b4302  
    11#
    2 # Copyright (c) 2005 Martin Decky
    3 # Copyright (c) 2007 Jakub Jermar
    4 # Copyright (c) 2012 Julia Medvedeva
     2# Copyright (c) 2019 Jiří Zárevúcky
    53# All rights reserved.
    64#
    … …  
    2927#
    3028
    31 USPACE_PREFIX = ../../..
    32 LIBS = block fs
    33 BINARY = udf
     29apps = [
     30        'barber',
     31        'bdsh',
     32        'bithenge',
     33        'blkdump',
     34        'contacts',
     35        'corecfg',
     36        'cpptest',
     37        'date',
     38        'devctl',
     39        'df',
     40        'dnscfg',
     41        'dnsres',
     42        'download',
     43        'edit',
     44        'fdisk',
     45        'fontviewer',
     46        'getterm',
     47        'gunzip',
     48        'hbench',
     49        'inet',
     50        'init',
     51        'kill',
     52        'killall',
     53        'kio',
     54        'loc',
     55        'logset',
     56        'lprint',
     57        'mixerctl',
     58        'mkbd',
     59        'mkexfat',
     60        'mkext4',
     61        'mkfat',
     62        'mkmfs',
     63        'modplay',
     64        'netecho',
     65        'nic',
     66        'nterm',
     67        'pci',
     68        'ping',
     69        'pkg',
     70        'redir',
     71        'sbi',
     72        'sportdmp',
     73        'stats',
     74        'sysinfo',
     75        'sysinst',
     76        'taskdump',
     77        'tester',
     78        'testread',
     79        'testrunner',
     80        'testwrit',
     81        'tetris',
     82        'tmon',
     83        'top',
     84        'trace',
     85        'untar',
     86        'usbinfo',
     87        'vcalc',
     88        'vdemo',
     89        'viewer',
     90        'vlaunch',
     91        'vol',
     92        'vterm',
     93        'vuhid',
     94        'wavplay',
     95        'websrv',
     96        'wifi_supplicant',
     97]
    3498
    35 SOURCES = \
    36         udf.c \
    37         udf_volume.c \
    38         udf_ops.c \
    39         udf_osta.c \
    40         udf_cksum.c \
    41         udf_file.c \
    42         udf_idx.c
    43 
    44 include $(USPACE_PREFIX)/Makefile.common
     99if CONFIG_BUILD_SHARED_LIBS
     100        apps += [
     101                'dltest',
     102                'dltests',
     103        ]
     104endif

  • uspace/app/mkext4/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 USPACE_PREFIX = ../..
    30 BINARY = lprint
    31 
    32 SOURCES = \
    33         lprint.c
    34 
    35 include $(USPACE_PREFIX)/Makefile.common
     29# FIXME remove transitive deps
     30deps = [ 'ext4', 'fs', 'block', 'crypto' ]
     31src = files('mkext4.c')

  • uspace/app/modplay/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 USPACE_PREFIX = ../../..
    30 LIBS = drv pcm
    31 BINARY = hdaudio
     29deps = [ 'trackmod', 'hound', 'pcm' ]
     30src = files('modplay.c')
    3231
    33 SOURCES = \
    34         codec.c \
    35         regif.c \
    36         hdactl.c \
    37         hdaudio.c \
    38         pcm_iface.c \
    39         stream.c
    40 
    41 include $(USPACE_PREFIX)/Makefile.common
     32if install_nonessential_data
     33        # TODO: install this file somewhere sane
     34        installed_data += { 'name': 'demo.xm', 'dir': '/' }
     35endif

  • uspace/app/pci/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 USPACE_PREFIX = ../..
    30 BINARY = pci
    31 
    32 SOURCES = \
    33         pci.c
    34 
    35 include $(USPACE_PREFIX)/Makefile.common
     29src = files('pci.c')

  • uspace/app/sbi/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 USPACE_PREFIX = ../..
    30 LIBS =
    31 EXTRA_CFLAGS =
    32 BINARY = kill
    33 
    34 SOURCES = \
    35         kill.c
    36 
    37 include $(USPACE_PREFIX)/Makefile.common
     29deps = [ 'clui' ]
     30c_args += '-D__HELENOS__'
     31src = files(
     32        'src/builtin/bi_boxed.c',
     33        'src/builtin/bi_error.c',
     34        'src/builtin/bi_char.c',
     35        'src/builtin/bi_console.c',
     36        'src/builtin/bi_int.c',
     37        'src/builtin/bi_task.c',
     38        'src/builtin/bi_textfile.c',
     39        'src/builtin/bi_string.c',
     40        'src/os/helenos.c',
     41        'src/ancr.c',
     42        'src/bigint.c',
     43        'src/builtin.c',
     44        'src/cspan.c',
     45        'src/imode.c',
     46        'src/input.c',
     47        'src/intmap.c',
     48        'src/lex.c',
     49        'src/list.c',
     50        'src/main.c',
     51        'src/p_expr.c',
     52        'src/p_type.c',
     53        'src/parse.c',
     54        'src/program.c',
     55        'src/rdata.c',
     56        'src/run.c',
     57        'src/run_expr.c',
     58        'src/run_texpr.c',
     59        'src/stree.c',
     60        'src/strtab.c',
     61        'src/stype.c',
     62        'src/stype_expr.c',
     63        'src/symbol.c',
     64        'src/tdata.c',
     65)

  • uspace/app/sysinst/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 USPACE_PREFIX = ../..
    30 BINARY = nic
    31 LIBS = drv
    32 
    33 SOURCES = \
    34         nic.c
    35 
    36 include $(USPACE_PREFIX)/Makefile.common
     29deps = [ 'block', 'fdisk', 'sif' ]
     30src = files(
     31        'futil.c',
     32        'rdimg.c',
     33        'sysinst.c',
     34        'volume.c',
     35)

  • uspace/app/taskdump/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 USPACE_PREFIX = ../../..
    30 
    31 BINARY = s3c24xx_ts
    32 
    33 SOURCES = \
    34         s3c24xx_ts.c
    35 
    36 include $(USPACE_PREFIX)/Makefile.common
     29includes += include_directories('include')
     30src = files(
     31        'elf_core.c',
     32        'fibrildump.c',
     33        'taskdump.c',
     34        'symtab.c',
     35)

  • uspace/app/tetris/meson.build

    rfa70134 r32b4302  
    2828#
    2929
    30 USPACE_PREFIX = ../..
    31 LIBRARY = libfs
    32 
    33 SOURCES = \
    34         libfs.c
    35 
    36 include $(USPACE_PREFIX)/Makefile.common
     30src = files(
     31        'shapes.c',
     32        'scores.c',
     33        'tetris.c',
     34        'screen.c',
     35)

  • uspace/app/tmon/meson.build

    rfa70134 r32b4302  
    11#
    2 # Copyright (c) 2015 Petr Pavlu
     2# Copyright (c) 2017 Petr Manek
    33# All rights reserved.
    44#
    … …  
    2727#
    2828
    29 COMMON_CFLAGS += -fno-omit-frame-pointer
    30 
    31 LDFLAGS += -Wl,--gc-sections
    32 
    33 ENDIANESS = LE
    34 
     29deps = [ 'drv', 'usb' ]
     30src = files(
     31        'main.c',
     32        'list.c',
     33        'tf.c',
     34        'tests.c',
     35        'resolve.c',
     36)

  • uspace/app/usbinfo/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 USPACE_PREFIX = ../../..
    30 LIBS = drv
    31 BINARY = test1
    32 
    33 SOURCES = \
    34         test1.c
    35 
    36 include $(USPACE_PREFIX)/Makefile.common
     29deps = [ 'usbhid', 'usbdev', 'usb', 'drv' ]
     30src = files(
     31        'desctree.c',
     32        'dump.c',
     33        'hid.c',
     34        'info.c',
     35        'list.c',
     36        'main.c',
     37)

  • uspace/app/viewer/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 USPACE_PREFIX = ../..
     29deps = [ 'gui' ]
     30src = files('viewer.c')
    3031
    31 # TODO: Should be just "gui", rest is transitive dependencies.
    32 LIBS = gui draw softrend compress math
    33 
    34 BINARY = viewer
    35 
    36 SOURCES = \
    37         viewer.c
    38 
    39 include $(USPACE_PREFIX)/Makefile.common
     32if install_nonessential_data
     33        # TODO: install this file somewhere sane
     34        installed_data += { 'name': 'logo.tga', 'dir': '/' }
     35endif

  • uspace/app/vlaunch/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 USPACE_PREFIX = ../..
     29deps = [ 'gui' ]
    3030
    31 # TODO: Should be just "gui", rest is transitive dependencies.
    32 LIBS = gui draw softrend compress math
     31_images = files('gfx/helenos.tga')
    3332
    34 BINARY = vcalc
     33_images_zip = custom_target('vlaunch_images.zip',
     34        input : _images,
     35        output : [ 'images.zip' ],
     36        command : [ mkarray, '@OUTDIR@', 'images', 'image', uspace_as_prolog, '.data', '@INPUT@' ],
     37)
     38_imgs_s = custom_target('vlaunch_images.s',
     39        input : _images_zip,
     40        output : [ 'images.s' ],
     41        command : [ unzip, '-p', '@INPUT@', 'images.s' ],
     42        capture : true,
     43)
     44_imgs_h = custom_target('vlaunch_images.h',
     45        input : _images_zip,
     46        output : [ 'images.h' ],
     47        command : [ unzip, '-p', '@INPUT@', 'images.h' ],
     48        capture : true,
     49)
     50_imgs_desc_c = custom_target('vlaunch_images_desc.c',
     51        input : _images_zip,
     52        output : [ 'images_desc.c' ],
     53        command : [ unzip, '-p', '@INPUT@', 'images_desc.c' ],
     54        capture : true,
     55)
    3556
    36 SOURCES = \
    37         vcalc.c
    38 
    39 include $(USPACE_PREFIX)/Makefile.common
     57src = [ files('vlaunch.c'), _imgs_s, _imgs_h, _imgs_desc_c ]

  • uspace/app/vuhid/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 USPACE_PREFIX = ../../..
    30 
    31 LIBS = usbdev usb drv scsi
    32 
    33 BINARY = usbmast
    34 
    35 SOURCES = \
    36         bo_trans.c \
    37         cmdw.c \
    38         main.c \
    39         scsi_ms.c
    40 
    41 include $(USPACE_PREFIX)/Makefile.common
     29deps = [ 'usb', 'usbdev', 'usbhid', 'usbvirt', 'drv' ]
     30src = files(
     31        'main.c',
     32        'device.c',
     33        'ifaces.c',
     34        'life.c',
     35        'stdreq.c',
     36        'hids/bootkbd.c',
     37        'hids/logitech_wireless.c',
     38)

  • uspace/app/wavplay/meson.build

    rfa70134 r32b4302  
    2727#
    2828
    29 USPACE_PREFIX = ../..
    30 EXTRA_CFLAGS = -Iinclude/hound
    31 LIBRARY = libhound
    32 LIBS = pcm
     29deps = [ 'drv', 'hound', 'pcm' ]
     30src = files(
     31        'dplay.c',
     32        'drec.c',
     33        'main.c',
     34        'wave.c',
     35)
    3336
    34 SOURCES = \
    35         src/protocol.c \
    36         src/client.c
    37 include $(USPACE_PREFIX)/Makefile.common
    38 
     37if install_nonessential_data
     38        # TODO: install this file somewhere sane
     39        installed_data += { 'name': 'demo.wav', 'dir': '/' }
     40endif
Note: See TracChangeset for help on using the changeset viewer.