diff --git a/doc/ns3_html_theme/get_version.sh b/doc/ns3_html_theme/get_version.sh index 15d62eb71..7f7e93bbc 100755 --- a/doc/ns3_html_theme/get_version.sh +++ b/doc/ns3_html_theme/get_version.sh @@ -137,12 +137,14 @@ fi outf="doc/ns3_html_theme/static/ns3_version.js" # Distance from last tag -# Zero distance means we're at the tag -distance=`hg log -r tip --template '{latesttagdistance}'` +# 'git describe HEAD --tags' will return a string such as either +# 'ns-3.29-159-xxx' (if we are at a distance from the last release tag) or +# 'ns-3.29' if we are at the tag. +distance=`git describe HEAD --tags | cut -c 9- | cut -d '-' -f 1` if [ $distance -eq 1 ]; then - version=`hg log -r tip --template '{latesttag}'` - say "at tag $version" + version=`git describe HEAD --tags | cut -d '-' -f 2` + say "at version $version" elif [ $tag -eq 1 ]; then distance=1 @@ -150,10 +152,13 @@ elif [ $tag -eq 1 ]; then vers_href= else - version=`hg log -r tip --template '{node|short}'` + version=`git describe HEAD --tags | cut -c 9- | cut -d '-' -f 2` # Check for uncommitted changes - hg summary | grep 'commit:' | grep -q '(clean)' - if [ ! $? ] ; then + changes=0 + if [ "$(git status --porcelain)" ]; then + changes=1 + fi + if [ $changes ] ; then say "beyond latest tag, last commit: $version, dirty" dirty="(+)" else @@ -170,14 +175,13 @@ if [ $PUBLIC -eq 1 ]; then if [ $distance -eq 1 ]; then # Like "http://www.nsnam.org/ns-3-14" - vers_href="http://www.nsnam.org/ns-3-${version#ns-3.}" + vers_href="https://www.nsnam.org/ns-3-${version#ns-3.}" vers_href="$version$dirty" echo "var ns3_version = \"Release $vers_href\";" >> $outf echo "var ns3_release = \"docs/release/${version#ns-}/\";" >> $outf else - # Like "http://code.nsnam.org/ns-3-dev/rev/" - vers_href="http://code.nsnam.org/ns-3-dev/rev/$version" + vers_href="https://gitlab.com/nsnam/ns-3-dev/commits/$version" version="$version$dirty" echo "var ns3_version = \"ns-3-dev @ $version\";" >> $outf