ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/import_libevent
(Generate patch)

Comparing libev/import_libevent (file contents):
Revision 1.3 by root, Tue Nov 6 17:09:45 2007 UTC vs.
Revision 1.11 by root, Fri Dec 7 16:44:15 2007 UTC

1#!/bin/sh 1#!/bin/sh
2 2
3LE=../libevent-1.3e 3LE=../libevent-1.4.0-beta
4 4
5cp $LE/evdns.h . 5cp $LE/evdns.h .
6 6
7perl -ne ' 7perl -ne '
8 s/\s+char buf\[64\];/\tchar buf[96];/; 8 s/\s+char buf\[64\];/\tchar buf[96];/;
… …
12 } 12 }
13 if (/#include "misc.h"/) { 13 if (/#include "misc.h"/) {
14 print "#ifndef EV_STANDALONE\n$_#endif\n"; 14 print "#ifndef EV_STANDALONE\n$_#endif\n";
15 next; 15 next;
16 } 16 }
17 if (/#include "(unistd.h|sys/time.h)"/) { 17 if (/#include "(unistd.h|sys\/time.h)"/) {
18 print "#ifndef WIN32\n$_#endif\n"; 18 print "#ifndef WIN32\n$_#endif\n";
19 next; 19 next;
20 } 20 }
21 next if /#include "log.h"/; 21 next if /#include "log.h"/;
22 22
23 print; 23 print;
24' <$LE/evdns.c >evdns.c 24' <$LE/evdns.c >evdns.c
25 25
26cp $LE/autogen.sh .
26cp $LE/epoll_sub.c . 27cp $LE/epoll_sub.c .
27cp $LE/evbuffer.c . 28cp $LE/evbuffer.c .
28cp $LE/buffer.c . 29cp $LE/buffer.c .
29cp $LE/evhttp.h . 30cp $LE/evhttp.h .
31cp $LE/evutil.h .
32cp $LE/evutil.c .
33cp $LE/event-config.h .
34cp $LE/event-internal.h .
35cp $LE/evrpc.h .
36cp $LE/evrpc.c .
37cp $LE/evrpc-internal.h .
30cp $LE/http.c . 38cp $LE/http.c .
31cp $LE/event_tagging.c . 39cp $LE/event_tagging.c .
32cp $LE/http-internal.h . 40cp $LE/http-internal.h .
33cp $LE/strlcpy-internal.h . 41cp $LE/strlcpy-internal.h .
34cp $LE/log.c . 42cp $LE/log.c .
35cp $LE/log.h . 43cp $LE/log.h .
36cp $LE/strlcpy.c . 44cp $LE/strlcpy.c .
37rsync -a $LE/WIN32* $LE/sample $LE/test $LE/compat . --del 45rsync -a $LE/WIN32* $LE/sample $LE/test $LE/compat . --del
38rename 's/libevent/libev/' WIN32-Prj/lib* 46rename 's/libevent/libev/' WIN32-Prj/lib*
39cp $LE/aclocal.m4 . 47cp $LE/aclocal.m4 .
40cp $LE/acconfig.h . 48#cp $LE/acconfig.h .
41cp $LE/config.h.in . 49cp $LE/config.h.in .
42cp $LE/event_rpcgen.py . 50cp $LE/event_rpcgen.py .
43cp $LE/*.3 . 51cp $LE/*.3 .
44 52
45perl -i -pe 's/libevent/libev/g' sample/Makefile.am 53perl -i -pe 's/libevent/libev/g' sample/Makefile.am
… …
49 57
50perl -i -ne ' 58perl -i -ne '
51 next if /"event-internal.h"/; 59 next if /"event-internal.h"/;
52 s/base\d?->sig.ev_signal_added/0/; 60 s/base\d?->sig.ev_signal_added/0/;
53 s/base\d?->sig.ev_signal_pair\[0\]/-1/; 61 s/base\d?->sig.ev_signal_pair\[0\]/-1/;
62 s/base->sig.evsignal_caught/0/;
54 next if /test_signal_(dealloc|pipeloss|switchbase)\(\)/; 63 next if /^\ttest_signal_(dealloc|pipeloss|switchbase|assert|restore)\(\)/;
64 next if /^\ttest_simplesignal\(\)/; # non-default-loop
65 next if /^\ttest_immediatesignal\(\)/; # non-default-loop
55 next if /test_priorities\(\d\)/; 66 next if /test_priorities\(\d\)/;
56 print; 67 print;
57' test/regress.c 68' test/regress.c
58 69
59perl -ne ' 70perl -ne '
71 s/\bmin_heap.h\b//g;
60 s/\bsignal.c\b//g; 72 s/\bsignal.c\b//g;
61 s/\bevport.c\b//g; 73 s/\bevport.c\b//g;
62 s/\bkqueue.c\b//g; 74 s/\bkqueue.c\b//g;
63 s/\bdevpoll.c\b//g; 75 s/\bdevpoll.c\b//g;
64 s/\brtsig.c\b//g; 76 s/\brtsig.c\b//g;
… …
66 s/\bpoll.c\b//g; 78 s/\bpoll.c\b//g;
67 s/\bepoll.c\b//g; 79 s/\bepoll.c\b//g;
68 s/\bepoll_sub.c\b//g; 80 s/\bepoll_sub.c\b//g;
69 s/\bevent-internal.h\b//g; 81 s/\bevent-internal.h\b//g;
70 s/\bevsignal.h\b//g; 82 s/\bevsignal.h\b//g;
83 s/^(man_MANS\s*=)/$1 ev.3 /;
71 s/^(EXTRA_DIST\s*=\s*)/$1 ev.h ev_vars.h ev_wrap.h event_compat.h ev_epoll.c ev_select.c ev_poll.c ev_kqueue.c ev_win32.c /; 84 s/^(EXTRA_DIST\s*=)/$1 libev.m4 ev.h ev_vars.h ev_wrap.h event_compat.h ev++.h ev_epoll.c ev_select.c ev_poll.c ev_kqueue.c ev_port.c ev_win32.c ev.3 ev.pod ev.html /;
72 s/^(include_HEADERS\s*=\s*)/$1 ev.h event_compat.h /; 85 s/^(include_HEADERS\s*=)/$1 ev.h event_compat.h ev++.h /;
73 s/^(libevent_la_SOURCES\s*=\s*)/$1 ev.c /; 86 s/^(CORE_SRC\s*=)/$1 ev.c /;
74 s/^(libevent_la_LIBADD\s*=\s*)/$1 -lm /; 87 s/^(SYS_LIBS\s*=)/$1 -lm /;
75 s/libevent/libev/g; 88 s/libevent/libev/g;
76 print; 89 print;
77' <$LE/Makefile.am >Makefile.am 90' <$LE/Makefile.am >Makefile.am
78 91
79perl -ne ' 92perl -ne '
93 #s/-Wall/-Wall -Wno-comment -Wunused-function -Wno-unused-value/;
94 s/-Wall//g;
80 s/libevent/libev/g; 95 s/libevent/libev/g;
81 s/AC_LIBOBJ\(select\)/: ;/g; 96 s/AC_LIBOBJ\(select\)/: ;/g;
82 s/AC_LIBOBJ\(poll\)/: ;/g; 97 s/AC_LIBOBJ\(poll\)/: ;/g;
83 s/AC_LIBOBJ\(kqueue\)/: ;/g; 98 s/AC_LIBOBJ\(kqueue\)/: ;/g;
84 s/AC_LIBOBJ\(epoll\)/: ;/g; 99 s/AC_LIBOBJ\(epoll\)/: ;/g;
85 s/AC_LIBOBJ\(devpoll\)/: ;/g; 100 s/AC_LIBOBJ\(devpoll\)/: ;/g;
86 s/AC_LIBOBJ\(evport\)/: ;/g; 101 s/AC_LIBOBJ\(evport\)/: ;/g;
87 s/AC_LIBOBJ\(signal\)/: ;/g; 102 s/AC_LIBOBJ\(signal\)/: ;/g;
88 s/AC_LIBOBJ\(rtsig\)/: ;/g; 103 s/AC_LIBOBJ\(rtsig\)/: ;/g;
104 print "m4_include([libev.m4])\n" if /^AC_OUTPUT/;
89 print; 105 print;
90' <$LE/configure.in >configure.in 106' <$LE/configure.in >configure.in
91 107
92aclocal-1.7 108aclocal-1.7
93automake-1.7 --add-missing 109automake-1.7 --add-missing
94autoconf 110autoconf
111autoheader
95libtoolize 112libtoolize
96CC="ccache gcc" ./configure --prefix=/opt/libev --disable-shared "$@" 113CC="ccache gcc" ./configure --prefix=/opt/libev --disable-shared "$@"
97 114
98 115

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines