diff misc/GNUmakefile @ 4346:dc7549aa8556 stable-1.0

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.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 13 Dec 2011 17:58:18 +0000
parents ac0a3dc948c3
children f9b3061e0f31
line wrap: on
line diff
--- a/misc/GNUmakefile
+++ b/misc/GNUmakefile
@@ -3,7 +3,7 @@ VER =		$(shell grep 'define NGINX_VERSIO
 			| 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)