Mercurial > hg > nginx
annotate misc/GNUmakefile @ 3755:76e3a93821b1
fix race condition if during reconfiguration two cache managers try
to delete old inactive entries: one of them removes a entry just locked by
other manager from the queue and the rbtree as long inactive entry,
causes the latter manager to segfault leaving cache mutex locked,
the bug has been introduced in r3727
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Thu, 02 Sep 2010 14:31:47 +0000 |
| parents | e05f33d93e35 |
| children | 569716d0e447 8106bf694512 |
| 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 | |
|
3717
e05f33d93e35
copy OpenSSL-0.9.8o LICENSE for nginx/Windows zip
Igor Sysoev <igor@sysoev.ru>
parents:
3496
diff
changeset
|
8 OPENSSL = openssl-0.9.8o |
| 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) | |
| 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 |
| 42 snapshot: | |
| 43 rm -rf $(TEMP) | |
| 44 | |
| 45 mkdir -p $(TEMP) | |
| 46 svn export . $(TEMP)/$(NGINX) | |
| 47 | |
| 48 mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX) | |
| 49 | |
| 50 # delete incomplete sources | |
| 51 rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c | |
| 52 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c | |
| 53 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.* | |
| 54 rm -r $(TEMP)/$(NGINX)/src/os/win32 | |
| 55 | |
| 56 rm -r $(TEMP)/$(NGINX)/src/mysql | |
| 57 | |
| 58 rm $(TEMP)/$(NGINX)/src/http/modules/ngx_http_status_module.c | |
| 59 | |
| 60 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX) | |
| 61 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX) | |
| 62 mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX) | |
| 63 | |
| 64 $(MAKE) -f docs/GNUmakefile changes | |
| 65 | |
| 66 rm -r $(TEMP)/$(NGINX)/docs | |
| 67 rm -r $(TEMP)/$(NGINX)/misc | |
| 68 | |
| 681 | 69 tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX) |
| 70 | |
| 71 | |
| 2725 | 72 zip: |
| 73 rm -rf $(TEMP) | |
| 74 rm -f $(NGINX).zip | |
| 75 | |
| 76 mkdir -p $(TEMP)/$(NGINX)/docs | |
| 77 mkdir -p $(TEMP)/$(NGINX)/logs | |
| 78 mkdir -p $(TEMP)/$(NGINX)/temp | |
| 79 | |
| 80 svn export -rHEAD conf $(TEMP)/$(NGINX)/conf/ | |
| 81 perl -pi -e 's/$$/\r/' $(TEMP)/$(NGINX)/conf/* | |
| 82 | |
| 83 svn export -rHEAD contrib $(TEMP)/$(NGINX)/contrib/ | |
| 84 svn export -rHEAD docs/html $(TEMP)/$(NGINX)/html/ | |
| 85 | |
| 86 $(MAKE) -f docs/GNUmakefile changes | |
| 87 | |
| 88 cp -p $(OBJS)/nginx.exe $(TEMP)/$(NGINX) | |
| 89 | |
| 90 cp -p docs/text/LICENSE $(TEMP)/$(NGINX)/docs/ | |
| 91 cp -p docs/text/README $(TEMP)/$(NGINX)/docs/ | |
| 92 mv $(TEMP)/$(NGINX)/CHANGES* $(TEMP)/$(NGINX)/docs/ | |
| 93 | |
| 94 cp -p $(OBJS)/lib/$(OPENSSL)/LICENSE \ | |
| 95 $(TEMP)/$(NGINX)/docs/OpenSSL.LICENSE | |
| 96 | |
|
2871
c7fe4b9118d2
fix "make zip", the bug has been introduced in r2841
Igor Sysoev <igor@sysoev.ru>
parents:
2734
diff
changeset
|
97 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
|
98 $(TEMP)/$(NGINX)/docs/PCRE.LICENCE |
| 2725 | 99 |
| 100 perl -ne 'print if /^ \(C\) 1995-2004/ .. /^ jloup\@gzip.org/' \ | |
| 101 $(OBJS)/lib/$(ZLIB)/README \ | |
| 102 > $(TEMP)/$(NGINX)/docs/zlib.LICENSE | |
| 103 | |
| 104 touch -r $(OBJS)/lib/$(ZLIB)/README \ | |
| 105 $(TEMP)/$(NGINX)/docs/zlib.LICENSE | |
| 106 | |
| 107 cd $(TEMP) && zip -r ../$(NGINX).zip $(NGINX) | |
| 108 | |
| 109 | |
| 110 icons: src/os/win32/nginx.ico | |
| 681 | 111 |
| 2734 | 112 # 48x48, 32x32 and 16x16 icons |
| 681 | 113 |
| 2734 | 114 src/os/win32/nginx.ico: src/os/win32/nginx_icon48.xpm \ |
| 115 src/os/win32/nginx_icon32.xpm \ | |
| 681 | 116 src/os/win32/nginx_icon16.xpm |
| 117 | |
| 118 test -d $(TEMP) || mkdir $(TEMP) | |
| 119 | |
| 2734 | 120 xpmtoppm --alphaout=$(TEMP)/nginx48.pbm \ |
| 121 src/os/win32/nginx_icon48.xpm > $(TEMP)/nginx48.ppm | |
| 122 | |
| 681 | 123 xpmtoppm --alphaout=$(TEMP)/nginx32.pbm \ |
| 124 src/os/win32/nginx_icon32.xpm > $(TEMP)/nginx32.ppm | |
| 125 | |
| 126 xpmtoppm --alphaout=$(TEMP)/nginx16.pbm \ | |
| 127 src/os/win32/nginx_icon16.xpm > $(TEMP)/nginx16.ppm | |
| 128 | |
| 129 ppmtowinicon -output src/os/win32/nginx.ico -andpgms \ | |
| 2734 | 130 $(TEMP)/nginx48.ppm $(TEMP)/nginx48.pbm \ |
| 681 | 131 $(TEMP)/nginx32.ppm $(TEMP)/nginx32.pbm \ |
| 132 $(TEMP)/nginx16.ppm $(TEMP)/nginx16.pbm |