diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-09-24 18:30:26 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-09-24 18:30:26 +0000 |
| commit | 649cd3b401d37662d541aaf030fb0d90d1b43203 (patch) | |
| tree | 1f28fe1201020a36e24b9980b44877eedeff32f1 /misc | |
| parent | bd0a1916ddd0e8969594097c125aeef97bf9a18e (diff) | |
| download | nginx-649cd3b401d37662d541aaf030fb0d90d1b43203.tar.gz nginx-649cd3b401d37662d541aaf030fb0d90d1b43203.tar.bz2 | |
Merge of r4777, r4780, r4831, r4832: release process changes.
*) Simplified makefile that builds CHANGES.
*) Removed the need in Perl to generate ZIP archive of nginx/Windows.
*) Converted DOS-style newlines in dump.xslt.
*) Pass changes.xml thru xmllint when generating CHANGES and CHANGES.ru.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/GNUmakefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/GNUmakefile b/misc/GNUmakefile index b0c235a49..a7fcd9714 100644 --- a/misc/GNUmakefile +++ b/misc/GNUmakefile @@ -93,7 +93,7 @@ zip: mkdir -p $(TEMP)/$(NGINX)/temp svn export -rHEAD conf $(TEMP)/$(NGINX)/conf/ - perl -pi -e 's/$$/\r/' $(TEMP)/$(NGINX)/conf/* + sed -i '' -e "s/$$/`printf '\r'`/" $(TEMP)/$(NGINX)/conf/* svn export -rHEAD contrib $(TEMP)/$(NGINX)/contrib/ svn export -rHEAD docs/html $(TEMP)/$(NGINX)/html/ @@ -112,7 +112,7 @@ zip: cp -p $(OBJS)/lib/$(PCRE)/LICENCE \ $(TEMP)/$(NGINX)/docs/PCRE.LICENCE - perl -ne 'print if /^ \(C\) 1995-20/ .. /^ jloup\@gzip.org/' \ + sed -ne '/^ (C) 1995-20/,/^ jloup@gzip\.org/p' \ $(OBJS)/lib/$(ZLIB)/README \ > $(TEMP)/$(NGINX)/docs/zlib.LICENSE |