diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-03-22 15:47:18 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-03-22 15:47:18 +0000 |
| commit | 66f9c0f55210d6063adfe27c406be7307e708a54 (patch) | |
| tree | 695a0382a73a490557dcc82537a14ed005396675 | |
| parent | 313901628c387ed4ed8db1f66c78c819a2daecc4 (diff) | |
| download | nginx-66f9c0f55210d6063adfe27c406be7307e708a54.tar.gz nginx-66f9c0f55210d6063adfe27c406be7307e708a54.zip | |
Misc: support for Mercurial repositories.
| -rw-r--r-- | misc/GNUmakefile | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/misc/GNUmakefile b/misc/GNUmakefile index c69796d80..373569650 100644 --- a/misc/GNUmakefile +++ b/misc/GNUmakefile @@ -11,10 +11,7 @@ ZLIB = zlib-1.2.7 PCRE = pcre-8.32 -release: - rm -rf $(TEMP) - - svn export -rHEAD . $(TEMP)/$(NGINX) +release: export mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX) @@ -39,7 +36,32 @@ release: 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 @@ -51,8 +73,6 @@ RELEASE: svn up - $(MAKE) -f misc/GNUmakefile release - win32: ./auto/configure \ @@ -92,11 +112,9 @@ win32: --with-mail_ssl_module \ --with-ipv6 -zip: - rm -rf $(TEMP) - rm -f $(NGINX).zip - svn export -rHEAD . $(TEMP)/$(NGINX) +zip: export + rm -f $(NGINX).zip mkdir -p $(TEMP)/$(NGINX)/docs.new mkdir -p $(TEMP)/$(NGINX)/logs |