From 2e92f39761892e0f53833e931dca06de03379899 Mon Sep 17 00:00:00 2001
From: Ivan Razumov <ivan.razumov@cern.ch>
Date: Wed, 18 Dec 2024 13:05:59 +0100
Subject: [PATCH 1/6] Add hyperlinks to build log

---
 buildLogAnalyzer.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/buildLogAnalyzer.py b/buildLogAnalyzer.py
index fa7445d3d3c..95387739d77 100755
--- a/buildLogAnalyzer.py
+++ b/buildLogAnalyzer.py
@@ -380,6 +380,7 @@ def makeHTMLSummaryPage(self):
 
     def makeHTMLLogFile(self, pkg):
         """docstring for makeHTMLFile"""
+        linePartsUrl = re.compile(r"\s*(src(/[^:]+):(\d+)):.*")
 
         if not pkg.name() in self.tagList:
             return
@@ -410,6 +411,11 @@ def makeHTMLLogFile(self, pkg):
             )  # do this first to not escape it again in the next subs
             newLine = newLine.replace("<", "&lt;").replace(">", "&gt;")
             if lineNo in pkg.errLines.keys():
+                m = linePartsUrl.match(newLine)
+                if m:
+                    branch = os.getenv("CMSSW_VERSION", "master")
+                    url = "https://github.com/cms-sw/cmssw/blob/" + branch + m[2] + "#L" + m[3]
+                    newLine = newLine.replace(m[1], '<a href="' + url + '">' + m[1] + "</a>", 1)
                 newLine = (
                     "<span class="
                     + self.styleClass[pkg.errLines[lineNo]]

From 2a247d6122f123d4e8bae02bed901e178333f258 Mon Sep 17 00:00:00 2001
From: Ivan Razumov <iarspider@gmail.com>
Date: Wed, 18 Dec 2024 15:38:59 +0100
Subject: [PATCH 2/6] Update regex and cache cmssw version

---
 buildLogAnalyzer.py | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/buildLogAnalyzer.py b/buildLogAnalyzer.py
index 95387739d77..49db1827236 100755
--- a/buildLogAnalyzer.py
+++ b/buildLogAnalyzer.py
@@ -123,6 +123,8 @@ def __init__(
             "ok": "ok",
         }
 
+        self.cmsswVersion = os.getenv("CMSSW_VERSION", "master")
+
         # get the lists separately for "priority" treatment ...
         self.errMap = {}
         for key in self.errorKeys:
@@ -380,7 +382,11 @@ def makeHTMLSummaryPage(self):
 
     def makeHTMLLogFile(self, pkg):
         """docstring for makeHTMLFile"""
-        linePartsUrl = re.compile(r"\s*(src(/[^:]+):(\d+)):.*")
+        linePartsUrl = re.compile(
+            r"\s+(?P<full_path>(?:.*/"
+            + self.cmsswVersion
+            + r"/)?(?P<file>src/[^:(]+)[:(](?P<line>\d+)\)?):"
+        )
 
         if not pkg.name() in self.tagList:
             return
@@ -413,9 +419,17 @@ def makeHTMLLogFile(self, pkg):
             if lineNo in pkg.errLines.keys():
                 m = linePartsUrl.match(newLine)
                 if m:
-                    branch = os.getenv("CMSSW_VERSION", "master")
-                    url = "https://github.com/cms-sw/cmssw/blob/" + branch + m[2] + "#L" + m[3]
-                    newLine = newLine.replace(m[1], '<a href="' + url + '">' + m[1] + "</a>", 1)
+                    url = (
+                        "https://github.com/cms-sw/cmssw/blob/"
+                        + self.cmsswVersion
+                        + m["file"]
+                        + "#L"
+                        + m["line"]
+                    )
+
+                    newLine = newLine.replace(
+                        m["full_path"], '<a href="' + url + '">' + m["full_path"] + "</a>", 1
+                    )
                 newLine = (
                     "<span class="
                     + self.styleClass[pkg.errLines[lineNo]]

From 4f9975011831fef480f22c27db011dd1c9e487b8 Mon Sep 17 00:00:00 2001
From: Ivan Razumov <iarspider@gmail.com>
Date: Wed, 18 Dec 2024 16:17:13 +0100
Subject: [PATCH 3/6] Use self.release

---
 buildLogAnalyzer.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/buildLogAnalyzer.py b/buildLogAnalyzer.py
index 49db1827236..34734164caa 100755
--- a/buildLogAnalyzer.py
+++ b/buildLogAnalyzer.py
@@ -123,8 +123,6 @@ def __init__(
             "ok": "ok",
         }
 
-        self.cmsswVersion = os.getenv("CMSSW_VERSION", "master")
-
         # get the lists separately for "priority" treatment ...
         self.errMap = {}
         for key in self.errorKeys:
@@ -384,7 +382,7 @@ def makeHTMLLogFile(self, pkg):
         """docstring for makeHTMLFile"""
         linePartsUrl = re.compile(
             r"\s+(?P<full_path>(?:.*/"
-            + self.cmsswVersion
+            + self.release
             + r"/)?(?P<file>src/[^:(]+)[:(](?P<line>\d+)\)?):"
         )
 
@@ -421,7 +419,7 @@ def makeHTMLLogFile(self, pkg):
                 if m:
                     url = (
                         "https://github.com/cms-sw/cmssw/blob/"
-                        + self.cmsswVersion
+                        + self.release
                         + m["file"]
                         + "#L"
                         + m["line"]

From 17bcc493673cbb19956568ac53f6e8c2c70e0755 Mon Sep 17 00:00:00 2001
From: Ivan Razumov <iarspider@gmail.com>
Date: Wed, 18 Dec 2024 16:26:16 +0100
Subject: [PATCH 4/6] Fix for python 2 (doesn't support match[...])

---
 buildLogAnalyzer.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildLogAnalyzer.py b/buildLogAnalyzer.py
index 34734164caa..718cc20611d 100755
--- a/buildLogAnalyzer.py
+++ b/buildLogAnalyzer.py
@@ -420,13 +420,13 @@ def makeHTMLLogFile(self, pkg):
                     url = (
                         "https://github.com/cms-sw/cmssw/blob/"
                         + self.release
-                        + m["file"]
+                        + m.group("file")
                         + "#L"
-                        + m["line"]
+                        + m.group("line")
                     )
 
                     newLine = newLine.replace(
-                        m["full_path"], '<a href="' + url + '">' + m["full_path"] + "</a>", 1
+                        m.group("full_path"), '<a href="' + url + '">' + m.group("full_path") + "</a>", 1
                     )
                 newLine = (
                     "<span class="

From b8adf9ed5bc20cd8e2bf49b16bf0b2a64ffa8dc0 Mon Sep 17 00:00:00 2001
From: Ivan Razumov <iarspider@gmail.com>
Date: Wed, 18 Dec 2024 16:30:37 +0100
Subject: [PATCH 5/6] Changes from review

---
 buildLogAnalyzer.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/buildLogAnalyzer.py b/buildLogAnalyzer.py
index 718cc20611d..e2ba990e3af 100755
--- a/buildLogAnalyzer.py
+++ b/buildLogAnalyzer.py
@@ -426,7 +426,9 @@ def makeHTMLLogFile(self, pkg):
                     )
 
                     newLine = newLine.replace(
-                        m.group("full_path"), '<a href="' + url + '">' + m.group("full_path") + "</a>", 1
+                        m.group("full_path"),
+                        '<a href="' + url + '">' + m.group("full_path") + "</a>",
+                        1,
                     )
                 newLine = (
                     "<span class="
@@ -788,7 +790,7 @@ def main(argv=None):
     pkgList = os.getenv("CMSSW_BASE", None)
     if pkgList:
         pkgList += "/src/PackageList.cmssw"
-    rel = os.getenv("CMSSW_VERSION", None)
+    rel = os.getenv("CMSSW_VERSION", "master")
     igWarning = []
     if argv is None:
         argv = sys.argv

From 301a8800063081daf71862f04a8b67dbec77bda6 Mon Sep 17 00:00:00 2001
From: Ivan Razumov <iarspider@gmail.com>
Date: Thu, 19 Dec 2024 10:03:27 +0100
Subject: [PATCH 6/6] Improve matching

---
 buildLogAnalyzer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildLogAnalyzer.py b/buildLogAnalyzer.py
index e2ba990e3af..936f9e67d40 100755
--- a/buildLogAnalyzer.py
+++ b/buildLogAnalyzer.py
@@ -381,7 +381,7 @@ def makeHTMLSummaryPage(self):
     def makeHTMLLogFile(self, pkg):
         """docstring for makeHTMLFile"""
         linePartsUrl = re.compile(
-            r"\s+(?P<full_path>(?:.*/"
+            r"(?P<full_path>(?:.*/"
             + self.release
             + r"/)?(?P<file>src/[^:(]+)[:(](?P<line>\d+)\)?):"
         )
@@ -415,7 +415,7 @@ def makeHTMLLogFile(self, pkg):
             )  # do this first to not escape it again in the next subs
             newLine = newLine.replace("<", "&lt;").replace(">", "&gt;")
             if lineNo in pkg.errLines.keys():
-                m = linePartsUrl.match(newLine)
+                m = linePartsUrl.match(newLine.strip())
                 if m:
                     url = (
                         "https://github.com/cms-sw/cmssw/blob/"