Mercurial > hg > nginx
annotate misc/GNUmakefile @ 4849:026ff0eb3062 stable-1.2
Merge of r4779, r4840, r4843, r4844: win32 changes.
*) Fixed build with Visual Studio 2005 Express.
It is available via winetricks which makes it still usable, and has
an old crtdefs.h which uses _CRT_SECURE_NO_DEPRECATE instead of
_CRT_SECURE_NO_WARNINGS to suppress warnings.
Reported by HAYASHI Kentaro,
http://mailman.nginx.org/pipermail/nginx-devel/2012-August/002542.html
*) Configure: provide inflate() when building zlib on win32.
*) Helper target "win32" to run configure for win32 builds.
*) Updated zlib used for win32 builds.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 24 Sep 2012 18:37:14 +0000 |
| parents | 0275f587e00b |
| children | ce42f6b8d1d2 |
| 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 | |
|
4672
4a4516a725dc
Merge of r4632: updated openssl used for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4603
diff
changeset
|
9 OPENSSL = openssl-1.0.1c |
|
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 |
|
4806
488698c39bfa
Merge of r4775: updated PCRE used for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4702
diff
changeset
|
11 PCRE = pcre-8.31 |
| 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 |
|
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 | 58 snapshot: |
| 59 rm -rf $(TEMP) | |
| 60 | |
| 61 mkdir -p $(TEMP) | |
| 62 svn export . $(TEMP)/$(NGINX) | |
| 63 | |
| 64 mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX) | |
| 65 | |
| 66 # delete incomplete sources | |
| 67 rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c | |
| 68 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c | |
| 69 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.* | |
| 70 rm -r $(TEMP)/$(NGINX)/src/os/win32 | |
| 71 | |
| 72 rm -r $(TEMP)/$(NGINX)/src/mysql | |
| 73 | |
| 74 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX) | |
| 75 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX) | |
| 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 | 78 |
| 79 $(MAKE) -f docs/GNUmakefile changes | |
| 80 | |
| 81 rm -r $(TEMP)/$(NGINX)/docs | |
| 82 rm -r $(TEMP)/$(NGINX)/misc | |
| 83 | |
| 681 | 84 tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX) |
| 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 \ |
|
026ff0eb3062
Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4847
diff
changeset
|
89 --builddir=${OBJS} \ |
|
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 \ |
|
026ff0eb3062
Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4847
diff
changeset
|
103 --with-pcre=${OBJS}/lib/${PCRE} \ |
|
026ff0eb3062
Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4847
diff
changeset
|
104 --with-zlib=${OBJS}/lib/${ZLIB} \ |
|
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_gunzip_module \ |
|
026ff0eb3062
Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4847
diff
changeset
|
114 --with-http_gzip_static_module \ |
|
026ff0eb3062
Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4847
diff
changeset
|
115 --with-http_random_index_module \ |
|
026ff0eb3062
Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4847
diff
changeset
|
116 --with-http_secure_link_module \ |
|
026ff0eb3062
Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4847
diff
changeset
|
117 --with-mail \ |
|
026ff0eb3062
Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4847
diff
changeset
|
118 --with-openssl=${OBJS}/lib/${OPENSSL} \ |
|
026ff0eb3062
Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4847
diff
changeset
|
119 --with-openssl-opt=enable-tlsext \ |
|
026ff0eb3062
Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4847
diff
changeset
|
120 --with-http_ssl_module \ |
|
026ff0eb3062
Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4847
diff
changeset
|
121 --with-mail_ssl_module \ |
|
026ff0eb3062
Merge of r4779, r4840, r4843, r4844: win32 changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4847
diff
changeset
|
122 --with-ipv6 |
| 681 | 123 |
| 2725 | 124 zip: |
| 125 rm -rf $(TEMP) | |
| 126 rm -f $(NGINX).zip | |
| 127 | |
| 128 mkdir -p $(TEMP)/$(NGINX)/docs | |
| 129 mkdir -p $(TEMP)/$(NGINX)/logs | |
| 130 mkdir -p $(TEMP)/$(NGINX)/temp | |
| 131 | |
| 132 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
|
133 sed -i '' -e "s/$$/`printf '\r'`/" $(TEMP)/$(NGINX)/conf/* |
| 2725 | 134 |
| 135 svn export -rHEAD contrib $(TEMP)/$(NGINX)/contrib/ | |
| 136 svn export -rHEAD docs/html $(TEMP)/$(NGINX)/html/ | |
| 137 | |
| 138 $(MAKE) -f docs/GNUmakefile changes | |
| 139 | |
| 140 cp -p $(OBJS)/nginx.exe $(TEMP)/$(NGINX) | |
| 141 | |
| 142 cp -p docs/text/LICENSE $(TEMP)/$(NGINX)/docs/ | |
| 143 cp -p docs/text/README $(TEMP)/$(NGINX)/docs/ | |
| 144 mv $(TEMP)/$(NGINX)/CHANGES* $(TEMP)/$(NGINX)/docs/ | |
| 145 | |
| 146 cp -p $(OBJS)/lib/$(OPENSSL)/LICENSE \ | |
| 147 $(TEMP)/$(NGINX)/docs/OpenSSL.LICENSE | |
| 148 | |
|
2871
c7fe4b9118d2
fix "make zip", the bug has been introduced in r2841
Igor Sysoev <igor@sysoev.ru>
parents:
2734
diff
changeset
|
149 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
|
150 $(TEMP)/$(NGINX)/docs/PCRE.LICENCE |
| 2725 | 151 |
|
4847
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4806
diff
changeset
|
152 sed -ne '/^ (C) 1995-20/,/^ jloup@gzip\.org/p' \ |
| 2725 | 153 $(OBJS)/lib/$(ZLIB)/README \ |
| 154 > $(TEMP)/$(NGINX)/docs/zlib.LICENSE | |
| 155 | |
| 156 touch -r $(OBJS)/lib/$(ZLIB)/README \ | |
| 157 $(TEMP)/$(NGINX)/docs/zlib.LICENSE | |
| 158 | |
| 159 cd $(TEMP) && zip -r ../$(NGINX).zip $(NGINX) | |
| 160 | |
| 161 | |
| 162 icons: src/os/win32/nginx.ico | |
| 681 | 163 |
| 2734 | 164 # 48x48, 32x32 and 16x16 icons |
| 681 | 165 |
| 2734 | 166 src/os/win32/nginx.ico: src/os/win32/nginx_icon48.xpm \ |
| 167 src/os/win32/nginx_icon32.xpm \ | |
| 681 | 168 src/os/win32/nginx_icon16.xpm |
| 169 | |
| 170 test -d $(TEMP) || mkdir $(TEMP) | |
| 171 | |
| 2734 | 172 xpmtoppm --alphaout=$(TEMP)/nginx48.pbm \ |
| 173 src/os/win32/nginx_icon48.xpm > $(TEMP)/nginx48.ppm | |
| 174 | |
| 681 | 175 xpmtoppm --alphaout=$(TEMP)/nginx32.pbm \ |
| 176 src/os/win32/nginx_icon32.xpm > $(TEMP)/nginx32.ppm | |
| 177 | |
| 178 xpmtoppm --alphaout=$(TEMP)/nginx16.pbm \ | |
| 179 src/os/win32/nginx_icon16.xpm > $(TEMP)/nginx16.ppm | |
| 180 | |
| 181 ppmtowinicon -output src/os/win32/nginx.ico -andpgms \ | |
| 2734 | 182 $(TEMP)/nginx48.ppm $(TEMP)/nginx48.pbm \ |
| 681 | 183 $(TEMP)/nginx32.ppm $(TEMP)/nginx32.pbm \ |
| 184 $(TEMP)/nginx16.ppm $(TEMP)/nginx16.pbm |