[nginx] svn commit: r5147 - in trunk: auto/lib/perl src/http/modules/perl

[ru at nginx.com]

Author: ru
Date: 2013-03-28 08:47:06 +0000 (Thu, 28 Mar 2013)
New Revision: 5147
URL: http://trac.nginx.org/nginx/changeset/5147/nginx

Log:
Simplified nginx version maintenance.

It's no longer necessary to update src/http/modules/perl/nginx.pm
when version is bumped, as it's now derived from src/core/nginx.h.


Modified:
   trunk/auto/lib/perl/make
   trunk/src/http/modules/perl/nginx.pm

Modified: trunk/auto/lib/perl/make
===================================================================
--- trunk/auto/lib/perl/make	2013-03-28 08:46:42 UTC (rev 5146)
+++ trunk/auto/lib/perl/make	2013-03-28 08:47:06 UTC (rev 5147)
@@ -3,6 +3,9 @@
 # Copyright (C) Nginx, Inc.
 
 
+v=`grep 'define NGINX_VERSION' src/core/nginx.h | sed -e 's/^.*"\(.*\)".*/\1/'`
+
+
 cat << END                                                    >> $NGX_MAKEFILE
 
 $NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.$ngx_perl_dlext: \\
@@ -15,11 +18,14 @@
 
 
 $NGX_OBJS/src/http/modules/perl/Makefile: \\
+		src/core/nginx.h \\
 		src/http/modules/perl/Makefile.PL \\
 		src/http/modules/perl/nginx.pm \\
 		src/http/modules/perl/nginx.xs \\
 		src/http/modules/perl/typemap
-	cp -p src/http/modules/perl/nginx.* $NGX_OBJS/src/http/modules/perl/
+	sed "s/%%VERSION%%/$v/" src/http/modules/perl/nginx.pm > \\
+		$NGX_OBJS/src/http/modules/perl/nginx.pm
+	cp -p src/http/modules/perl/nginx.xs $NGX_OBJS/src/http/modules/perl/
 	cp -p src/http/modules/perl/typemap $NGX_OBJS/src/http/modules/perl/
 	cp -p src/http/modules/perl/Makefile.PL $NGX_OBJS/src/http/modules/perl/
 

Modified: trunk/src/http/modules/perl/nginx.pm
===================================================================
--- trunk/src/http/modules/perl/nginx.pm	2013-03-28 08:46:42 UTC (rev 5146)
+++ trunk/src/http/modules/perl/nginx.pm	2013-03-28 08:47:06 UTC (rev 5147)
@@ -50,7 +50,7 @@
     HTTP_INSUFFICIENT_STORAGE
 );
 
-our $VERSION = '1.3.16';
+our $VERSION = '%%VERSION%%';
 
 require XSLoader;
 XSLoader::load('nginx', $VERSION);