Changeset 3e828ea in mainline for uspace/app/bdsh/meson.build

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• uspace/app/bdsh/meson.build (moved) (moved from uspace/app/bdsh/Makefile ) (1 diff)

uspace/app/bdsh/meson.build

@@ -28 +28 @@
 #
 
-USPACE_PREFIX = ../..
-LIBS = clui fmtutil
-EXTRA_CFLAGS = -I. -Icmds/ -Icmds/builtins -Icmds/modules
-BINARY = bdsh
+deps = [ 'clui', 'fmtutil' ]
+includes += include_directories('.', 'cmds', 'cmds/builtins', 'cmds/modules')
+src = files(
+        'cmds/builtin_cmds.c',
+        'cmds/builtins/batch/batch.c',
+        'cmds/builtins/builtin_aliases.c',
+        'cmds/builtins/builtins.c',
+        'cmds/builtins/cd/cd.c',
+        'cmds/builtins/exit/exit.c',
+        'cmds/mod_cmds.c',
+        'cmds/modules/alias/alias.c',
+        'cmds/modules/cat/cat.c',
+        'cmds/modules/cmp/cmp.c',
+        'cmds/modules/cp/cp.c',
+        'cmds/modules/echo/echo.c',
+        'cmds/modules/help/help.c',
+        'cmds/modules/kcon/kcon.c',
+        'cmds/modules/ls/ls.c',
+        'cmds/modules/mkdir/mkdir.c',
+        'cmds/modules/mkfile/mkfile.c',
+        'cmds/modules/module_aliases.c',
+        'cmds/modules/modules.c',
+        'cmds/modules/mount/mount.c',
+        'cmds/modules/mv/mv.c',
+        'cmds/modules/printf/printf.c',
+        'cmds/modules/pwd/pwd.c',
+        'cmds/modules/rm/rm.c',
+        'cmds/modules/sleep/sleep.c',
+        'cmds/modules/touch/touch.c',
+        'cmds/modules/unalias/unalias.c',
+        'cmds/modules/unmount/unmount.c',
+        'compl.c',
+        'errors.c',
+        'exec.c',
+        'input.c',
+        'scli.c',
+        'tok.c',
+        'util.c',
+)
 
-SOURCES = \
-        cmds/modules/module_aliases.c \
-        cmds/modules/modules.c \
-        cmds/modules/help/help.c \
-        cmds/modules/mkdir/mkdir.c \
-        cmds/modules/mkfile/mkfile.c \
-        cmds/modules/rm/rm.c \
-        cmds/modules/cat/cat.c \
-        cmds/modules/touch/touch.c \
-        cmds/modules/ls/ls.c \
-        cmds/modules/pwd/pwd.c \
-        cmds/modules/sleep/sleep.c \
-        cmds/modules/cp/cp.c \
-        cmds/modules/mv/mv.c \
-        cmds/modules/printf/printf.c \
-        cmds/modules/echo/echo.c \
-        cmds/modules/mount/mount.c \
-        cmds/modules/unmount/unmount.c \
-        cmds/modules/kcon/kcon.c \
-        cmds/modules/cmp/cmp.c \
-        cmds/builtins/builtin_aliases.c \
-        cmds/builtins/builtins.c \
-        cmds/builtins/batch/batch.c \
-        cmds/builtins/exit/exit.c \
-        cmds/builtins/cd/cd.c \
-        cmds/mod_cmds.c \
-        cmds/builtin_cmds.c \
-        compl.c \
-        errors.c \
-        input.c \
-        util.c \
-        exec.c \
-        scli.c \
-        tok.c
+test_src = files(
+        'tok.c',
+        'test/toktest.c',
+)
 
-TEST_SOURCES = \
-        tok.c \
-        test/toktest.c
-
-include $(USPACE_PREFIX)/Makefile.common
+# TODO: install this file somewhere sane
+installed_data += { 'name': 'demo.txt', 'dir': '/' }