Mercurial > hg > nginx-quic
annotate misc/GNUmakefile @ 5096:63014d919fec
Allocate request object from its own pool.
Previously, it was allocated from a connection pool and
was selectively freed for an idle keepalive connection.
The goal is to put coupled things in one chunk of memory,
and to simplify handling of request objects.
| author | Valentin Bartenev <vbart@nginx.com> |
|---|---|
| date | Fri, 01 Mar 2013 14:55:42 +0000 |
| parents | 8b02da13b1d2 |
| children | 96ee76fda991 |
| rev | line source |
|---|---|
| 681 | 1 |
| 2725 | 2 VER = $(shell grep 'define NGINX_VERSION' src/core/nginx.h \ |
| 3 | sed -e 's/^.*\"\(.*\)\"/\1/') | |
| 4 NGINX = nginx-$(VER) | |
| 5 TEMP = tmp | |
|
4320
b72828fe457f
Compute the repository root from the checkout.
Ruslan Ermilov <ru@nginx.com>
parents:
4264
diff
changeset
|
6 REPO = $(shell svn info | sed -n 's/^Repository Root: //p') |
| 2725 | 7 |
| 8 OBJS = objs.msvc8 | |
|
5065
8b02da13b1d2
Updated OpenSSL used for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5030
diff
changeset
|
9 OPENSSL = openssl-1.0.1e |
|
4843
762605076600
Updated zlib used for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4842
diff
changeset
|
10 ZLIB = zlib-1.2.7 |
|
5004
764833756dcd
Updated PCRE used for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4894
diff
changeset
|
11 PCRE = pcre-8.32 |
| 681 | 12 |
| 13 | |
| 14 release: | |
| 15 rm -rf $(TEMP) | |
| 16 | |
| 17 svn export -rHEAD . $(TEMP)/$(NGINX) | |
| 18 | |
| 19 mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX) | |
| 20 | |
| 21 # delete incomplete sources | |
| 22 rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c | |
| 23 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c | |
| 24 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.* | |
| 25 rm -r $(TEMP)/$(NGINX)/src/os/win32 | |
| 26 | |
| 27 rm -r $(TEMP)/$(NGINX)/src/mysql | |
| 28 | |
| 29 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX) | |
| 30 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX) | |
| 31 mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX) | |
|
3801
569716d0e447
add man page in release tarball and fix man building procedure
Igor Sysoev <igor@sysoev.ru>
parents:
3717
diff
changeset
|
32 mv $(TEMP)/$(NGINX)/docs/man $(TEMP)/$(NGINX) |
| 681 | 33 |
| 34 $(MAKE) -f docs/GNUmakefile changes | |
| 35 | |
| 36 rm -r $(TEMP)/$(NGINX)/docs | |
| 37 rm -r $(TEMP)/$(NGINX)/misc | |
| 38 | |
|
704
58bd27d72519
fix bug introduced with snapshot support
Igor Sysoev <igor@sysoev.ru>
parents:
701
diff
changeset
|
39 tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX) |
|
58bd27d72519
fix bug introduced with snapshot support
Igor Sysoev <igor@sysoev.ru>
parents:
701
diff
changeset
|
40 |
| 701 | 41 |
|
4211
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
42 RELEASE: |
|
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
43 test -d $(TEMP) || mkdir -p $(TEMP) |
|
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
44 |
|
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
45 echo "nginx-$(VER)-RELEASE" > $(TEMP)/message |
|
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
46 svn ci -F $(TEMP)/message |
|
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
47 |
|
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
48 echo "release-$(VER) tag" > $(TEMP)/message |
|
4320
b72828fe457f
Compute the repository root from the checkout.
Ruslan Ermilov <ru@nginx.com>
parents:
4264
diff
changeset
|
49 svn copy $(REPO)/trunk $(REPO)/tags/release-$(VER) \ |
|
4211
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
50 -F $(TEMP)/message |
|
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
51 |
|
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
52 svn up |
|
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
53 |
|
4342
064fec4b5989
Fixed RELEASE target again.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4341
diff
changeset
|
54 $(MAKE) -f misc/GNUmakefile release |
|
4211
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
55 |
|
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
56 |
| 701 | 57 snapshot: |
| 58 rm -rf $(TEMP) | |
| 59 | |
| 60 mkdir -p $(TEMP) | |
| 61 svn export . $(TEMP)/$(NGINX) | |
| 62 | |
| 63 mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX) | |
| 64 | |
| 65 # delete incomplete sources | |
| 66 rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c | |
| 67 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c | |
| 68 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.* | |
| 69 rm -r $(TEMP)/$(NGINX)/src/os/win32 | |
| 70 | |
| 71 rm -r $(TEMP)/$(NGINX)/src/mysql | |
| 72 | |
| 73 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX) | |
| 74 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX) | |
| 75 mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX) | |
|
3801
569716d0e447
add man page in release tarball and fix man building procedure
Igor Sysoev <igor@sysoev.ru>
parents:
3717
diff
changeset
|
76 mv $(TEMP)/$(NGINX)/docs/man $(TEMP)/$(NGINX) |
| 701 | 77 |
| 78 $(MAKE) -f docs/GNUmakefile changes | |
| 79 | |
| 80 rm -r $(TEMP)/$(NGINX)/docs | |
| 81 rm -r $(TEMP)/$(NGINX)/misc | |
| 82 | |
| 681 | 83 tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX) |
| 84 | |
|
4842
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
85 win32: |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
86 ./auto/configure \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
87 --with-cc=cl \ |
|
4894
0156fd6f48fa
Style, parentheses instead of braces in misc/GNUMakefile.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4843
diff
changeset
|
88 --builddir=$(OBJS) \ |
|
4842
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
89 --with-debug \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
90 --prefix= \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
91 --conf-path=conf/nginx.conf \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
92 --pid-path=logs/nginx.pid \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
93 --http-log-path=logs/access.log \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
94 --error-log-path=logs/error.log \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
95 --sbin-path=nginx.exe \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
96 --http-client-body-temp-path=temp/client_body_temp \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
97 --http-proxy-temp-path=temp/proxy_temp \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
98 --http-fastcgi-temp-path=temp/fastcgi_temp \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
99 --http-scgi-temp-path=temp/scgi_temp \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
100 --http-uwsgi-temp-path=temp/uwsgi_temp \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
101 --with-cc-opt=-DFD_SETSIZE=1024 \ |
|
4894
0156fd6f48fa
Style, parentheses instead of braces in misc/GNUMakefile.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4843
diff
changeset
|
102 --with-pcre=$(OBJS)/lib/$(PCRE) \ |
|
0156fd6f48fa
Style, parentheses instead of braces in misc/GNUMakefile.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4843
diff
changeset
|
103 --with-zlib=$(OBJS)/lib/$(ZLIB) \ |
|
4842
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
104 --with-select_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
105 --with-http_realip_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
106 --with-http_addition_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
107 --with-http_sub_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
108 --with-http_dav_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
109 --with-http_stub_status_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
110 --with-http_flv_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
111 --with-http_mp4_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
112 --with-http_gunzip_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
113 --with-http_gzip_static_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
114 --with-http_random_index_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
115 --with-http_secure_link_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
116 --with-mail \ |
|
4894
0156fd6f48fa
Style, parentheses instead of braces in misc/GNUMakefile.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4843
diff
changeset
|
117 --with-openssl=$(OBJS)/lib/$(OPENSSL) \ |
|
4842
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
118 --with-openssl-opt=enable-tlsext \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
119 --with-http_ssl_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
120 --with-mail_ssl_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
121 --with-ipv6 |
| 681 | 122 |
| 2725 | 123 zip: |
| 124 rm -rf $(TEMP) | |
| 125 rm -f $(NGINX).zip | |
| 126 | |
| 127 mkdir -p $(TEMP)/$(NGINX)/docs | |
| 128 mkdir -p $(TEMP)/$(NGINX)/logs | |
| 129 mkdir -p $(TEMP)/$(NGINX)/temp | |
| 130 | |
| 131 svn export -rHEAD conf $(TEMP)/$(NGINX)/conf/ | |
|
4779
117f3284e0de
Removed the need in Perl to generate ZIP archive of nginx/Windows.
Ruslan Ermilov <ru@nginx.com>
parents:
4774
diff
changeset
|
132 sed -i '' -e "s/$$/`printf '\r'`/" $(TEMP)/$(NGINX)/conf/* |
| 2725 | 133 |
| 134 svn export -rHEAD contrib $(TEMP)/$(NGINX)/contrib/ | |
| 135 svn export -rHEAD docs/html $(TEMP)/$(NGINX)/html/ | |
| 136 | |
| 137 $(MAKE) -f docs/GNUmakefile changes | |
| 138 | |
| 139 cp -p $(OBJS)/nginx.exe $(TEMP)/$(NGINX) | |
| 140 | |
| 141 cp -p docs/text/LICENSE $(TEMP)/$(NGINX)/docs/ | |
| 142 cp -p docs/text/README $(TEMP)/$(NGINX)/docs/ | |
| 143 mv $(TEMP)/$(NGINX)/CHANGES* $(TEMP)/$(NGINX)/docs/ | |
| 144 | |
| 145 cp -p $(OBJS)/lib/$(OPENSSL)/LICENSE \ | |
| 146 $(TEMP)/$(NGINX)/docs/OpenSSL.LICENSE | |
| 147 | |
|
2871
c7fe4b9118d2
fix "make zip", the bug has been introduced in r2841
Igor Sysoev <igor@sysoev.ru>
parents:
2734
diff
changeset
|
148 cp -p $(OBJS)/lib/$(PCRE)/LICENCE \ |
|
c7fe4b9118d2
fix "make zip", the bug has been introduced in r2841
Igor Sysoev <igor@sysoev.ru>
parents:
2734
diff
changeset
|
149 $(TEMP)/$(NGINX)/docs/PCRE.LICENCE |
| 2725 | 150 |
|
4779
117f3284e0de
Removed the need in Perl to generate ZIP archive of nginx/Windows.
Ruslan Ermilov <ru@nginx.com>
parents:
4774
diff
changeset
|
151 sed -ne '/^ (C) 1995-20/,/^ jloup@gzip\.org/p' \ |
| 2725 | 152 $(OBJS)/lib/$(ZLIB)/README \ |
| 153 > $(TEMP)/$(NGINX)/docs/zlib.LICENSE | |
| 154 | |
| 155 touch -r $(OBJS)/lib/$(ZLIB)/README \ | |
| 156 $(TEMP)/$(NGINX)/docs/zlib.LICENSE | |
| 157 | |
| 158 cd $(TEMP) && zip -r ../$(NGINX).zip $(NGINX) | |
| 159 | |
| 160 | |
| 161 icons: src/os/win32/nginx.ico | |
| 681 | 162 |
| 2734 | 163 # 48x48, 32x32 and 16x16 icons |
| 681 | 164 |
| 2734 | 165 src/os/win32/nginx.ico: src/os/win32/nginx_icon48.xpm \ |
| 166 src/os/win32/nginx_icon32.xpm \ | |
| 681 | 167 src/os/win32/nginx_icon16.xpm |
| 168 | |
| 169 test -d $(TEMP) || mkdir $(TEMP) | |
| 170 | |
| 2734 | 171 xpmtoppm --alphaout=$(TEMP)/nginx48.pbm \ |
| 172 src/os/win32/nginx_icon48.xpm > $(TEMP)/nginx48.ppm | |
| 173 | |
| 681 | 174 xpmtoppm --alphaout=$(TEMP)/nginx32.pbm \ |
| 175 src/os/win32/nginx_icon32.xpm > $(TEMP)/nginx32.ppm | |
| 176 | |
| 177 xpmtoppm --alphaout=$(TEMP)/nginx16.pbm \ | |
| 178 src/os/win32/nginx_icon16.xpm > $(TEMP)/nginx16.ppm | |
| 179 | |
| 180 ppmtowinicon -output src/os/win32/nginx.ico -andpgms \ | |
| 2734 | 181 $(TEMP)/nginx48.ppm $(TEMP)/nginx48.pbm \ |
| 681 | 182 $(TEMP)/nginx32.ppm $(TEMP)/nginx32.pbm \ |
| 183 $(TEMP)/nginx16.ppm $(TEMP)/nginx16.pbm |