Changeset be1dcc26 in mainline
- Timestamp:
- 2012-10-05T06:59:17Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- d948095
- Parents:
- faa45c17 (diff), 6cd10ac (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. - Files:
-
- 68 added
- 5 edited
-
boot/Makefile.common (modified) (1 diff)
-
uspace/Makefile (modified) (2 diffs)
-
uspace/Makefile.common (modified) (1 diff)
-
uspace/app/bdsh/Makefile (modified) (1 diff)
-
uspace/app/bdsh/cmds/modules/cmp/cmp.c (added)
-
uspace/app/bdsh/cmds/modules/cmp/cmp.h (added)
-
uspace/app/bdsh/cmds/modules/cmp/cmp_def.h (added)
-
uspace/app/bdsh/cmds/modules/cmp/entry.h (added)
-
uspace/app/bdsh/cmds/modules/modules.h (modified) (2 diffs)
-
uspace/app/bithenge/Makefile (added)
-
uspace/app/bithenge/Makefile.linux (added)
-
uspace/app/bithenge/test.c (added)
-
uspace/dist/src/bithenge/basic.bh (added)
-
uspace/dist/src/bithenge/basic.dat (added)
-
uspace/dist/src/bithenge/basic.out (added)
-
uspace/dist/src/bithenge/bits.bh (added)
-
uspace/dist/src/bithenge/bits.dat (added)
-
uspace/dist/src/bithenge/bits.out (added)
-
uspace/dist/src/bithenge/cond.bh (added)
-
uspace/dist/src/bithenge/cond.dat (added)
-
uspace/dist/src/bithenge/cond.out (added)
-
uspace/dist/src/bithenge/expression.bh (added)
-
uspace/dist/src/bithenge/expression.dat (added)
-
uspace/dist/src/bithenge/expression.out (added)
-
uspace/dist/src/bithenge/fat.bh (added)
-
uspace/dist/src/bithenge/fat.dat (added)
-
uspace/dist/src/bithenge/fat.out (added)
-
uspace/dist/src/bithenge/gif/blue_1x1.gif (added)
-
uspace/dist/src/bithenge/gif/gif.bh (added)
-
uspace/dist/src/bithenge/gif/helenos.gif (added)
-
uspace/dist/src/bithenge/gif/loader.gif (added)
-
uspace/dist/src/bithenge/gif/readme (added)
-
uspace/dist/src/bithenge/repeat.bh (added)
-
uspace/dist/src/bithenge/repeat.dat (added)
-
uspace/dist/src/bithenge/repeat.out (added)
-
uspace/dist/src/bithenge/test.bdsh (added)
-
uspace/dist/src/bithenge/test.sh (added)
-
uspace/dist/src/bithenge/trip.bh (added)
-
uspace/dist/src/bithenge/trip.dat (added)
-
uspace/dist/src/bithenge/trip.out (added)
-
uspace/dist/src/bithenge/usbdesc.bh (added)
-
uspace/dist/src/bithenge/usbdesc.kbd.dat (added)
-
uspace/dist/src/bithenge/usbdesc.kbd.out (added)
-
uspace/lib/bithenge/Makefile (added)
-
uspace/lib/bithenge/Makefile.linux (added)
-
uspace/lib/bithenge/include/bithenge/blob.h (added)
-
uspace/lib/bithenge/include/bithenge/compound.h (added)
-
uspace/lib/bithenge/include/bithenge/expression.h (added)
-
uspace/lib/bithenge/include/bithenge/file.h (added)
-
uspace/lib/bithenge/include/bithenge/os.h (added)
-
uspace/lib/bithenge/include/bithenge/print.h (added)
-
uspace/lib/bithenge/include/bithenge/script.h (added)
-
uspace/lib/bithenge/include/bithenge/sequence.h (added)
-
uspace/lib/bithenge/include/bithenge/source.h (added)
-
uspace/lib/bithenge/include/bithenge/transform.h (added)
-
uspace/lib/bithenge/include/bithenge/tree.h (added)
-
uspace/lib/bithenge/src/blob.c (added)
-
uspace/lib/bithenge/src/common.h (added)
-
uspace/lib/bithenge/src/compound.c (added)
-
uspace/lib/bithenge/src/expression.c (added)
-
uspace/lib/bithenge/src/failure.c (added)
-
uspace/lib/bithenge/src/failure.h (added)
-
uspace/lib/bithenge/src/file.c (added)
-
uspace/lib/bithenge/src/helenos/block.c (added)
-
uspace/lib/bithenge/src/helenos/block.h (added)
-
uspace/lib/bithenge/src/helenos/common.h (added)
-
uspace/lib/bithenge/src/linux/common.h (added)
-
uspace/lib/bithenge/src/print.c (added)
-
uspace/lib/bithenge/src/script.c (added)
-
uspace/lib/bithenge/src/sequence.c (added)
-
uspace/lib/bithenge/src/source.c (added)
-
uspace/lib/bithenge/src/transform.c (added)
-
uspace/lib/bithenge/src/tree.c (added)
Legend:
- Unmodified
- Added
- Removed
-
boot/Makefile.common
rfaa45c17 rbe1dcc26 159 159 160 160 RD_APPS_NON_ESSENTIAL = \ 161 $(USPACE_PATH)/app/bithenge/bithenge \ 161 162 $(USPACE_PATH)/app/blkdump/blkdump \ 162 163 $(USPACE_PATH)/app/bnchmark/bnchmark \ -
uspace/Makefile
rfaa45c17 rbe1dcc26 35 35 DIRS = \ 36 36 app/bdsh \ 37 app/bithenge \ 37 38 app/blkdump \ 38 39 app/bnchmark \ … … 219 220 lib/usbhid \ 220 221 lib/usbvirt \ 222 lib/bithenge \ 221 223 lib/posix 222 224 -
uspace/Makefile.common
rfaa45c17 rbe1dcc26 134 134 LIBSCSI_PREFIX = $(LIB_PREFIX)/scsi 135 135 136 LIBBITHENGE_PREFIX = $(LIB_PREFIX)/bithenge 137 136 138 ifeq ($(STATIC_NEEDED),y) 137 139 STATIC_BUILD = y -
uspace/app/bdsh/Makefile
rfaa45c17 rbe1dcc26 53 53 cmds/modules/unmount/unmount.c \ 54 54 cmds/modules/kcon/kcon.c \ 55 cmds/modules/cmp/cmp.c \ 55 56 cmds/builtins/batch/batch.c \ 56 57 cmds/builtins/exit/exit.c \ -
uspace/app/bdsh/cmds/modules/modules.h
rfaa45c17 rbe1dcc26 63 63 #include "printf/entry.h" 64 64 #include "echo/entry.h" 65 #include "cmp/entry.h" 65 66 66 67 /* Each .def function fills the module_t struct with the individual name, entry … … 86 87 #include "printf/printf_def.h" 87 88 #include "echo/echo_def.h" 89 #include "cmp/cmp_def.h" 88 90 89 91 {NULL, NULL, NULL, NULL}
Note:
See TracChangeset
for help on using the changeset viewer.
