Mercurial > hg > nginx

comparison misc/GNUmakefile @ 4346:dc7549aa8556 stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge of r4000, r4014, r4265, r4321, r4342, r4343: Infrastructure changes: *) Don't ignore xmllint errors. *) Added missing dependencies for the CHANGES{,ru} targets. Pass string params to xsltproc. *) Ancient incomplete ngx_http_status_module removal. *) Compute the repository root from the checkout. *) Fixed RELEASE target to correctly call "release" one.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 13 Dec 2011 17:58:18 +0000
parents ac0a3dc948c3
children f9b3061e0f31
comparison
equal deleted inserted replaced
4345:1f436f0a95b3 4346:dc7549aa8556
1 1
2 VER = $(shell grep 'define NGINX_VERSION' src/core/nginx.h \ 2 VER = $(shell grep 'define NGINX_VERSION' src/core/nginx.h \
3 | sed -e 's/^.*\"\(.*\)\"/\1/') 3 | sed -e 's/^.*\"\(.*\)\"/\1/')
4 NGINX = nginx-$(VER) 4 NGINX = nginx-$(VER)
5 TEMP = tmp 5 TEMP = tmp
6 REPO = svn://svn.nginx.com 6 REPO = $(shell svn info | sed -n 's/^Repository Root: //p')
7 7
8 OBJS = objs.msvc8 8 OBJS = objs.msvc8
9 OPENSSL = openssl-0.9.8r 9 OPENSSL = openssl-0.9.8r
10 ZLIB = zlib-1.2.3 10 ZLIB = zlib-1.2.3
11 PCRE = pcre-7.9 11 PCRE = pcre-7.9
24 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.* 24 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.*
25 rm -r $(TEMP)/$(NGINX)/src/os/win32 25 rm -r $(TEMP)/$(NGINX)/src/os/win32
26 26
27 rm -r $(TEMP)/$(NGINX)/src/mysql 27 rm -r $(TEMP)/$(NGINX)/src/mysql
28 28
29 rm $(TEMP)/$(NGINX)/src/http/modules/ngx_http_status_module.c
30
31 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX) 29 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX)
32 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX) 30 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX)
33 mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX) 31 mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX)
34 mv $(TEMP)/$(NGINX)/docs/man $(TEMP)/$(NGINX) 32 mv $(TEMP)/$(NGINX)/docs/man $(TEMP)/$(NGINX)
35 33
46 44
47 echo "nginx-$(VER)-RELEASE" > $(TEMP)/message 45 echo "nginx-$(VER)-RELEASE" > $(TEMP)/message
48 svn ci -F $(TEMP)/message 46 svn ci -F $(TEMP)/message
49 47
50 echo "release-$(VER) tag" > $(TEMP)/message 48 echo "release-$(VER) tag" > $(TEMP)/message
51 svn copy $(REPO)/nginx/branches/stable-1.0 \ 49 svn copy $(REPO)/branches/stable-1.0 \
52 $(REPO)/nginx/tags/release-$(VER) \ 50 $(REPO)/tags/release-$(VER) \
53 -F $(TEMP)/message 51 -F $(TEMP)/message
54 52
55 svn up 53 svn up
56 54
57 $(MAKE) release 55 $(MAKE) -f misc/GNUmakefile release
58 56
59 57
60 snapshot: 58 snapshot:
61 rm -rf $(TEMP) 59 rm -rf $(TEMP)
62 60
70 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c 68 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c
71 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.* 69 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.*
72 rm -r $(TEMP)/$(NGINX)/src/os/win32 70 rm -r $(TEMP)/$(NGINX)/src/os/win32
73 71
74 rm -r $(TEMP)/$(NGINX)/src/mysql 72 rm -r $(TEMP)/$(NGINX)/src/mysql
75
76 rm $(TEMP)/$(NGINX)/src/http/modules/ngx_http_status_module.c
77 73
78 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX) 74 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX)
79 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX) 75 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX)
80 mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX) 76 mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX)
81 mv $(TEMP)/$(NGINX)/docs/man $(TEMP)/$(NGINX) 77 mv $(TEMP)/$(NGINX)/docs/man $(TEMP)/$(NGINX)