[svn-r17661] Add option to specify version for documentation.

Previously added to release in hdfdts, but release script should be part of source code.

Tested:  jam.

1 files changed, 20 insertions, 4 deletions

diff --git a/bin/release b/bin/release
index c335028..0d547df 100755
--- a/bin/release
+++ b/bin/release
@@ -44,6 +44,10 @@ Usage: $0 [--nocheck] [-d <dir>] [-h] <methods> ...
    -d DIR	The name of the directory where the releas(es) should be
                 placed.  By default, the directory is ./releases
 
+   --docver BRANCHNAME  This is added for 1.8 and beyond to get the correct
+                        version of documentation files from the hdf5docs
+                        repository.  BRANCHNAME for v1.8 should be hdf5_1_8.
+
    --nocheck	Ignore errors in MANIFEST file.
          
    --private	Make a private release with today's date in version information.
@@ -131,6 +135,10 @@ while [ -n "$1" ]; do
 	--private)
 	    pmode=yes
 	    ;;
+        --docver)
+            DOCVERSION=$1
+            shift
+            ;;
 	-*)
 	    echo "Unknown switch: $arg" 1>&2
 	    USAGE
@@ -210,6 +218,11 @@ for f in README.txt release_docs/RELEASE.txt; do
     chmod 644 $f
 done
 
+# trunk is different than branches.
+if [ "${DOCVERSION}" ]; then
+    DOC_URL=http://svn.hdfgroup.uiuc.edu/hdf5doc/branches/${DOCVERSION}
+fi
+
 # Create the tar file
 test "$verbose" && echo "   Running tar..." 1>&2
 ( \
@@ -241,16 +254,19 @@ for comp in $methods; do
 	    (cd $tmpdir; md5sum $HDF5_VERS.tar ) > $DEST/$HDF5_VERS.tar.md5
 	    ;;
 	doc)
+            if [ "${DOCVERSION}" = "" ]; then
+                DOCVERSION=trunk
+            fi
 	    test "$verbose" && echo "   Creating docs..." 1>&2
 	    # Check out docs from svn repo
 	    (cd $tmpdir; svn co $DOC_URL > /dev/null) || exit 1
 	    # Create doxygen C++ RM
 	    (cd c++/src && doxygen cpp_doc_config > /dev/null ) || exit 1
 	    # Replace version of C++ RM with just-created version
-	    rm -rf $tmpdir/trunk/html/$CPPLUS_RM_NAME
-	    mv c++/src/$CPPLUS_RM_NAME $tmpdir/trunk/html/$CPPLUS_RM_NAME
-	    # Compress the docs and move them to the release area
-	    mv $tmpdir/trunk $tmpdir/${HDF5_VERS}_docs
+            rm -rf $tmpdir/${DOCVERSION}/html/$CPPLUS_RM_NAME
+            mv c++/src/$CPPLUS_RM_NAME $tmpdir/${DOCVERSION}/html/$CPPLUS_RM_NAME
+            # Compress the docs and move them to the release area
+            mv $tmpdir/$DOCVERSION $tmpdir/${HDF5_VERS}_docs
 	    (cd $tmpdir && tar cf ${HDF5_VERS}_docs.tar ${HDF5_VERS}_docs)
 	    mv $tmpdir/${HDF5_VERS}_docs.tar $DEST
 	    ;;