Author: mdounin
Date: 2013-03-29 18:09:06 +0000 (Fri, 29 Mar 2013)
New Revision: 5162
URL: http://trac.nginx.org/nginx/changeset/5162/nginx

Log:
Merge of r5130, r5131, r5132: support for Mercurial repositories.

*) 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: removed unused "snapshot" target.

*) Misc: support for Mercurial repositories.


Modified:
branches/stable-1.2/
branches/stable-1.2/misc/GNUmakefile

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2 2013-03-29 17:59:41 UTC (rev 5161)
+++ branches/stable-1.2 2013-03-29 18:09:06 UTC (rev 5162)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4961-4969,4973-4974,4976-4994,4997,4999-5005,5011-5025,5027-5031,5066,5070-5071,5078,5082-5083,5098,5109,5113-5114,5117,5123,5127-5129
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4961-4969,4973-4974,4976-4994,4997,4999-5005,5011-5025,5027-5031,5066,5070-5071,5078,5082-5083,5098,5109,5113-5114,5117,5123,5127-5132
\ No newline at end of property
Modified: branches/stable-1.2/misc/GNUmakefile
===================================================================
--- branches/stable-1.2/misc/GNUmakefile 2013-03-29 17:59:41 UTC (rev 5161)
+++ branches/stable-1.2/misc/GNUmakefile 2013-03-29 18:09:06 UTC (rev 5162)
@@ -11,11 +11,8 @@
PCRE = pcre-8.32


-release:
- rm -rf $(TEMP)
+release: export

- svn export -rHEAD . $(TEMP)/$(NGINX)
-
mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX)

# delete incomplete sources
@@ -39,7 +36,32 @@
tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX)


+export:
+ rm -rf $(TEMP)
+
+ if [ -d .svn ]; then \
+ svn export -rHEAD . $(TEMP)/$(NGINX); \
+ else \
+ hg archive -X '.hg*' $(TEMP)/$(NGINX); \
+ fi
+
+
RELEASE:
+ if [ -d .svn ]; then \
+ $(MAKE) -f misc/GNUmakefile RELEASE.svn; \
+ else \
+ $(MAKE) -f misc/GNUmakefile RELEASE.hg; \
+ fi
+
+ $(MAKE) -f misc/GNUmakefile release
+
+
+RELEASE.hg:
+ hg ci -m nginx-$(VER)-RELEASE
+ hg tag -m "release-$(VER) tag" release-$(VER)
+
+
+RELEASE.svn:
test -d $(TEMP) || mkdir -p $(TEMP)

echo "nginx-$(VER)-RELEASE" > $(TEMP)/message
@@ -52,37 +74,7 @@

svn up

- $(MAKE) -f misc/GNUmakefile release

-
-snapshot:
- rm -rf $(TEMP)
-
- mkdir -p $(TEMP)
- svn export . $(TEMP)/$(NGINX)
-
- mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX)
-
- # delete incomplete sources
- rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c
- rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c
- rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.*
- rm -r $(TEMP)/$(NGINX)/src/os/win32
-
- rm -r $(TEMP)/$(NGINX)/src/mysql
-
- mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX)
- mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX)
- mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX)
- mv $(TEMP)/$(NGINX)/docs/man $(TEMP)/$(NGINX)
-
- $(MAKE) -f docs/GNUmakefile changes
-
- rm -r $(TEMP)/$(NGINX)/docs
- rm -r $(TEMP)/$(NGINX)/misc
-
- tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX)
-
win32:
./auto/configure \
--with-cc=cl \
@@ -120,26 +112,26 @@
--with-mail_ssl_module \
--with-ipv6

-zip:
- rm -rf $(TEMP)
+
+zip: export
rm -f $(NGINX).zip

- mkdir -p $(TEMP)/$(NGINX)/docs
+ 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 +147,10 @@
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)



_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel