Changeset f3d47c97 in mainline

Timestamp:

2018-03-11T20:38:03Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a35a3d8

Parents:

84239b1

Message:

Bdsh's xxx_def.h files are not valid headers.

Location:

uspace/app/bdsh/cmds

Files:

• builtins/batch/batch_def.inc (moved) (moved from uspace/app/bdsh/cmds/builtins/batch/batch_def.h )
• builtins/builtins.h (modified) (1 diff)
• builtins/cd/cd_def.inc (moved) (moved from uspace/app/bdsh/cmds/builtins/cd/cd_def.h )
• builtins/exit/exit_def.inc (moved) (moved from uspace/app/bdsh/cmds/builtins/exit/exit_def.h )
• mknewcmd (modified) (2 diffs)
• modules/cat/cat_def.inc (moved) (moved from uspace/app/bdsh/cmds/modules/cat/cat_def.h )
• modules/cmp/cmp_def.inc (moved) (moved from uspace/app/bdsh/cmds/modules/cmp/cmp_def.h )
• modules/cp/cp_def.inc (moved) (moved from uspace/app/bdsh/cmds/modules/cp/cp_def.h )
• modules/echo/echo_def.inc (moved) (moved from uspace/app/bdsh/cmds/modules/echo/echo_def.h )
• modules/help/help_def.inc (moved) (moved from uspace/app/bdsh/cmds/modules/help/help_def.h )
• modules/kcon/kcon_def.inc (moved) (moved from uspace/app/bdsh/cmds/modules/kcon/kcon_def.h )
• modules/ls/ls_def.inc (moved) (moved from uspace/app/bdsh/cmds/modules/ls/ls_def.h )
• modules/mkdir/mkdir_def.inc (moved) (moved from uspace/app/bdsh/cmds/modules/mkdir/mkdir_def.h )
• modules/mkfile/mkfile_def.inc (moved) (moved from uspace/app/bdsh/cmds/modules/mkfile/mkfile_def.h )
• modules/modules.h (modified) (1 diff)
• modules/mount/mount_def.inc (moved) (moved from uspace/app/bdsh/cmds/modules/mount/mount_def.h )
• modules/mv/mv_def.inc (moved) (moved from uspace/app/bdsh/cmds/modules/mv/mv_def.h )
• modules/printf/printf_def.inc (moved) (moved from uspace/app/bdsh/cmds/modules/printf/printf_def.h )
• modules/pwd/pwd_def.inc (moved) (moved from uspace/app/bdsh/cmds/modules/pwd/pwd_def.h )
• modules/rm/rm_def.inc (moved) (moved from uspace/app/bdsh/cmds/modules/rm/rm_def.h )
• modules/sleep/sleep_def.inc (moved) (moved from uspace/app/bdsh/cmds/modules/sleep/sleep_def.h )
• modules/touch/touch_def.inc (moved) (moved from uspace/app/bdsh/cmds/modules/touch/touch_def.h )
• modules/unmount/unmount_def.inc (moved) (moved from uspace/app/bdsh/cmds/modules/unmount/unmount_def.h )

uspace/app/bdsh/cmds/builtins/builtins.h

@@ -9 +9 @@
 
 builtin_t builtins[] = {
-#include "batch/batch_def.h"
-#include "cd/cd_def.h"
-#include "exit/exit_def.h"
+#include "batch/batch_def.inc"
+#include "cd/cd_def.inc"
+#include "exit/exit_def.inc"
         {NULL, NULL, NULL, NULL, 0}
 };

uspace/app/bdsh/cmds/mknewcmd

@@ -90 +90 @@
 generate_code()
 {
-        echo "Creating ${OUTDIR}/${CMDNAME}_def.h ..."
-        cat << EOF > ${OUTDIR}/${CMDNAME}_def.h
+        echo "Creating ${OUTDIR}/${CMDNAME}_def.inc ..."
+        cat << EOF > ${OUTDIR}/${CMDNAME}_def.inc
 {
         "${CMDNAME}",
@@ -100 +100 @@
 
 EOF
-        [ -n "${CMDALIAS}" ] && cat << EOF >> ${OUTDIR}/${CMDNAME}_def.h
+        [ -n "${CMDALIAS}" ] && cat << EOF >> ${OUTDIR}/${CMDNAME}_def.inc
 {
         "${CMDALIAS}",

uspace/app/bdsh/cmds/modules/modules.h

@@ -69 +69 @@
 
 module_t modules[] = {
-#include "help/help_def.h"
-#include "mkdir/mkdir_def.h"
-#include "mkfile/mkfile_def.h"
-#include "rm/rm_def.h"
-#include "cat/cat_def.h"
-#include "touch/touch_def.h"
-#include "ls/ls_def.h"
-#include "pwd/pwd_def.h"
-#include "sleep/sleep_def.h"
-#include "cp/cp_def.h"
-#include "mv/mv_def.h"
-#include "mount/mount_def.h"
-#include "unmount/unmount_def.h"
-#include "kcon/kcon_def.h"
-#include "printf/printf_def.h"
-#include "echo/echo_def.h"
-#include "cmp/cmp_def.h"
+#include "help/help_def.inc"
+#include "mkdir/mkdir_def.inc"
+#include "mkfile/mkfile_def.inc"
+#include "rm/rm_def.inc"
+#include "cat/cat_def.inc"
+#include "touch/touch_def.inc"
+#include "ls/ls_def.inc"
+#include "pwd/pwd_def.inc"
+#include "sleep/sleep_def.inc"
+#include "cp/cp_def.inc"
+#include "mv/mv_def.inc"
+#include "mount/mount_def.inc"
+#include "unmount/unmount_def.inc"
+#include "kcon/kcon_def.inc"
+#include "printf/printf_def.inc"
+#include "echo/echo_def.inc"
+#include "cmp/cmp_def.inc"
 
         {NULL, NULL, NULL, NULL}