annotate misc/GNUmakefile @ 4437:3a1507f48686 stable-1.0

Merge of r4372, r4373, r4374: SCGI fixes: *) Fixed incorrect use of r->http_version in scgi module. The r->http_version is a version of client's request, and modules must not set it unless they are really willing to downgrade protocol version used for a response (i.e. to HTTP/0.9 if no response headers are available). In neither case r->http_version may be upgraded. The former code downgraded response from HTTP/1.1 to HTTP/1.0 for no reason, causing various problems (see ticket #66). It was also possible that HTTP/0.9 requests were upgraded to HTTP/1.0. *) Removed duplicate function declaration. *) Removed error if there is no Status header. The SCGI specification doesn't specify format of the response, and assuming CGI specs should be used there is no reason to complain. RFC 3875 explicitly states that "A Status header field is optional, and status 200 'OK' is assumed if it is omitted".
author Maxim Dounin <mdounin@mdounin.ru>
date Sun, 05 Feb 2012 13:53:50 +0000
parents dc7549aa8556
children f9b3061e0f31
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 \
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
3 | sed -e 's/^.*\"\(.*\)\"/\1/')
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
4346
dc7549aa8556 Merge of r4000, r4014, r4265, r4321, r4342, r4343:
Maxim Dounin <mdounin@mdounin.ru>
parents: 4250
diff changeset
6 REPO = $(shell svn info | sed -n 's/^Repository Root: //p')
2725
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
7
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
8 OBJS = objs.msvc8
3869
ee223ca91129 copy OpenSSL-0.9.8r LICENSE for nginx/Windows zip
Igor Sysoev <igor@sysoev.ru>
parents: 3849
diff changeset
9 OPENSSL = openssl-0.9.8r
2725
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
10 ZLIB = zlib-1.2.3
2871
c7fe4b9118d2 fix "make zip", the bug has been introduced in r2841
Igor Sysoev <igor@sysoev.ru>
parents: 2734
diff changeset
11 PCRE = pcre-7.9
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
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
14 release:
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
15 rm -rf $(TEMP)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
16
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
17 svn export -rHEAD . $(TEMP)/$(NGINX)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
18
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
19 mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
20
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
21 # delete incomplete sources
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
22 rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
23 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
24 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.*
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
25 rm -r $(TEMP)/$(NGINX)/src/os/win32
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
26
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
27 rm -r $(TEMP)/$(NGINX)/src/mysql
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 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
30 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
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
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
33
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
34 $(MAKE) -f docs/GNUmakefile changes
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
35
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
36 rm -r $(TEMP)/$(NGINX)/docs
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
37 rm -r $(TEMP)/$(NGINX)/misc
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
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
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
41
4250
ac0a3dc948c3 Merging r4179, r4182, r4212:
Igor Sysoev <igor@sysoev.ru>
parents: 3869
diff changeset
42 RELEASE:
ac0a3dc948c3 Merging r4179, r4182, r4212:
Igor Sysoev <igor@sysoev.ru>
parents: 3869
diff changeset
43 test -d $(TEMP) || mkdir -p $(TEMP)
ac0a3dc948c3 Merging r4179, r4182, r4212:
Igor Sysoev <igor@sysoev.ru>
parents: 3869
diff changeset
44
ac0a3dc948c3 Merging r4179, r4182, r4212:
Igor Sysoev <igor@sysoev.ru>
parents: 3869
diff changeset
45 echo "nginx-$(VER)-RELEASE" > $(TEMP)/message
ac0a3dc948c3 Merging r4179, r4182, r4212:
Igor Sysoev <igor@sysoev.ru>
parents: 3869
diff changeset
46 svn ci -F $(TEMP)/message
ac0a3dc948c3 Merging r4179, r4182, r4212:
Igor Sysoev <igor@sysoev.ru>
parents: 3869
diff changeset
47
ac0a3dc948c3 Merging r4179, r4182, r4212:
Igor Sysoev <igor@sysoev.ru>
parents: 3869
diff changeset
48 echo "release-$(VER) tag" > $(TEMP)/message
4346
dc7549aa8556 Merge of r4000, r4014, r4265, r4321, r4342, r4343:
Maxim Dounin <mdounin@mdounin.ru>
parents: 4250
diff changeset
49 svn copy $(REPO)/branches/stable-1.0 \
dc7549aa8556 Merge of r4000, r4014, r4265, r4321, r4342, r4343:
Maxim Dounin <mdounin@mdounin.ru>
parents: 4250
diff changeset
50 $(REPO)/tags/release-$(VER) \
4250
ac0a3dc948c3 Merging r4179, r4182, r4212:
Igor Sysoev <igor@sysoev.ru>
parents: 3869
diff changeset
51 -F $(TEMP)/message
ac0a3dc948c3 Merging r4179, r4182, r4212:
Igor Sysoev <igor@sysoev.ru>
parents: 3869
diff changeset
52
ac0a3dc948c3 Merging r4179, r4182, r4212:
Igor Sysoev <igor@sysoev.ru>
parents: 3869
diff changeset
53 svn up
ac0a3dc948c3 Merging r4179, r4182, r4212:
Igor Sysoev <igor@sysoev.ru>
parents: 3869
diff changeset
54
4346
dc7549aa8556 Merge of r4000, r4014, r4265, r4321, r4342, r4343:
Maxim Dounin <mdounin@mdounin.ru>
parents: 4250
diff changeset
55 $(MAKE) -f misc/GNUmakefile release
4250
ac0a3dc948c3 Merging r4179, r4182, r4212:
Igor Sysoev <igor@sysoev.ru>
parents: 3869
diff changeset
56
ac0a3dc948c3 Merging r4179, r4182, r4212:
Igor Sysoev <igor@sysoev.ru>
parents: 3869
diff changeset
57
701
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
58 snapshot:
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
59 rm -rf $(TEMP)
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
60
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
61 mkdir -p $(TEMP)
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
62 svn export . $(TEMP)/$(NGINX)
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
63
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
64 mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX)
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
65
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
66 # delete incomplete sources
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
67 rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
68 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
69 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.*
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
70 rm -r $(TEMP)/$(NGINX)/src/os/win32
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
71
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
72 rm -r $(TEMP)/$(NGINX)/src/mysql
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
73
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
74 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX)
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
75 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX)
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
76 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
77 mv $(TEMP)/$(NGINX)/docs/man $(TEMP)/$(NGINX)
701
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
78
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
79 $(MAKE) -f docs/GNUmakefile changes
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
80
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
81 rm -r $(TEMP)/$(NGINX)/docs
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
82 rm -r $(TEMP)/$(NGINX)/misc
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
83
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
84 tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
85
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
86
2725
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
87 zip:
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
88 rm -rf $(TEMP)
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
89 rm -f $(NGINX).zip
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
90
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
91 mkdir -p $(TEMP)/$(NGINX)/docs
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
92 mkdir -p $(TEMP)/$(NGINX)/logs
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
93 mkdir -p $(TEMP)/$(NGINX)/temp
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
94
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
95 svn export -rHEAD conf $(TEMP)/$(NGINX)/conf/
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
96 perl -pi -e 's/$$/\r/' $(TEMP)/$(NGINX)/conf/*
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
97
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
98 svn export -rHEAD contrib $(TEMP)/$(NGINX)/contrib/
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
99 svn export -rHEAD docs/html $(TEMP)/$(NGINX)/html/
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
100
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
101 $(MAKE) -f docs/GNUmakefile changes
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
102
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
103 cp -p $(OBJS)/nginx.exe $(TEMP)/$(NGINX)
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
104
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
105 cp -p docs/text/LICENSE $(TEMP)/$(NGINX)/docs/
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
106 cp -p docs/text/README $(TEMP)/$(NGINX)/docs/
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
107 mv $(TEMP)/$(NGINX)/CHANGES* $(TEMP)/$(NGINX)/docs/
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
108
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
109 cp -p $(OBJS)/lib/$(OPENSSL)/LICENSE \
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
110 $(TEMP)/$(NGINX)/docs/OpenSSL.LICENSE
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
111
2871
c7fe4b9118d2 fix "make zip", the bug has been introduced in r2841
Igor Sysoev <igor@sysoev.ru>
parents: 2734
diff changeset
112 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
113 $(TEMP)/$(NGINX)/docs/PCRE.LICENCE
2725
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
114
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
115 perl -ne 'print if /^ \(C\) 1995-2004/ .. /^ jloup\@gzip.org/' \
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
116 $(OBJS)/lib/$(ZLIB)/README \
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
117 > $(TEMP)/$(NGINX)/docs/zlib.LICENSE
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
118
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
119 touch -r $(OBJS)/lib/$(ZLIB)/README \
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
120 $(TEMP)/$(NGINX)/docs/zlib.LICENSE
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
121
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
122 cd $(TEMP) && zip -r ../$(NGINX).zip $(NGINX)
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
123
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
124
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
125 icons: src/os/win32/nginx.ico
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
126
2734
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
127 # 48x48, 32x32 and 16x16 icons
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
128
2734
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
129 src/os/win32/nginx.ico: src/os/win32/nginx_icon48.xpm \
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
130 src/os/win32/nginx_icon32.xpm \
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
131 src/os/win32/nginx_icon16.xpm
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
132
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
133 test -d $(TEMP) || mkdir $(TEMP)
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 xpmtoppm --alphaout=$(TEMP)/nginx48.pbm \
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
136 src/os/win32/nginx_icon48.xpm > $(TEMP)/nginx48.ppm
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
137
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
138 xpmtoppm --alphaout=$(TEMP)/nginx32.pbm \
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
139 src/os/win32/nginx_icon32.xpm > $(TEMP)/nginx32.ppm
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 xpmtoppm --alphaout=$(TEMP)/nginx16.pbm \
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
142 src/os/win32/nginx_icon16.xpm > $(TEMP)/nginx16.ppm
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
143
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
144 ppmtowinicon -output src/os/win32/nginx.ico -andpgms \
2734
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
145 $(TEMP)/nginx48.ppm $(TEMP)/nginx48.pbm \
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
146 $(TEMP)/nginx32.ppm $(TEMP)/nginx32.pbm \
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
147 $(TEMP)/nginx16.ppm $(TEMP)/nginx16.pbm