| リビジョン | 4c82c6067c38466180026bc58d1871931daf9ae5 (tree) |
|---|---|
| 日時 | 2010-03-29 19:13:53 |
| 作者 |  TATEISHI Katsuyuki <kt@whee...> |
| コミッター | TATEISHI Katsuyuki |
Merge branch 'duplicated-logcheck' into buildenv
CHANGES (diff) Makefile.am (diff) logger/Makefile.am (diff)| @@ -1,5 +1,6 @@ | ||
| 1 | 1 | [XXX. XX XXXX] 2.1.3-1 |
| 2 | 2 | - Fix checkinig content (l7directord) |
| 3 | + - Add duplicate log ID check in 'make distcheck' | |
| 3 | 4 | |
| 4 | 5 | [Aug. 24 2009] 2.1.3-0 TATEISHI Katsuyuki |
| 5 | 6 | - Translate man files into English. (man) |
| @@ -71,3 +71,23 @@ rpm: $(DIST_ARCHIVES) | ||
| 71 | 71 | install-data-hook: |
| 72 | 72 | mkdir -p $(DESTDIR)$(l7vsadm_sockdir) |
| 73 | 73 | mkdir -p $(DESTDIR)$(l7vs_logdir) |
| 74 | + | |
| 75 | +extract_log.check: | |
| 76 | + find $(distdir) -type f \( -name '*.c' -o -name '*.cpp' \) -print0 \ | |
| 77 | + | xargs -0 perl $(distdir)/logger/extract_log \ | |
| 78 | + > extract_log.out 2>/dev/null | |
| 79 | + @(dupcount=`grep -c '^LOG_CAT_[0-9A-Z_]* (duplicate)' extract_log.out` || true ; \ | |
| 80 | + if test x0 != x$$dupcount ;\ | |
| 81 | + then \ | |
| 82 | + echo "ERROR: Duplicated log ID found! " ;\ | |
| 83 | + echo -n "ERROR: Check marked line as 'DUPLICATE' in " ;\ | |
| 84 | + echo "extract_log.out" ;\ | |
| 85 | + echo "=====================================================";\ | |
| 86 | + grep 'DUPLICATE' extract_log.out ;\ | |
| 87 | + echo "=====================================================";\ | |
| 88 | + exit 1 ;\ | |
| 89 | + else \ | |
| 90 | + rm -f extract_log.out ;\ | |
| 91 | + fi) | |
| 92 | + | |
| 93 | +distcheck-hook: extract_log.check |
| @@ -55,3 +55,5 @@ libsnmpagent_logger_a_SOURCES = \ | ||
| 55 | 55 | libsnmpagent_logger_a_CPPFLAGS = \ |
| 56 | 56 | -DLOGGER_PROCESS_SNM \ |
| 57 | 57 | -DVERSION=\"$(VERSION)\" |
| 58 | + | |
| 59 | +dist_noinst_SCRIPTS = extract_log |
UltraMonkey-L7
Fork