Mercurial > hg > nginx
annotate docs/GNUmakefile @ 4448:539355d9e675 stable-1.0
Merge of r4404:
Fixed sched_setaffinity(2) to correctly pass size.
Second argument (cpusetsize) is size in bytes, not in bits. Previously
used constant 32 resulted in reading of uninitialized memory and caused
EINVAL to be returned on some Linux kernels.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Sun, 05 Feb 2012 19:25:24 +0000 |
| parents | dc7549aa8556 |
| children |
| rev | line source |
|---|---|
| 681 | 1 |
| 775 | 2 VER= $(shell grep 'define NGINX_VERSION' src/core/nginx.h \ |
| 3 | sed -e 's/^.*\"\(.*\)\"/\1/') | |
| 681 | 4 NGINX= nginx-$(VER) |
| 5 TEMP= tmp | |
| 6 CP= $(HOME)/java | |
| 7 | |
| 8 define XSLScript | |
|
4047
3e706fcccbf3
Merge of r3996, r3998, r4015, r4023, r4025, r4026, r4027:
Igor Sysoev <igor@sysoev.ru>
parents:
2065
diff
changeset
|
9 java -cp $(CP)/xsls/saxon.jar:$(CP)/xsls/xsls.jar \ |
| 681 | 10 com.pault.StyleSheet \ |
| 11 -x com.pault.XX -y com.pault.XX \ | |
|
4047
3e706fcccbf3
Merge of r3996, r3998, r4015, r4023, r4025, r4026, r4027:
Igor Sysoev <igor@sysoev.ru>
parents:
2065
diff
changeset
|
12 $(1) docs/xsls/dump.xsls \ |
|
3e706fcccbf3
Merge of r3996, r3998, r4015, r4023, r4025, r4026, r4027:
Igor Sysoev <igor@sysoev.ru>
parents:
2065
diff
changeset
|
13 | sed 's/ *$$//;/^ *$$/N;/\n *$$/D' > $(2) |
| 681 | 14 |
| 15 if [ ! -s $(2) ]; then rm $(2); fi; test -s $(2) | |
| 16 endef | |
| 17 | |
| 18 define XSLT | |
|
4346
dc7549aa8556
Merge of r4000, r4014, r4265, r4321, r4342, r4343:
Maxim Dounin <mdounin@mdounin.ru>
parents:
4047
diff
changeset
|
19 xmllint --noout --valid $2 |
|
4047
3e706fcccbf3
Merge of r3996, r3998, r4015, r4023, r4025, r4026, r4027:
Igor Sysoev <igor@sysoev.ru>
parents:
2065
diff
changeset
|
20 xsltproc -o $3 \ |
|
3e706fcccbf3
Merge of r3996, r3998, r4015, r4023, r4025, r4026, r4027:
Igor Sysoev <igor@sysoev.ru>
parents:
2065
diff
changeset
|
21 $(shell echo $4 \\ |
| 681 | 22 | sed -e "s/\([^= ]*\)=\([^= ]*\)/--param \1 \"'\2'\"/g") \ |
|
4047
3e706fcccbf3
Merge of r3996, r3998, r4015, r4023, r4025, r4026, r4027:
Igor Sysoev <igor@sysoev.ru>
parents:
2065
diff
changeset
|
23 $1 $2 |
| 681 | 24 endef |
| 25 | |
| 26 | |
| 27 changes: $(TEMP)/$(NGINX)/CHANGES.ru \ | |
| 28 $(TEMP)/$(NGINX)/CHANGES | |
| 29 | |
| 30 | |
| 31 $(TEMP)/$(NGINX)/CHANGES.ru: docs/xml/nginx/changes.xml \ | |
|
4346
dc7549aa8556
Merge of r4000, r4014, r4265, r4321, r4342, r4343:
Maxim Dounin <mdounin@mdounin.ru>
parents:
4047
diff
changeset
|
32 docs/xml/change_log_conf.xml \ |
| 681 | 33 docs/xslt/changes.xslt |
| 34 | |
| 35 test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX) | |
| 36 | |
|
4346
dc7549aa8556
Merge of r4000, r4014, r4265, r4321, r4342, r4343:
Maxim Dounin <mdounin@mdounin.ru>
parents:
4047
diff
changeset
|
37 xsltproc --stringparam lang ru \ |
| 681 | 38 -o $(TEMP)/$(NGINX)/CHANGES.ru \ |
| 39 docs/xslt/changes.xslt docs/xml/nginx/changes.xml | |
| 40 | |
| 41 | |
| 42 $(TEMP)/$(NGINX)/CHANGES: docs/xml/nginx/changes.xml \ | |
|
4346
dc7549aa8556
Merge of r4000, r4014, r4265, r4321, r4342, r4343:
Maxim Dounin <mdounin@mdounin.ru>
parents:
4047
diff
changeset
|
43 docs/xml/change_log_conf.xml \ |
| 681 | 44 docs/xslt/changes.xslt |
| 45 | |
| 2065 | 46 test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX) |
| 681 | 47 |
|
4346
dc7549aa8556
Merge of r4000, r4014, r4265, r4321, r4342, r4343:
Maxim Dounin <mdounin@mdounin.ru>
parents:
4047
diff
changeset
|
48 xsltproc --stringparam lang en \ |
| 681 | 49 -o $(TEMP)/$(NGINX)/CHANGES \ |
| 50 docs/xslt/changes.xslt docs/xml/nginx/changes.xml | |
| 51 | |
| 52 | |
| 53 docs/xslt/changes.xslt: docs/xsls/changes.xsls | |
| 54 | |
| 55 $(call XSLScript, docs/xsls/changes.xsls, $@) | |
| 56 |