comparison misc/GNUmakefile @ 4847:0275f587e00b stable-1.2

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.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 24 Sep 2012 18:30:26 +0000
parents 488698c39bfa
children 026ff0eb3062
comparison
equal deleted inserted replaced
4846:f0300f64e8fb 4847:0275f587e00b
91 mkdir -p $(TEMP)/$(NGINX)/docs 91 mkdir -p $(TEMP)/$(NGINX)/docs
92 mkdir -p $(TEMP)/$(NGINX)/logs 92 mkdir -p $(TEMP)/$(NGINX)/logs
93 mkdir -p $(TEMP)/$(NGINX)/temp 93 mkdir -p $(TEMP)/$(NGINX)/temp
94 94
95 svn export -rHEAD conf $(TEMP)/$(NGINX)/conf/ 95 svn export -rHEAD conf $(TEMP)/$(NGINX)/conf/
96 perl -pi -e 's/$$/\r/' $(TEMP)/$(NGINX)/conf/* 96 sed -i '' -e "s/$$/`printf '\r'`/" $(TEMP)/$(NGINX)/conf/*
97 97
98 svn export -rHEAD contrib $(TEMP)/$(NGINX)/contrib/ 98 svn export -rHEAD contrib $(TEMP)/$(NGINX)/contrib/
99 svn export -rHEAD docs/html $(TEMP)/$(NGINX)/html/ 99 svn export -rHEAD docs/html $(TEMP)/$(NGINX)/html/
100 100
101 $(MAKE) -f docs/GNUmakefile changes 101 $(MAKE) -f docs/GNUmakefile changes
110 $(TEMP)/$(NGINX)/docs/OpenSSL.LICENSE 110 $(TEMP)/$(NGINX)/docs/OpenSSL.LICENSE
111 111
112 cp -p $(OBJS)/lib/$(PCRE)/LICENCE \ 112 cp -p $(OBJS)/lib/$(PCRE)/LICENCE \
113 $(TEMP)/$(NGINX)/docs/PCRE.LICENCE 113 $(TEMP)/$(NGINX)/docs/PCRE.LICENCE
114 114
115 perl -ne 'print if /^ \(C\) 1995-20/ .. /^ jloup\@gzip.org/' \ 115 sed -ne '/^ (C) 1995-20/,/^ jloup@gzip\.org/p' \
116 $(OBJS)/lib/$(ZLIB)/README \ 116 $(OBJS)/lib/$(ZLIB)/README \
117 > $(TEMP)/$(NGINX)/docs/zlib.LICENSE 117 > $(TEMP)/$(NGINX)/docs/zlib.LICENSE
118 118
119 touch -r $(OBJS)/lib/$(ZLIB)/README \ 119 touch -r $(OBJS)/lib/$(ZLIB)/README \
120 $(TEMP)/$(NGINX)/docs/zlib.LICENSE 120 $(TEMP)/$(NGINX)/docs/zlib.LICENSE