From 332d21d5dc994de0e11305425885bdf4f095815e Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Mon, 22 Feb 2010 14:14:53 -0800 Subject: [PATCH] documentation: Fix version number to only consider x.y.z format Change-Id: I8fb45e92b9b9e38dfa9e1c10598174a6488ca3ea Signed-off-by: Shawn O. Pearce --- Documentation/GEN-DOC-VERSION | 2 +- Documentation/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/GEN-DOC-VERSION b/Documentation/GEN-DOC-VERSION index 0d6e815005..973bfa8d27 100755 --- a/Documentation/GEN-DOC-VERSION +++ b/Documentation/GEN-DOC-VERSION @@ -14,6 +14,6 @@ case "$V" in ;; v*) - echo ${V#v} + echo "$V" | perl -lne 'print $1 if /^v(\d+\.\d+(?:\.\d+)?)/' ;; esac diff --git a/Documentation/Makefile b/Documentation/Makefile index 673c0a724c..18a92b4dbf 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -52,7 +52,7 @@ endif @-rm -rf $(LOCAL_ROOT) @echo "Checking out current $(VERSION)" @if ! $(SVN) checkout $(PUB_DIR) $(LOCAL_ROOT) 2>/dev/null ; then \ - p=$$(git describe HEAD^ | perl -lne 'print $$1 if /^v(\d+\.\d+\.\d+)/') && \ + p=$$(git describe HEAD^ | perl -lne 'print $$1 if /^v(\d+\.\d+(?:\.\d+)?)/') && \ echo "Copying $$p to $(VERSION) ..." && \ $(SVN) cp -m "Create $(VERSION) documentation" $(PUB_ROOT)/$$p $(PUB_DIR) && \ $(SVN) checkout $(PUB_DIR) $(LOCAL_ROOT) ; \