Mercurial > hg > nginx
annotate misc/GNUmakefile @ 4729:4ff2131dbce5 stable-1.2
Merge of r4691: changed default alignment to 16.
This fixes alignment problems observerd on ARMs, and likely also needed
for MIPSes. Unless we know alignment is not required just assume we
need 16, which appears to be safe default for all architectures.
See here for details:
http://mailman.nginx.org/pipermail/nginx/2012-June/034139.html
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 02 Jul 2012 17:08:26 +0000 |
| parents | ad7b9c54301d |
| children | 488698c39bfa |
| 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 |
|
4393
f753d0e96ccd
libraries versions updated
Sergey Budnevitch <sb@waeme.net>
parents:
4392
diff
changeset
|
10 ZLIB = zlib-1.2.5 |
|
4526
e954f40fc28b
Updated OpenSSL and PCRE used for win32 builds.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4425
diff
changeset
|
11 PCRE = pcre-8.30 |
| 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 | |
| 86 | |
| 2725 | 87 zip: |
| 88 rm -rf $(TEMP) | |
| 89 rm -f $(NGINX).zip | |
| 90 | |
| 91 mkdir -p $(TEMP)/$(NGINX)/docs | |
| 92 mkdir -p $(TEMP)/$(NGINX)/logs | |
| 93 mkdir -p $(TEMP)/$(NGINX)/temp | |
| 94 | |
| 95 svn export -rHEAD conf $(TEMP)/$(NGINX)/conf/ | |
| 96 perl -pi -e 's/$$/\r/' $(TEMP)/$(NGINX)/conf/* | |
| 97 | |
| 98 svn export -rHEAD contrib $(TEMP)/$(NGINX)/contrib/ | |
| 99 svn export -rHEAD docs/html $(TEMP)/$(NGINX)/html/ | |
| 100 | |
| 101 $(MAKE) -f docs/GNUmakefile changes | |
| 102 | |
| 103 cp -p $(OBJS)/nginx.exe $(TEMP)/$(NGINX) | |
| 104 | |
| 105 cp -p docs/text/LICENSE $(TEMP)/$(NGINX)/docs/ | |
| 106 cp -p docs/text/README $(TEMP)/$(NGINX)/docs/ | |
| 107 mv $(TEMP)/$(NGINX)/CHANGES* $(TEMP)/$(NGINX)/docs/ | |
| 108 | |
| 109 cp -p $(OBJS)/lib/$(OPENSSL)/LICENSE \ | |
| 110 $(TEMP)/$(NGINX)/docs/OpenSSL.LICENSE | |
| 111 | |
|
2871
c7fe4b9118d2
fix "make zip", the bug has been introduced in r2841
Igor Sysoev <igor@sysoev.ru>
parents:
2734
diff
changeset
|
112 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
|
113 $(TEMP)/$(NGINX)/docs/PCRE.LICENCE |
| 2725 | 114 |
|
4392
21c8ea5d4d10
zlib license file include fixed
Sergey Budnevitch <sb@waeme.net>
parents:
4342
diff
changeset
|
115 perl -ne 'print if /^ \(C\) 1995-20/ .. /^ jloup\@gzip.org/' \ |
| 2725 | 116 $(OBJS)/lib/$(ZLIB)/README \ |
| 117 > $(TEMP)/$(NGINX)/docs/zlib.LICENSE | |
| 118 | |
| 119 touch -r $(OBJS)/lib/$(ZLIB)/README \ | |
| 120 $(TEMP)/$(NGINX)/docs/zlib.LICENSE | |
| 121 | |
| 122 cd $(TEMP) && zip -r ../$(NGINX).zip $(NGINX) | |
| 123 | |
| 124 | |
| 125 icons: src/os/win32/nginx.ico | |
| 681 | 126 |
| 2734 | 127 # 48x48, 32x32 and 16x16 icons |
| 681 | 128 |
| 2734 | 129 src/os/win32/nginx.ico: src/os/win32/nginx_icon48.xpm \ |
| 130 src/os/win32/nginx_icon32.xpm \ | |
| 681 | 131 src/os/win32/nginx_icon16.xpm |
| 132 | |
| 133 test -d $(TEMP) || mkdir $(TEMP) | |
| 134 | |
| 2734 | 135 xpmtoppm --alphaout=$(TEMP)/nginx48.pbm \ |
| 136 src/os/win32/nginx_icon48.xpm > $(TEMP)/nginx48.ppm | |
| 137 | |
| 681 | 138 xpmtoppm --alphaout=$(TEMP)/nginx32.pbm \ |
| 139 src/os/win32/nginx_icon32.xpm > $(TEMP)/nginx32.ppm | |
| 140 | |
| 141 xpmtoppm --alphaout=$(TEMP)/nginx16.pbm \ | |
| 142 src/os/win32/nginx_icon16.xpm > $(TEMP)/nginx16.ppm | |
| 143 | |
| 144 ppmtowinicon -output src/os/win32/nginx.ico -andpgms \ | |
| 2734 | 145 $(TEMP)/nginx48.ppm $(TEMP)/nginx48.pbm \ |
| 681 | 146 $(TEMP)/nginx32.ppm $(TEMP)/nginx32.pbm \ |
| 147 $(TEMP)/nginx16.ppm $(TEMP)/nginx16.pbm |