annotate misc/GNUmakefile @ 7440:6d4bc025c5a7

Prevented scheduling events on a shared connection. A shared connection does not own its file descriptor, which means that ngx_handle_read_event/ngx_handle_write_event calls should do nothing for it. Currently the c->shared flag is checked in several places in the stream proxy module prior to calling these functions. However it was not done everywhere. Missing checks could lead to calling ngx_handle_read_event/ngx_handle_write_event on shared connections. The problem manifested itself when using proxy_upload_rate and resulted in either duplicate file descriptor error (e.g. with epoll) or incorrect further udp packet processing (e.g. with kqueue). The fix is to set and reset the event active flag in a way that prevents ngx_handle_read_event/ngx_handle_write_event from scheduling socket events.
author Roman Arutyunyan <arut@nginx.com>
date Mon, 14 Jan 2019 20:36:23 +0300
parents aeb2d11c2731
children f3ff79ae31d9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
1
2725
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
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
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
4 NGINX = nginx-$(VER)
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
5 TEMP = tmp
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
6
6855
c2c13f1f47fd Win32: added a variable to specify compiler.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6738
diff changeset
7 CC = cl
2725
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
8 OBJS = objs.msvc8
7402
aeb2d11c2731 Updated OpenSSL used for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents: 7342
diff changeset
9 OPENSSL = openssl-1.0.2q
6877
8acc44141e44 Updated zlib and PCRE used for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6855
diff changeset
10 ZLIB = zlib-1.2.11
7256
a7a277490ae7 Updated OpenSSL and PCRE used for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents: 7181
diff changeset
11 PCRE = pcre-8.42
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
12
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
13
5131
566cd32d8bac Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5130
diff changeset
14 release: export
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
15
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
16 mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
17
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
18 # delete incomplete sources
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
19 rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
20 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
21 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.*
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
22 rm -r $(TEMP)/$(NGINX)/src/os/win32
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
23
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
24 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
25 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
26 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
27 mv $(TEMP)/$(NGINX)/docs/man $(TEMP)/$(NGINX)
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
28
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
29 $(MAKE) -f docs/GNUmakefile changes
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
30
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
31 rm -r $(TEMP)/$(NGINX)/docs
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
32 rm -r $(TEMP)/$(NGINX)/misc
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
33
704
58bd27d72519 fix bug introduced with snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 701
diff changeset
34 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
35
701
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
36
5131
566cd32d8bac Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5130
diff changeset
37 export:
566cd32d8bac Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5130
diff changeset
38 rm -rf $(TEMP)
5212
09dbd363050a Removed vestiges of SVN.
Ruslan Ermilov <ru@nginx.com>
parents: 5147
diff changeset
39 hg archive -X '.hg*' $(TEMP)/$(NGINX)
5131
566cd32d8bac Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5130
diff changeset
40
566cd32d8bac Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5130
diff changeset
41
4211
effc7962aebe Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents: 4181
diff changeset
42 RELEASE:
5131
566cd32d8bac Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5130
diff changeset
43 hg ci -m nginx-$(VER)-RELEASE
566cd32d8bac Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5130
diff changeset
44 hg tag -m "release-$(VER) tag" release-$(VER)
566cd32d8bac Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5130
diff changeset
45
5212
09dbd363050a Removed vestiges of SVN.
Ruslan Ermilov <ru@nginx.com>
parents: 5147
diff changeset
46 $(MAKE) -f misc/GNUmakefile release
4211
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
4842
d59fff553840 Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4779
diff changeset
49 win32:
d59fff553840 Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4779
diff changeset
50 ./auto/configure \
6855
c2c13f1f47fd Win32: added a variable to specify compiler.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6738
diff changeset
51 --with-cc=$(CC) \
4894
0156fd6f48fa Style, parentheses instead of braces in misc/GNUMakefile.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4843
diff changeset
52 --builddir=$(OBJS) \
4842
d59fff553840 Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4779
diff changeset
53 --with-debug \
d59fff553840 Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4779
diff changeset
54 --prefix= \
d59fff553840 Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4779
diff changeset
55 --conf-path=conf/nginx.conf \
d59fff553840 Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4779
diff changeset
56 --pid-path=logs/nginx.pid \
d59fff553840 Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4779
diff changeset
57 --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
58 --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
59 --sbin-path=nginx.exe \
d59fff553840 Helper target "win32" to run configure for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4779
diff changeset
60 --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
61 --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
62 --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
63 --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
64 --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
65 --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
66 --with-pcre=$(OBJS)/lib/$(PCRE) \
0156fd6f48fa Style, parentheses instead of braces in misc/GNUMakefile.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4843
diff changeset
67 --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
68 --with-select_module \
6936
0d4f602dc927 Added HTTP/2 to win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6884
diff changeset
69 --with-http_v2_module \
4842
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 \
6724
a6d116645c51 Configure: removed the --with-ipv6 option.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6613
diff changeset
89 --with-stream_ssl_module
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
90
5131
566cd32d8bac Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5130
diff changeset
91
566cd32d8bac Misc: support for Mercurial repositories.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5130
diff changeset
92 zip: export
2725
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
93 rm -f $(NGINX).zip
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
94
5129
96ee76fda991 Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5065
diff changeset
95 mkdir -p $(TEMP)/$(NGINX)/docs.new
2725
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
96 mkdir -p $(TEMP)/$(NGINX)/logs
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
97 mkdir -p $(TEMP)/$(NGINX)/temp
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
98
4779
117f3284e0de Removed the need in Perl to generate ZIP archive of nginx/Windows.
Ruslan Ermilov <ru@nginx.com>
parents: 4774
diff changeset
99 sed -i '' -e "s/$$/`printf '\r'`/" $(TEMP)/$(NGINX)/conf/*
2725
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
100
5129
96ee76fda991 Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5065
diff changeset
101 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
102 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
103 mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX)
2725
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
104
5129
96ee76fda991 Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5065
diff changeset
105 rm -r $(TEMP)/$(NGINX)/docs
96ee76fda991 Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5065
diff changeset
106 mv $(TEMP)/$(NGINX)/docs.new $(TEMP)/$(NGINX)/docs
2725
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
107
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
108 cp -p $(OBJS)/nginx.exe $(TEMP)/$(NGINX)
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
109
5129
96ee76fda991 Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5065
diff changeset
110 $(MAKE) -f docs/GNUmakefile changes
2725
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
111 mv $(TEMP)/$(NGINX)/CHANGES* $(TEMP)/$(NGINX)/docs/
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
112
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
113 cp -p $(OBJS)/lib/$(OPENSSL)/LICENSE \
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
114 $(TEMP)/$(NGINX)/docs/OpenSSL.LICENSE
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
115
2871
c7fe4b9118d2 fix "make zip", the bug has been introduced in r2841
Igor Sysoev <igor@sysoev.ru>
parents: 2734
diff changeset
116 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
117 $(TEMP)/$(NGINX)/docs/PCRE.LICENCE
2725
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
118
4779
117f3284e0de Removed the need in Perl to generate ZIP archive of nginx/Windows.
Ruslan Ermilov <ru@nginx.com>
parents: 4774
diff changeset
119 sed -ne '/^ (C) 1995-20/,/^ jloup@gzip\.org/p' \
2725
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
120 $(OBJS)/lib/$(ZLIB)/README \
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
121 > $(TEMP)/$(NGINX)/docs/zlib.LICENSE
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
122
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
123 touch -r $(OBJS)/lib/$(ZLIB)/README \
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
124 $(TEMP)/$(NGINX)/docs/zlib.LICENSE
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
125
5129
96ee76fda991 Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5065
diff changeset
126 rm -r $(TEMP)/$(NGINX)/auto
96ee76fda991 Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5065
diff changeset
127 rm -r $(TEMP)/$(NGINX)/misc
96ee76fda991 Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5065
diff changeset
128 rm -r $(TEMP)/$(NGINX)/src
96ee76fda991 Misc: switch to single export operation in "zip" target.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5065
diff changeset
129
2725
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
130 cd $(TEMP) && zip -r ../$(NGINX).zip $(NGINX)
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
131
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
132
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
133 icons: src/os/win32/nginx.ico
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
134
2734
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
135 # 48x48, 32x32 and 16x16 icons
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
136
2734
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
137 src/os/win32/nginx.ico: src/os/win32/nginx_icon48.xpm \
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
138 src/os/win32/nginx_icon32.xpm \
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
139 src/os/win32/nginx_icon16.xpm
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
140
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
141 test -d $(TEMP) || mkdir $(TEMP)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
142
2734
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
143 xpmtoppm --alphaout=$(TEMP)/nginx48.pbm \
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
144 src/os/win32/nginx_icon48.xpm > $(TEMP)/nginx48.ppm
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
145
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
146 xpmtoppm --alphaout=$(TEMP)/nginx32.pbm \
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
147 src/os/win32/nginx_icon32.xpm > $(TEMP)/nginx32.ppm
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
148
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
149 xpmtoppm --alphaout=$(TEMP)/nginx16.pbm \
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
150 src/os/win32/nginx_icon16.xpm > $(TEMP)/nginx16.ppm
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
151
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
152 ppmtowinicon -output src/os/win32/nginx.ico -andpgms \
2734
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
153 $(TEMP)/nginx48.ppm $(TEMP)/nginx48.pbm \
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
154 $(TEMP)/nginx32.ppm $(TEMP)/nginx32.pbm \
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
155 $(TEMP)/nginx16.ppm $(TEMP)/nginx16.pbm