annotate misc/GNUmakefile @ 5066:0112e3dcc51b stable-1.2

Merge of r5005, r5031, r5066: PCRE and OpenSSL for win32 builds.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 11 Feb 2013 23:57:13 +0000
parents db9ce6fc9482
children a5f7d455e271
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
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
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
5066
0112e3dcc51b Merge of r5005, r5031, r5066: PCRE and OpenSSL for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4902
diff changeset
9 OPENSSL = openssl-1.0.1e
4849
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
10 ZLIB = zlib-1.2.7
5066
0112e3dcc51b Merge of r5005, r5031, r5066: PCRE and OpenSSL for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4902
diff changeset
11 PCRE = pcre-8.32
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
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
4702
ad7b9c54301d Fixed misc/GNUmakefile to properly tag on stable-1.2 branch.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4672
diff changeset
49 svn copy $(REPO)/branches/stable-1.2 \
ad7b9c54301d Fixed misc/GNUmakefile to properly tag on stable-1.2 branch.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4672
diff changeset
50 $(REPO)/tags/release-$(VER) \
4211
effc7962aebe Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents: 4181
diff changeset
51 -F $(TEMP)/message
effc7962aebe Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents: 4181
diff changeset
52
effc7962aebe Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents: 4181
diff changeset
53 svn up
effc7962aebe Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents: 4181
diff changeset
54
4342
064fec4b5989 Fixed RELEASE target again.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4341
diff changeset
55 $(MAKE) -f misc/GNUmakefile release
4211
effc7962aebe Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents: 4181
diff changeset
56
effc7962aebe Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents: 4181
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
4849
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
86 win32:
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
87 ./auto/configure \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
88 --with-cc=cl \
4902
db9ce6fc9482 Merge of r4870, r4871, r4890, r4895: minor fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4860
diff changeset
89 --builddir=$(OBJS) \
4849
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
90 --with-debug \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
91 --prefix= \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
92 --conf-path=conf/nginx.conf \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
93 --pid-path=logs/nginx.pid \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
94 --http-log-path=logs/access.log \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
95 --error-log-path=logs/error.log \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
96 --sbin-path=nginx.exe \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
97 --http-client-body-temp-path=temp/client_body_temp \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
98 --http-proxy-temp-path=temp/proxy_temp \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
99 --http-fastcgi-temp-path=temp/fastcgi_temp \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
100 --http-scgi-temp-path=temp/scgi_temp \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
101 --http-uwsgi-temp-path=temp/uwsgi_temp \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
102 --with-cc-opt=-DFD_SETSIZE=1024 \
4902
db9ce6fc9482 Merge of r4870, r4871, r4890, r4895: minor fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4860
diff changeset
103 --with-pcre=$(OBJS)/lib/$(PCRE) \
db9ce6fc9482 Merge of r4870, r4871, r4890, r4895: minor fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4860
diff changeset
104 --with-zlib=$(OBJS)/lib/$(ZLIB) \
4849
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
105 --with-select_module \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
106 --with-http_realip_module \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
107 --with-http_addition_module \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
108 --with-http_sub_module \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
109 --with-http_dav_module \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
110 --with-http_stub_status_module \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
111 --with-http_flv_module \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
112 --with-http_mp4_module \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
113 --with-http_gzip_static_module \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
114 --with-http_random_index_module \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
115 --with-http_secure_link_module \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
116 --with-mail \
4902
db9ce6fc9482 Merge of r4870, r4871, r4890, r4895: minor fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4860
diff changeset
117 --with-openssl=$(OBJS)/lib/$(OPENSSL) \
4849
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
118 --with-openssl-opt=enable-tlsext \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
119 --with-http_ssl_module \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
120 --with-mail_ssl_module \
026ff0eb3062 Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4847
diff changeset
121 --with-ipv6
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
122
2725
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
123 zip:
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
124 rm -rf $(TEMP)
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
125 rm -f $(NGINX).zip
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
126
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
127 mkdir -p $(TEMP)/$(NGINX)/docs
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
128 mkdir -p $(TEMP)/$(NGINX)/logs
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
129 mkdir -p $(TEMP)/$(NGINX)/temp
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
130
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
131 svn export -rHEAD conf $(TEMP)/$(NGINX)/conf/
4847
0275f587e00b Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4806
diff changeset
132 sed -i '' -e "s/$$/`printf '\r'`/" $(TEMP)/$(NGINX)/conf/*
2725
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
133
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
134 svn export -rHEAD contrib $(TEMP)/$(NGINX)/contrib/
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
135 svn export -rHEAD docs/html $(TEMP)/$(NGINX)/html/
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
136
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
137 $(MAKE) -f docs/GNUmakefile changes
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
138
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
139 cp -p $(OBJS)/nginx.exe $(TEMP)/$(NGINX)
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
140
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
141 cp -p docs/text/LICENSE $(TEMP)/$(NGINX)/docs/
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
142 cp -p docs/text/README $(TEMP)/$(NGINX)/docs/
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
143 mv $(TEMP)/$(NGINX)/CHANGES* $(TEMP)/$(NGINX)/docs/
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
144
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
145 cp -p $(OBJS)/lib/$(OPENSSL)/LICENSE \
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
146 $(TEMP)/$(NGINX)/docs/OpenSSL.LICENSE
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
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
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
150
4847
0275f587e00b Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4806
diff changeset
151 sed -ne '/^ (C) 1995-20/,/^ jloup@gzip\.org/p' \
2725
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
152 $(OBJS)/lib/$(ZLIB)/README \
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
153 > $(TEMP)/$(NGINX)/docs/zlib.LICENSE
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
154
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
155 touch -r $(OBJS)/lib/$(ZLIB)/README \
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
156 $(TEMP)/$(NGINX)/docs/zlib.LICENSE
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
157
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
158 cd $(TEMP) && zip -r ../$(NGINX).zip $(NGINX)
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
159
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
160
d43d73277c5c Win32 master/workers model
Igor Sysoev <igor@sysoev.ru>
parents: 1662
diff changeset
161 icons: src/os/win32/nginx.ico
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
162
2734
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
163 # 48x48, 32x32 and 16x16 icons
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
164
2734
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
165 src/os/win32/nginx.ico: src/os/win32/nginx_icon48.xpm \
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
166 src/os/win32/nginx_icon32.xpm \
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
167 src/os/win32/nginx_icon16.xpm
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
168
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
169 test -d $(TEMP) || mkdir $(TEMP)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
170
2734
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
171 xpmtoppm --alphaout=$(TEMP)/nginx48.pbm \
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
172 src/os/win32/nginx_icon48.xpm > $(TEMP)/nginx48.ppm
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
173
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
174 xpmtoppm --alphaout=$(TEMP)/nginx32.pbm \
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
175 src/os/win32/nginx_icon32.xpm > $(TEMP)/nginx32.ppm
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
176
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
177 xpmtoppm --alphaout=$(TEMP)/nginx16.pbm \
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
178 src/os/win32/nginx_icon16.xpm > $(TEMP)/nginx16.ppm
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
179
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
180 ppmtowinicon -output src/os/win32/nginx.ico -andpgms \
2734
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents: 2725
diff changeset
181 $(TEMP)/nginx48.ppm $(TEMP)/nginx48.pbm \
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
182 $(TEMP)/nginx32.ppm $(TEMP)/nginx32.pbm \
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
183 $(TEMP)/nginx16.ppm $(TEMP)/nginx16.pbm