• R/O
  • HTTP
  • SSH
  • HTTPS

ultramonkey-l7-v2: コミット

UltraMonkey-L7 V2(single-thread implementation)


コミットメタ情報

リビジョン4c82c6067c38466180026bc58d1871931daf9ae5 (tree)
日時2010-03-29 19:13:53
作者TATEISHI Katsuyuki <kt@whee...>
コミッターTATEISHI Katsuyuki

ログメッセージ

Merge branch 'duplicated-logcheck' into buildenv

変更サマリ

差分

--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
11 [XXX. XX XXXX] 2.1.3-1
22 - Fix checkinig content (l7directord)
3+ - Add duplicate log ID check in 'make distcheck'
34
45 [Aug. 24 2009] 2.1.3-0 TATEISHI Katsuyuki
56 - Translate man files into English. (man)
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,3 +71,23 @@ rpm: $(DIST_ARCHIVES)
7171 install-data-hook:
7272 mkdir -p $(DESTDIR)$(l7vsadm_sockdir)
7373 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
--- a/logger/Makefile.am
+++ b/logger/Makefile.am
@@ -55,3 +55,5 @@ libsnmpagent_logger_a_SOURCES = \
5555 libsnmpagent_logger_a_CPPFLAGS = \
5656 -DLOGGER_PROCESS_SNM \
5757 -DVERSION=\"$(VERSION)\"
58+
59+dist_noinst_SCRIPTS = extract_log
旧リポジトリブラウザで表示