Mercurial > hg > nginx
annotate misc/GNUmakefile @ 4041:f87edc142316 stable-1.0
Merge of r3960, r3961, r3962, r3963, r3965:
SSL related fixes:
*) MSIE export versions are rare now, so RSA 512 key is generated on demand
and is shared among all hosts instead of pregenerating for every HTTPS host
on configuraiton phase. This decreases start time for configuration with
large number of HTTPS hosts.
*) ECDHE support; patch by Adrian Kotelba
*) fix build by gcc46 with -Wunused-value option
*) fix SSL connection issues on platforms with 32-bit off_t
*) do not try to reuse and save a SSL session for a peer created on the fly
by ngx_http_upstream_create_round_robin_peer(), since the peer lives
only during request so the saved SSL session will never be used again
and just causes memory leak
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 29 Aug 2011 12:35:53 +0000 |
| parents | ee223ca91129 |
| children | 3ce20f216ede ac0a3dc948c3 |
| 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 | |
| 6 | |
| 7 OBJS = objs.msvc8 | |
|
3869
ee223ca91129
copy OpenSSL-0.9.8r LICENSE for nginx/Windows zip
Igor Sysoev <igor@sysoev.ru>
parents:
3849
diff
changeset
|
8 OPENSSL = openssl-0.9.8r |
| 2725 | 9 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
|
10 PCRE = pcre-7.9 |
| 681 | 11 |
| 12 | |
| 13 release: | |
| 14 rm -rf $(TEMP) | |
| 15 | |
| 16 svn export -rHEAD . $(TEMP)/$(NGINX) | |
| 17 | |
| 18 mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX) | |
| 19 | |
| 20 # delete incomplete sources | |
| 21 rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c | |
| 22 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c | |
| 23 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.* | |
| 24 rm -r $(TEMP)/$(NGINX)/src/os/win32 | |
| 25 | |
| 26 rm -r $(TEMP)/$(NGINX)/src/mysql | |
| 27 | |
| 28 rm $(TEMP)/$(NGINX)/src/http/modules/ngx_http_status_module.c | |
| 29 | |
| 30 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX) | |
| 31 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX) | |
| 32 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
|
33 mv $(TEMP)/$(NGINX)/docs/man $(TEMP)/$(NGINX) |
| 681 | 34 |
| 35 $(MAKE) -f docs/GNUmakefile changes | |
| 36 | |
| 37 rm -r $(TEMP)/$(NGINX)/docs | |
| 38 rm -r $(TEMP)/$(NGINX)/misc | |
| 39 | |
|
704
58bd27d72519
fix bug introduced with snapshot support
Igor Sysoev <igor@sysoev.ru>
parents:
701
diff
changeset
|
40 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
|
41 |
| 701 | 42 |
| 43 snapshot: | |
| 44 rm -rf $(TEMP) | |
| 45 | |
| 46 mkdir -p $(TEMP) | |
| 47 svn export . $(TEMP)/$(NGINX) | |
| 48 | |
| 49 mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX) | |
| 50 | |
| 51 # delete incomplete sources | |
| 52 rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c | |
| 53 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c | |
| 54 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.* | |
| 55 rm -r $(TEMP)/$(NGINX)/src/os/win32 | |
| 56 | |
| 57 rm -r $(TEMP)/$(NGINX)/src/mysql | |
| 58 | |
| 59 rm $(TEMP)/$(NGINX)/src/http/modules/ngx_http_status_module.c | |
| 60 | |
| 61 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX) | |
| 62 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX) | |
| 63 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
|
64 mv $(TEMP)/$(NGINX)/docs/man $(TEMP)/$(NGINX) |
| 701 | 65 |
| 66 $(MAKE) -f docs/GNUmakefile changes | |
| 67 | |
| 68 rm -r $(TEMP)/$(NGINX)/docs | |
| 69 rm -r $(TEMP)/$(NGINX)/misc | |
| 70 | |
| 681 | 71 tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX) |
| 72 | |
| 73 | |
| 2725 | 74 zip: |
| 75 rm -rf $(TEMP) | |
| 76 rm -f $(NGINX).zip | |
| 77 | |
| 78 mkdir -p $(TEMP)/$(NGINX)/docs | |
| 79 mkdir -p $(TEMP)/$(NGINX)/logs | |
| 80 mkdir -p $(TEMP)/$(NGINX)/temp | |
| 81 | |
| 82 svn export -rHEAD conf $(TEMP)/$(NGINX)/conf/ | |
| 83 perl -pi -e 's/$$/\r/' $(TEMP)/$(NGINX)/conf/* | |
| 84 | |
| 85 svn export -rHEAD contrib $(TEMP)/$(NGINX)/contrib/ | |
| 86 svn export -rHEAD docs/html $(TEMP)/$(NGINX)/html/ | |
| 87 | |
| 88 $(MAKE) -f docs/GNUmakefile changes | |
| 89 | |
| 90 cp -p $(OBJS)/nginx.exe $(TEMP)/$(NGINX) | |
| 91 | |
| 92 cp -p docs/text/LICENSE $(TEMP)/$(NGINX)/docs/ | |
| 93 cp -p docs/text/README $(TEMP)/$(NGINX)/docs/ | |
| 94 mv $(TEMP)/$(NGINX)/CHANGES* $(TEMP)/$(NGINX)/docs/ | |
| 95 | |
| 96 cp -p $(OBJS)/lib/$(OPENSSL)/LICENSE \ | |
| 97 $(TEMP)/$(NGINX)/docs/OpenSSL.LICENSE | |
| 98 | |
|
2871
c7fe4b9118d2
fix "make zip", the bug has been introduced in r2841
Igor Sysoev <igor@sysoev.ru>
parents:
2734
diff
changeset
|
99 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
|
100 $(TEMP)/$(NGINX)/docs/PCRE.LICENCE |
| 2725 | 101 |
| 102 perl -ne 'print if /^ \(C\) 1995-2004/ .. /^ jloup\@gzip.org/' \ | |
| 103 $(OBJS)/lib/$(ZLIB)/README \ | |
| 104 > $(TEMP)/$(NGINX)/docs/zlib.LICENSE | |
| 105 | |
| 106 touch -r $(OBJS)/lib/$(ZLIB)/README \ | |
| 107 $(TEMP)/$(NGINX)/docs/zlib.LICENSE | |
| 108 | |
| 109 cd $(TEMP) && zip -r ../$(NGINX).zip $(NGINX) | |
| 110 | |
| 111 | |
| 112 icons: src/os/win32/nginx.ico | |
| 681 | 113 |
| 2734 | 114 # 48x48, 32x32 and 16x16 icons |
| 681 | 115 |
| 2734 | 116 src/os/win32/nginx.ico: src/os/win32/nginx_icon48.xpm \ |
| 117 src/os/win32/nginx_icon32.xpm \ | |
| 681 | 118 src/os/win32/nginx_icon16.xpm |
| 119 | |
| 120 test -d $(TEMP) || mkdir $(TEMP) | |
| 121 | |
| 2734 | 122 xpmtoppm --alphaout=$(TEMP)/nginx48.pbm \ |
| 123 src/os/win32/nginx_icon48.xpm > $(TEMP)/nginx48.ppm | |
| 124 | |
| 681 | 125 xpmtoppm --alphaout=$(TEMP)/nginx32.pbm \ |
| 126 src/os/win32/nginx_icon32.xpm > $(TEMP)/nginx32.ppm | |
| 127 | |
| 128 xpmtoppm --alphaout=$(TEMP)/nginx16.pbm \ | |
| 129 src/os/win32/nginx_icon16.xpm > $(TEMP)/nginx16.ppm | |
| 130 | |
| 131 ppmtowinicon -output src/os/win32/nginx.ico -andpgms \ | |
| 2734 | 132 $(TEMP)/nginx48.ppm $(TEMP)/nginx48.pbm \ |
| 681 | 133 $(TEMP)/nginx32.ppm $(TEMP)/nginx32.pbm \ |
| 134 $(TEMP)/nginx16.ppm $(TEMP)/nginx16.pbm |