Mercurial > hg > nginx-quic
annotate docs/GNUmakefile @ 4901:a0cb7fc23cc2 stable-1.2
Merge of r4868, r4869: SSL minor fixes.
*) SSL: fixed compression workaround to remove all methods.
Previous code used sk_SSL_COMP_delete(ssl_comp_methods, i) while iterating
stack from 0 to n, resulting in removal of only even compression methods.
In real life this change is a nop, as there is only one compression method
which is enabled by default in OpenSSL.
*) SSL: added version checks for ssl compression workaround.
The SSL_COMP_get_compression_methods() is only available as an API
function in OpenSSL 0.9.8+, require it explicitly to unbreak build
with OpenSSL 0.9.7.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 12 Nov 2012 18:00:32 +0000 |
parents | 0275f587e00b |
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 | |
4187
b9dade63fcc2
The reference documentation is moving elsewhere.
Ruslan Ermilov <ru@nginx.com>
parents:
4110
diff
changeset
|
9 all: changes |
4068
22364b1f61c9
Initial English translation of Core and HTTP Core modules.
Ruslan Ermilov <ru@nginx.com>
parents:
4013
diff
changeset
|
10 |
681 | 11 changes: $(TEMP)/$(NGINX)/CHANGES.ru \ |
12 $(TEMP)/$(NGINX)/CHANGES | |
13 | |
14 | |
4847
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
15 $(TEMP)/$(NGINX)/CHANGES.ru: docs/dtd/changes.dtd \ |
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
16 docs/xml/nginx/changes.xml \ |
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
17 docs/xml/change_log_conf.xml \ |
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
18 docs/xslt/changes.xslt |
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
19 |
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
20 mkdir -p $(TEMP)/$(NGINX) |
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
21 |
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
22 xmllint --noout --valid docs/xml/nginx/changes.xml |
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
23 xsltproc --stringparam lang ru \ |
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
24 -o $@ docs/xslt/changes.xslt docs/xml/nginx/changes.xml |
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
25 |
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
26 |
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
27 $(TEMP)/$(NGINX)/CHANGES: docs/dtd/changes.dtd \ |
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
28 docs/xml/nginx/changes.xml \ |
4013
b427290fb6bc
- Added missing dependencies for the CHANGES{,ru} targets.
Ruslan Ermilov <ru@nginx.com>
parents:
3999
diff
changeset
|
29 docs/xml/change_log_conf.xml \ |
681 | 30 docs/xslt/changes.xslt |
31 | |
4847
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
32 mkdir -p $(TEMP)/$(NGINX) |
681 | 33 |
4847
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
34 xmllint --noout --valid docs/xml/nginx/changes.xml |
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
35 xsltproc --stringparam lang en \ |
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
36 -o $@ docs/xslt/changes.xslt docs/xml/nginx/changes.xml |
681 | 37 |
38 | |
4847
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
39 docs/xslt/changes.xslt: docs/xsls/changes.xsls docs/xsls/dump.xsls |
681 | 40 |
4847
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
41 java -cp $(CP)/xsls/saxon.jar:$(CP)/xsls/xsls.jar \ |
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
42 com.pault.StyleSheet \ |
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
43 -x com.pault.XX -y com.pault.XX \ |
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
44 $< docs/xsls/dump.xsls \ |
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
45 | sed 's/ *$$//;/^ *$$/N;/\n *$$/D' > $@ |
681 | 46 |
4847
0275f587e00b
Merge of r4777, r4780, r4831, r4832: release process changes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4187
diff
changeset
|
47 if [ ! -s $@ ]; then rm $@; fi; test -s $@ |