artox/incubator-pagespeed-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

installer: allow --dynamic-module to be used with tags (#1334)

Browse Source 
* installer: allow --dynamic-module to be used with tags

A user-friendly check with dynamic module building tries to warn people early if the version of ngx_pagespeed they're building is too old to be compiled as a dynamic module, but this can't work with tags.  If we're given something other than a numeric version number, don't try to perform this check.

Fixes https://github.com/pagespeed/mod_pagespeed/issues/1443
This commit is contained in:
Jeff Kaufman
2016-12-08 15:14:12 -05:00
committed by GitHub
parent 7f225e2e70
commit 68185b8605
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/build_ngx_pagespeed.sh
+9 -2
View File
@@ -420,8 +420,15 @@ function build_ngx_pagespeed() {
if "$DYNAMIC_MODULE"; then if "$DYNAMIC_MODULE"; then
# Check that ngx_pagespeed and nginx are recent enough to support dynamic # Check that ngx_pagespeed and nginx are recent enough to support dynamic
# modules. # modules. Unfortunately NPS_VERSION might be a tag, in which case we don't
if version_older_than "$NPS_VERSION" "1.10.33.5"; then # know. If it's not a numeric version number, then assume it's recent
# enough and if it's not they'll get an ugly compilation error later.
# Luckily 1.10.33.5 was a while ago now.
#
# I'd like to use =~ here, but they changed syntax between v3 and v4 (quotes
# moved from mandatory to optional to prohibited).
if [[ "${NPS_VERSION#*[^0-9.]}" = "$NPS_VERSION" ]] &&
version_older_than "$NPS_VERSION" "1.10.33.5"; then
fail " fail "
You're trying to build ngx_pagespeed $NPS_VERSION as a dynamic module, but You're trying to build ngx_pagespeed $NPS_VERSION as a dynamic module, but
ngx_pagespeed didn't add support for dynamic modules until 1.10.33.5." ngx_pagespeed didn't add support for dynamic modules until 1.10.33.5."