projects
/
oweals
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e7798e4
)
implement real-time progress info for the package/target info collect (thanks to...
author
Felix Fietkau
<nbd@openwrt.org>
Tue, 19 Dec 2006 01:20:44 +0000
(
01:20
+0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Tue, 19 Dec 2006 01:20:44 +0000
(
01:20
+0000)
SVN-Revision: 5850
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 2dcb72763613604b738241fd817e1e558f0ac9be..447457e2694f7d1a45334ce3d672e8ae2cda4618 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-52,24
+52,31
@@
ifeq ($(FORCE),)
world: tmp/.prereq-packages tmp/.prereq-target
endif
world: tmp/.prereq-packages tmp/.prereq-target
endif
-tmp/.pkginfo:
+ifeq ($(IS_TTY),1)
+ define progress
+ printf "\033[M\r$(1)" >&2;
+ endef
+endif
+
+define dumpinfo
@mkdir -p tmp
@mkdir -p tmp
- @echo
Collecting package info...
- @-for dir in
package
/*/; do \
+ @echo
-n Collecting package info...
+ @-for dir in
$(1)
/*/; do \
[ -f "$${dir}/Makefile" ] || continue; \
[ -f "$${dir}/Makefile" ] || continue; \
+ $(call progress,Collecting package info... $${dir%%/}) \
echo Source-Makefile: $${dir}Makefile; \
$(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir 3>/dev/null || echo "ERROR: please fix $${dir}Makefile" >&2; \
echo; \
done > $@
echo Source-Makefile: $${dir}Makefile; \
$(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir 3>/dev/null || echo "ERROR: please fix $${dir}Makefile" >&2; \
echo; \
done > $@
+ $(call progress,Collecting package info... done)
+ echo
+endef
+
+tmp/.pkginfo:
+ $(call dumpinfo,package)
tmp/.targetinfo:
tmp/.targetinfo:
- @mkdir -p tmp
- @echo Collecting target info...
- @-for dir in target/linux/*/; do \
- [ -f "$${dir}/Makefile" ] || continue; \
- ( cd "$$dir"; $(NO_TRACE_MAKE) --no-print-dir DUMP=1 3>/dev/null || echo "ERROR: please fix $${dir}Makefile" >&2 ); \
- echo; \
- done > $@
+ $(call dumpinfo,target/linux)
tmpinfo-clean: FORCE
@-rm -rf tmp/.pkginfo tmp/.targetinfo
tmpinfo-clean: FORCE
@-rm -rf tmp/.pkginfo tmp/.targetinfo