From 50bd632663eb338ceaf9a639c4d9087716748f82 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Fri, 22 Mar 2013 15:14:07 +0000 Subject: [PATCH] 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. --- misc/GNUmakefile | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/misc/GNUmakefile b/misc/GNUmakefile index d649eec42..01e07fcce 100644 --- a/misc/GNUmakefile +++ b/misc/GNUmakefile @@ -124,22 +124,24 @@ zip: rm -rf $(TEMP) rm -f $(NGINX).zip - mkdir -p $(TEMP)/$(NGINX)/docs + svn export -rHEAD . $(TEMP)/$(NGINX) + + mkdir -p $(TEMP)/$(NGINX)/docs.new mkdir -p $(TEMP)/$(NGINX)/logs mkdir -p $(TEMP)/$(NGINX)/temp - svn export -rHEAD conf $(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/ + mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX)/docs.new + mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX)/docs.new + mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX) - $(MAKE) -f docs/GNUmakefile changes + rm -r $(TEMP)/$(NGINX)/docs + mv $(TEMP)/$(NGINX)/docs.new $(TEMP)/$(NGINX)/docs cp -p $(OBJS)/nginx.exe $(TEMP)/$(NGINX) - cp -p docs/text/LICENSE $(TEMP)/$(NGINX)/docs/ - cp -p docs/text/README $(TEMP)/$(NGINX)/docs/ + $(MAKE) -f docs/GNUmakefile changes mv $(TEMP)/$(NGINX)/CHANGES* $(TEMP)/$(NGINX)/docs/ cp -p $(OBJS)/lib/$(OPENSSL)/LICENSE \ @@ -155,6 +157,10 @@ zip: touch -r $(OBJS)/lib/$(ZLIB)/README \ $(TEMP)/$(NGINX)/docs/zlib.LICENSE + rm -r $(TEMP)/$(NGINX)/auto + rm -r $(TEMP)/$(NGINX)/misc + rm -r $(TEMP)/$(NGINX)/src + cd $(TEMP) && zip -r ../$(NGINX).zip $(NGINX) -- 2.47.3