Skip to content

Commit 25314ca

Browse files
JonatanAntoniJonatanAntoni
committed
Doxygen: Fix gen_doc version in html footer
1 parent 193243d commit 25314ca

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

‎CMSIS/DoxyGen/Doxygen_Templates/header.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
$darkmode
3030
$extrastylesheet
3131
<link href="$relpath^version.css" rel="stylesheet" type="text/css" />
32-
<script type="text/javascript" src="../../version.js"></script>
32+
<script type="text/javascript" src="../../../version.js"></script>
3333
</head>
3434
<body>
3535
<!--BEGIN DISABLE_INDEX-->
@@ -53,7 +53,7 @@
5353
<!--BEGIN PROJECT_NUMBER-->&#160;<span id="projectnumber"><script type="text/javascript">
5454
<!--
5555
writeHeader.call(this);
56-
writeVersionDropdown.call(this, "$projectname");
56+
writeVersionDropdown.call(this);
5757
//-->
5858
</script>
5959
</span><!--END PROJECT_NUMBER-->

‎CMSIS/DoxyGen/gen_doc.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,10 @@ function generate() {
7777
projectName=$(grep -E "PROJECT_NAME\s+=" $1.dxy.in | sed -r -e 's/[^"]*"([^"]+)".*/\1/')
7878
projectNumberFull="$2"
7979
if [ -z "${projectNumberFull}" ]; then
80-
projectNumberFull=$(grep -E "PROJECT_NUMBER\s+=" $1.dxy.in | sed -r -e 's/[^"]*"[^0-9]*([0-9]+\.[0-9]+(\.[0-9]+)?(-.+)?)".*/\1/')
80+
projectNumberFull=$(grep -E "PROJECT_NUMBER\s+=" $1.dxy.in | sed -r -e 's/[^"]*"[^0-9]*(([0-9]+\.[0-9]+(\.[0-9]+)?(-.+)?)?)".*/\1/')
81+
fi
82+
if [ -z "${projectNumberFull}" ]; then
83+
projectNumberFull="$(git rev-parse --short HEAD)"
8184
fi
8285
projectNumber="${projectNumberFull%+*}"
8386
datetime=$(date -u +'%a %b %e %Y %H:%M:%S')

0 commit comments

Comments
 (0)