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

Comparing libev/import_libevent (file contents):
Revision 1.1 by root, Mon Nov 5 17:53:07 2007 UTC vs.
Revision 1.17 by root, Tue Dec 11 21:19:03 2007 UTC

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

Diff Legend

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