comparison misc/GNUmakefile @ 5129:96ee76fda991

Misc: switch to single export operation in "zip" target. While exporting parts of the tree might be better in some cases, it is awfully slow overseas, and also requires unlocking ssh key multiple times. Exporting the whole repo and removing directories not needed for zip is faster here. It is also a required step before we can switch to Mercurial.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 22 Mar 2013 15:14:07 +0000
parents 8b02da13b1d2
children e0b7fe86a70d
comparison
equal deleted inserted replaced
5128:b78cf2414fda 5129:96ee76fda991
122 122
123 zip: 123 zip:
124 rm -rf $(TEMP) 124 rm -rf $(TEMP)
125 rm -f $(NGINX).zip 125 rm -f $(NGINX).zip
126 126
127 mkdir -p $(TEMP)/$(NGINX)/docs 127 svn export -rHEAD . $(TEMP)/$(NGINX)
128
129 mkdir -p $(TEMP)/$(NGINX)/docs.new
128 mkdir -p $(TEMP)/$(NGINX)/logs 130 mkdir -p $(TEMP)/$(NGINX)/logs
129 mkdir -p $(TEMP)/$(NGINX)/temp 131 mkdir -p $(TEMP)/$(NGINX)/temp
130 132
131 svn export -rHEAD conf $(TEMP)/$(NGINX)/conf/
132 sed -i '' -e "s/$$/`printf '\r'`/" $(TEMP)/$(NGINX)/conf/* 133 sed -i '' -e "s/$$/`printf '\r'`/" $(TEMP)/$(NGINX)/conf/*
133 134
134 svn export -rHEAD contrib $(TEMP)/$(NGINX)/contrib/ 135 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX)/docs.new
135 svn export -rHEAD docs/html $(TEMP)/$(NGINX)/html/ 136 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX)/docs.new
137 mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX)
136 138
137 $(MAKE) -f docs/GNUmakefile changes 139 rm -r $(TEMP)/$(NGINX)/docs
140 mv $(TEMP)/$(NGINX)/docs.new $(TEMP)/$(NGINX)/docs
138 141
139 cp -p $(OBJS)/nginx.exe $(TEMP)/$(NGINX) 142 cp -p $(OBJS)/nginx.exe $(TEMP)/$(NGINX)
140 143
141 cp -p docs/text/LICENSE $(TEMP)/$(NGINX)/docs/ 144 $(MAKE) -f docs/GNUmakefile changes
142 cp -p docs/text/README $(TEMP)/$(NGINX)/docs/
143 mv $(TEMP)/$(NGINX)/CHANGES* $(TEMP)/$(NGINX)/docs/ 145 mv $(TEMP)/$(NGINX)/CHANGES* $(TEMP)/$(NGINX)/docs/
144 146
145 cp -p $(OBJS)/lib/$(OPENSSL)/LICENSE \ 147 cp -p $(OBJS)/lib/$(OPENSSL)/LICENSE \
146 $(TEMP)/$(NGINX)/docs/OpenSSL.LICENSE 148 $(TEMP)/$(NGINX)/docs/OpenSSL.LICENSE
147 149
152 $(OBJS)/lib/$(ZLIB)/README \ 154 $(OBJS)/lib/$(ZLIB)/README \
153 > $(TEMP)/$(NGINX)/docs/zlib.LICENSE 155 > $(TEMP)/$(NGINX)/docs/zlib.LICENSE
154 156
155 touch -r $(OBJS)/lib/$(ZLIB)/README \ 157 touch -r $(OBJS)/lib/$(ZLIB)/README \
156 $(TEMP)/$(NGINX)/docs/zlib.LICENSE 158 $(TEMP)/$(NGINX)/docs/zlib.LICENSE
159
160 rm -r $(TEMP)/$(NGINX)/auto
161 rm -r $(TEMP)/$(NGINX)/misc
162 rm -r $(TEMP)/$(NGINX)/src
157 163
158 cd $(TEMP) && zip -r ../$(NGINX).zip $(NGINX) 164 cd $(TEMP) && zip -r ../$(NGINX).zip $(NGINX)
159 165
160 166
161 icons: src/os/win32/nginx.ico 167 icons: src/os/win32/nginx.ico