Mercurial > hg > nginx-quic
annotate misc/GNUmakefile @ 6377:11e019750adc
HTTP/2: fixed possible buffer overrun (ticket #893).
Due to greater priority of the unary plus operator over the ternary operator
the expression didn't work as expected. That might result in one byte less
allocation than needed for the HEADERS frame buffer.
| author | Valentin Bartenev <vbart@nginx.com> |
|---|---|
| date | Thu, 04 Feb 2016 18:01:04 +0300 |
| parents | fe0ace132a25 |
| children | c8491e096e13 |
| rev | line source |
|---|---|
| 681 | 1 |
| 2725 | 2 VER = $(shell grep 'define NGINX_VERSION' src/core/nginx.h \ |
|
5147
864030a4ff2a
Configure: unified nginx version computation constructs.
Ruslan Ermilov <ru@nginx.com>
parents:
5131
diff
changeset
|
3 | sed -e 's/^.*"\(.*\)".*/\1/') |
| 2725 | 4 NGINX = nginx-$(VER) |
| 5 TEMP = tmp | |
| 6 | |
| 7 OBJS = objs.msvc8 | |
|
6319
fe0ace132a25
Updated OpenSSL and PCRE used for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6318
diff
changeset
|
8 OPENSSL = openssl-1.0.2e |
|
5236
21e07bf09dd6
Updated zlib used for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5212
diff
changeset
|
9 ZLIB = zlib-1.2.8 |
|
6319
fe0ace132a25
Updated OpenSSL and PCRE used for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6318
diff
changeset
|
10 PCRE = pcre-8.38 |
| 681 | 11 |
| 12 | |
|
5131
566cd32d8bac
Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5130
diff
changeset
|
13 release: export |
| 681 | 14 |
| 15 mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX) | |
| 16 | |
| 17 # delete incomplete sources | |
| 18 rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c | |
| 19 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c | |
| 20 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.* | |
| 21 rm -r $(TEMP)/$(NGINX)/src/os/win32 | |
| 22 | |
| 23 rm -r $(TEMP)/$(NGINX)/src/mysql | |
| 24 | |
| 25 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX) | |
| 26 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX) | |
| 27 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
|
28 mv $(TEMP)/$(NGINX)/docs/man $(TEMP)/$(NGINX) |
| 681 | 29 |
| 30 $(MAKE) -f docs/GNUmakefile changes | |
| 31 | |
| 32 rm -r $(TEMP)/$(NGINX)/docs | |
| 33 rm -r $(TEMP)/$(NGINX)/misc | |
| 34 | |
|
704
58bd27d72519
fix bug introduced with snapshot support
Igor Sysoev <igor@sysoev.ru>
parents:
701
diff
changeset
|
35 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
|
36 |
| 701 | 37 |
|
5131
566cd32d8bac
Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5130
diff
changeset
|
38 export: |
|
566cd32d8bac
Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5130
diff
changeset
|
39 rm -rf $(TEMP) |
| 5212 | 40 hg archive -X '.hg*' $(TEMP)/$(NGINX) |
|
5131
566cd32d8bac
Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5130
diff
changeset
|
41 |
|
566cd32d8bac
Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5130
diff
changeset
|
42 |
|
4211
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
43 RELEASE: |
|
5131
566cd32d8bac
Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5130
diff
changeset
|
44 hg ci -m nginx-$(VER)-RELEASE |
|
566cd32d8bac
Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5130
diff
changeset
|
45 hg tag -m "release-$(VER) tag" release-$(VER) |
|
566cd32d8bac
Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5130
diff
changeset
|
46 |
| 5212 | 47 $(MAKE) -f misc/GNUmakefile release |
|
4211
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
48 |
|
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
49 |
|
4842
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
50 win32: |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
51 ./auto/configure \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
52 --with-cc=cl \ |
|
4894
0156fd6f48fa
Style, parentheses instead of braces in misc/GNUMakefile.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4843
diff
changeset
|
53 --builddir=$(OBJS) \ |
|
4842
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
54 --with-debug \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
55 --prefix= \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
56 --conf-path=conf/nginx.conf \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
57 --pid-path=logs/nginx.pid \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
58 --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
|
59 --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
|
60 --sbin-path=nginx.exe \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
61 --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
|
62 --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
|
63 --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
|
64 --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
|
65 --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
|
66 --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
|
67 --with-pcre=$(OBJS)/lib/$(PCRE) \ |
|
0156fd6f48fa
Style, parentheses instead of braces in misc/GNUMakefile.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4843
diff
changeset
|
68 --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
|
69 --with-select_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
70 --with-http_realip_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
71 --with-http_addition_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
72 --with-http_sub_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
73 --with-http_dav_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
74 --with-http_stub_status_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
75 --with-http_flv_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
76 --with-http_mp4_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
77 --with-http_gunzip_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
78 --with-http_gzip_static_module \ |
|
5335
1d0523f54a9f
Added auth request to win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5236
diff
changeset
|
79 --with-http_auth_request_module \ |
|
4842
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
80 --with-http_random_index_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
81 --with-http_secure_link_module \ |
|
6318
3250a5783787
Added slice module to win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6231
diff
changeset
|
82 --with-http_slice_module \ |
|
4842
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
83 --with-mail \ |
|
6134
96e22e4f1b03
Added stream module to win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6037
diff
changeset
|
84 --with-stream \ |
|
4894
0156fd6f48fa
Style, parentheses instead of braces in misc/GNUMakefile.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4843
diff
changeset
|
85 --with-openssl=$(OBJS)/lib/$(OPENSSL) \ |
|
6231
5def760fe95e
Updated OpenSSL used for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6209
diff
changeset
|
86 --with-openssl-opt=no-asm \ |
|
4842
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
87 --with-http_ssl_module \ |
|
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
88 --with-mail_ssl_module \ |
|
6134
96e22e4f1b03
Added stream module to win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6037
diff
changeset
|
89 --with-stream_ssl_module \ |
|
4842
d59fff553840
Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4779
diff
changeset
|
90 --with-ipv6 |
| 681 | 91 |
|
5131
566cd32d8bac
Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5130
diff
changeset
|
92 |
|
566cd32d8bac
Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5130
diff
changeset
|
93 zip: export |
| 2725 | 94 rm -f $(NGINX).zip |
| 95 | |
|
5129
96ee76fda991
Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5065
diff
changeset
|
96 mkdir -p $(TEMP)/$(NGINX)/docs.new |
| 2725 | 97 mkdir -p $(TEMP)/$(NGINX)/logs |
| 98 mkdir -p $(TEMP)/$(NGINX)/temp | |
| 99 | |
|
4779
117f3284e0de
Removed the need in Perl to generate ZIP archive of nginx/Windows.
Ruslan Ermilov <ru@nginx.com>
parents:
4774
diff
changeset
|
100 sed -i '' -e "s/$$/`printf '\r'`/" $(TEMP)/$(NGINX)/conf/* |
| 2725 | 101 |
|
5129
96ee76fda991
Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5065
diff
changeset
|
102 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX)/docs.new |
|
96ee76fda991
Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5065
diff
changeset
|
103 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX)/docs.new |
|
96ee76fda991
Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5065
diff
changeset
|
104 mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX) |
| 2725 | 105 |
|
5129
96ee76fda991
Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5065
diff
changeset
|
106 rm -r $(TEMP)/$(NGINX)/docs |
|
96ee76fda991
Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5065
diff
changeset
|
107 mv $(TEMP)/$(NGINX)/docs.new $(TEMP)/$(NGINX)/docs |
| 2725 | 108 |
| 109 cp -p $(OBJS)/nginx.exe $(TEMP)/$(NGINX) | |
| 110 | |
|
5129
96ee76fda991
Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5065
diff
changeset
|
111 $(MAKE) -f docs/GNUmakefile changes |
| 2725 | 112 mv $(TEMP)/$(NGINX)/CHANGES* $(TEMP)/$(NGINX)/docs/ |
| 113 | |
| 114 cp -p $(OBJS)/lib/$(OPENSSL)/LICENSE \ | |
| 115 $(TEMP)/$(NGINX)/docs/OpenSSL.LICENSE | |
| 116 | |
|
2871
c7fe4b9118d2
fix "make zip", the bug has been introduced in r2841
Igor Sysoev <igor@sysoev.ru>
parents:
2734
diff
changeset
|
117 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
|
118 $(TEMP)/$(NGINX)/docs/PCRE.LICENCE |
| 2725 | 119 |
|
4779
117f3284e0de
Removed the need in Perl to generate ZIP archive of nginx/Windows.
Ruslan Ermilov <ru@nginx.com>
parents:
4774
diff
changeset
|
120 sed -ne '/^ (C) 1995-20/,/^ jloup@gzip\.org/p' \ |
| 2725 | 121 $(OBJS)/lib/$(ZLIB)/README \ |
| 122 > $(TEMP)/$(NGINX)/docs/zlib.LICENSE | |
| 123 | |
| 124 touch -r $(OBJS)/lib/$(ZLIB)/README \ | |
| 125 $(TEMP)/$(NGINX)/docs/zlib.LICENSE | |
| 126 | |
|
5129
96ee76fda991
Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5065
diff
changeset
|
127 rm -r $(TEMP)/$(NGINX)/auto |
|
96ee76fda991
Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5065
diff
changeset
|
128 rm -r $(TEMP)/$(NGINX)/misc |
|
96ee76fda991
Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5065
diff
changeset
|
129 rm -r $(TEMP)/$(NGINX)/src |
|
96ee76fda991
Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5065
diff
changeset
|
130 |
| 2725 | 131 cd $(TEMP) && zip -r ../$(NGINX).zip $(NGINX) |
| 132 | |
| 133 | |
| 134 icons: src/os/win32/nginx.ico | |
| 681 | 135 |
| 2734 | 136 # 48x48, 32x32 and 16x16 icons |
| 681 | 137 |
| 2734 | 138 src/os/win32/nginx.ico: src/os/win32/nginx_icon48.xpm \ |
| 139 src/os/win32/nginx_icon32.xpm \ | |
| 681 | 140 src/os/win32/nginx_icon16.xpm |
| 141 | |
| 142 test -d $(TEMP) || mkdir $(TEMP) | |
| 143 | |
| 2734 | 144 xpmtoppm --alphaout=$(TEMP)/nginx48.pbm \ |
| 145 src/os/win32/nginx_icon48.xpm > $(TEMP)/nginx48.ppm | |
| 146 | |
| 681 | 147 xpmtoppm --alphaout=$(TEMP)/nginx32.pbm \ |
| 148 src/os/win32/nginx_icon32.xpm > $(TEMP)/nginx32.ppm | |
| 149 | |
| 150 xpmtoppm --alphaout=$(TEMP)/nginx16.pbm \ | |
| 151 src/os/win32/nginx_icon16.xpm > $(TEMP)/nginx16.ppm | |
| 152 | |
| 153 ppmtowinicon -output src/os/win32/nginx.ico -andpgms \ | |
| 2734 | 154 $(TEMP)/nginx48.ppm $(TEMP)/nginx48.pbm \ |
| 681 | 155 $(TEMP)/nginx32.ppm $(TEMP)/nginx32.pbm \ |
| 156 $(TEMP)/nginx16.ppm $(TEMP)/nginx16.pbm |