Mercurial > hg > nginx-quic
annotate misc/GNUmakefile @ 4497:95ab6658654a
Fix of rbtree lookup on hash collisions.
Previous code incorrectly assumed that nodes with identical keys are linked
together. This might not be true after tree rebalance.
Patch by Lanshun Zhou.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 27 Feb 2012 22:15:39 +0000 |
parents | da3e1be1915a |
children | e954f40fc28b |
rev | line source |
---|---|
681 | 1 |
2725 | 2 VER = $(shell grep 'define NGINX_VERSION' src/core/nginx.h \ |
3 | sed -e 's/^.*\"\(.*\)\"/\1/') | |
4 NGINX = nginx-$(VER) | |
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 | 7 |
8 OBJS = objs.msvc8 | |
4425
da3e1be1915a
Update OpenSSL and PCRE used for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4406
diff
changeset
|
9 OPENSSL = openssl-1.0.0g |
4393
f753d0e96ccd
libraries versions updated
Sergey Budnevitch <sb@waeme.net>
parents:
4392
diff
changeset
|
10 ZLIB = zlib-1.2.5 |
4425
da3e1be1915a
Update OpenSSL and PCRE used for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4406
diff
changeset
|
11 PCRE = pcre-8.21 |
681 | 12 |
13 | |
14 release: | |
15 rm -rf $(TEMP) | |
16 | |
17 svn export -rHEAD . $(TEMP)/$(NGINX) | |
18 | |
19 mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX) | |
20 | |
21 # delete incomplete sources | |
22 rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c | |
23 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c | |
24 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.* | |
25 rm -r $(TEMP)/$(NGINX)/src/os/win32 | |
26 | |
27 rm -r $(TEMP)/$(NGINX)/src/mysql | |
28 | |
29 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX) | |
30 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX) | |
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 | 33 |
34 $(MAKE) -f docs/GNUmakefile changes | |
35 | |
36 rm -r $(TEMP)/$(NGINX)/docs | |
37 rm -r $(TEMP)/$(NGINX)/misc | |
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 | 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 |
4320
b72828fe457f
Compute the repository root from the checkout.
Ruslan Ermilov <ru@nginx.com>
parents:
4264
diff
changeset
|
49 svn copy $(REPO)/trunk $(REPO)/tags/release-$(VER) \ |
4211
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
50 -F $(TEMP)/message |
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
51 |
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
52 svn up |
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
53 |
4342
064fec4b5989
Fixed RELEASE target again.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4341
diff
changeset
|
54 $(MAKE) -f misc/GNUmakefile release |
4211
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
55 |
effc7962aebe
Moving RELEASE target in more safe place.
Igor Sysoev <igor@sysoev.ru>
parents:
4181
diff
changeset
|
56 |
701 | 57 snapshot: |
58 rm -rf $(TEMP) | |
59 | |
60 mkdir -p $(TEMP) | |
61 svn export . $(TEMP)/$(NGINX) | |
62 | |
63 mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX) | |
64 | |
65 # delete incomplete sources | |
66 rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c | |
67 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c | |
68 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.* | |
69 rm -r $(TEMP)/$(NGINX)/src/os/win32 | |
70 | |
71 rm -r $(TEMP)/$(NGINX)/src/mysql | |
72 | |
73 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX) | |
74 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX) | |
75 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
|
76 mv $(TEMP)/$(NGINX)/docs/man $(TEMP)/$(NGINX) |
701 | 77 |
78 $(MAKE) -f docs/GNUmakefile changes | |
79 | |
80 rm -r $(TEMP)/$(NGINX)/docs | |
81 rm -r $(TEMP)/$(NGINX)/misc | |
82 | |
681 | 83 tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX) |
84 | |
85 | |
2725 | 86 zip: |
87 rm -rf $(TEMP) | |
88 rm -f $(NGINX).zip | |
89 | |
90 mkdir -p $(TEMP)/$(NGINX)/docs | |
91 mkdir -p $(TEMP)/$(NGINX)/logs | |
92 mkdir -p $(TEMP)/$(NGINX)/temp | |
93 | |
94 svn export -rHEAD conf $(TEMP)/$(NGINX)/conf/ | |
95 perl -pi -e 's/$$/\r/' $(TEMP)/$(NGINX)/conf/* | |
96 | |
97 svn export -rHEAD contrib $(TEMP)/$(NGINX)/contrib/ | |
98 svn export -rHEAD docs/html $(TEMP)/$(NGINX)/html/ | |
99 | |
100 $(MAKE) -f docs/GNUmakefile changes | |
101 | |
102 cp -p $(OBJS)/nginx.exe $(TEMP)/$(NGINX) | |
103 | |
104 cp -p docs/text/LICENSE $(TEMP)/$(NGINX)/docs/ | |
105 cp -p docs/text/README $(TEMP)/$(NGINX)/docs/ | |
106 mv $(TEMP)/$(NGINX)/CHANGES* $(TEMP)/$(NGINX)/docs/ | |
107 | |
108 cp -p $(OBJS)/lib/$(OPENSSL)/LICENSE \ | |
109 $(TEMP)/$(NGINX)/docs/OpenSSL.LICENSE | |
110 | |
2871
c7fe4b9118d2
fix "make zip", the bug has been introduced in r2841
Igor Sysoev <igor@sysoev.ru>
parents:
2734
diff
changeset
|
111 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
|
112 $(TEMP)/$(NGINX)/docs/PCRE.LICENCE |
2725 | 113 |
4392
21c8ea5d4d10
zlib license file include fixed
Sergey Budnevitch <sb@waeme.net>
parents:
4342
diff
changeset
|
114 perl -ne 'print if /^ \(C\) 1995-20/ .. /^ jloup\@gzip.org/' \ |
2725 | 115 $(OBJS)/lib/$(ZLIB)/README \ |
116 > $(TEMP)/$(NGINX)/docs/zlib.LICENSE | |
117 | |
118 touch -r $(OBJS)/lib/$(ZLIB)/README \ | |
119 $(TEMP)/$(NGINX)/docs/zlib.LICENSE | |
120 | |
121 cd $(TEMP) && zip -r ../$(NGINX).zip $(NGINX) | |
122 | |
123 | |
124 icons: src/os/win32/nginx.ico | |
681 | 125 |
2734 | 126 # 48x48, 32x32 and 16x16 icons |
681 | 127 |
2734 | 128 src/os/win32/nginx.ico: src/os/win32/nginx_icon48.xpm \ |
129 src/os/win32/nginx_icon32.xpm \ | |
681 | 130 src/os/win32/nginx_icon16.xpm |
131 | |
132 test -d $(TEMP) || mkdir $(TEMP) | |
133 | |
2734 | 134 xpmtoppm --alphaout=$(TEMP)/nginx48.pbm \ |
135 src/os/win32/nginx_icon48.xpm > $(TEMP)/nginx48.ppm | |
136 | |
681 | 137 xpmtoppm --alphaout=$(TEMP)/nginx32.pbm \ |
138 src/os/win32/nginx_icon32.xpm > $(TEMP)/nginx32.ppm | |
139 | |
140 xpmtoppm --alphaout=$(TEMP)/nginx16.pbm \ | |
141 src/os/win32/nginx_icon16.xpm > $(TEMP)/nginx16.ppm | |
142 | |
143 ppmtowinicon -output src/os/win32/nginx.ico -andpgms \ | |
2734 | 144 $(TEMP)/nginx48.ppm $(TEMP)/nginx48.pbm \ |
681 | 145 $(TEMP)/nginx32.ppm $(TEMP)/nginx32.pbm \ |
146 $(TEMP)/nginx16.ppm $(TEMP)/nginx16.pbm |