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.

diff --git a/auto/lib/perl/make b/auto/lib/perl/make
index 1c8f21cba4303c4c9d39ebce5de8ef28b0eac3c5..825ffe7da6afd32e0792e03a5b5b85a4464adc54 100644 (file)
--- a/auto/lib/perl/make
+++ b/auto/lib/perl/make
@@ -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/blib/arch/auto/nginx/nginx.$ngx_perl_dlext: \\
 
 
 $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/
 

diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm
index 5f02fa7b37e889846586100df87cbcac8c5d28bb..e3f736110258df8e8fc20f56bf2c7c2ed4d17778 100644 (file)
--- a/src/http/modules/perl/nginx.pm
+++ b/src/http/modules/perl/nginx.pm
@@ -50,7 +50,7 @@ our @EXPORT = qw(
     HTTP_INSUFFICIENT_STORAGE
 );
 
-our $VERSION = '1.3.16';
+our $VERSION = '%%VERSION%%';
 
 require XSLoader;
 XSLoader::load('nginx', $VERSION);