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

Comparing libev/import_libevent (file contents):
Revision 1.4 by root, Tue Nov 6 17:20:42 2007 UTC vs.
Revision 1.28 by root, Thu Mar 13 13:06:16 2008 UTC

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

Diff Legend

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