diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2011-12-13 17:58:18 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2011-12-13 17:58:18 +0000 |
| commit | 33a77285e543347754a3a7df49f34429b7ea0fa1 (patch) | |
| tree | 210ceac2fcb90fd0f581a73305921752a42cf5c3 /misc | |
| parent | a0a8663eae881d954dc18c1fa00a6b51a92e441e (diff) | |
| download | nginx-33a77285e543347754a3a7df49f34429b7ea0fa1.tar.gz nginx-33a77285e543347754a3a7df49f34429b7ea0fa1.tar.bz2 | |
Merge of r4000, r4014, r4265, r4321, r4342, r4343:
Infrastructure changes:
*) Don't ignore xmllint errors.
*) Added missing dependencies for the CHANGES{,ru} targets.
Pass string params to xsltproc.
*) Ancient incomplete ngx_http_status_module removal.
*) Compute the repository root from the checkout.
*) Fixed RELEASE target to correctly call "release" one.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/GNUmakefile | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/misc/GNUmakefile b/misc/GNUmakefile index 188b796ec..3c28701ef 100644 --- a/misc/GNUmakefile +++ b/misc/GNUmakefile @@ -3,7 +3,7 @@ VER = $(shell grep 'define NGINX_VERSION' src/core/nginx.h \ | sed -e 's/^.*\"\(.*\)\"/\1/') NGINX = nginx-$(VER) TEMP = tmp -REPO = svn://svn.nginx.com +REPO = $(shell svn info | sed -n 's/^Repository Root: //p') OBJS = objs.msvc8 OPENSSL = openssl-0.9.8r @@ -26,8 +26,6 @@ release: rm -r $(TEMP)/$(NGINX)/src/mysql - rm $(TEMP)/$(NGINX)/src/http/modules/ngx_http_status_module.c - mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX) mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX) mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX) @@ -48,13 +46,13 @@ RELEASE: svn ci -F $(TEMP)/message echo "release-$(VER) tag" > $(TEMP)/message - svn copy $(REPO)/nginx/branches/stable-1.0 \ - $(REPO)/nginx/tags/release-$(VER) \ + svn copy $(REPO)/branches/stable-1.0 \ + $(REPO)/tags/release-$(VER) \ -F $(TEMP)/message svn up - $(MAKE) release + $(MAKE) -f misc/GNUmakefile release snapshot: @@ -73,8 +71,6 @@ snapshot: rm -r $(TEMP)/$(NGINX)/src/mysql - rm $(TEMP)/$(NGINX)/src/http/modules/ngx_http_status_module.c - mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX) mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX) mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX) |