Fix fujinet-lib version finding (#148)

Author: FozzTexx

makefiles/fnlib.py

@@ -87,7 +87,7 @@ def __init__(self, FUJINET_LIB, PLATFORM, COMBOS, skipIfMissing=False):
     self.LIBRARY_REGEX = []
     for platform in self.possiblePlatforms:
       self.LIBRARY_REGEX.extend([
-        fr"fujinet[-.]({platform})-({VERSION_NUM_RE})?[.]lib$",
+        fr"fujinet[-.]({platform})(-{VERSION_NUM_RE})?[.]lib$",
         fr"fujinet[.]lib[.]({platform})$",
         fr"libfujinet[.]({platform})[.]a$",
       ])
@@ -177,8 +177,8 @@ def fixupLibraryFilename(self, filename):
   def setPlatformVersion(self, rxm):
     if len(rxm.groups()) >= 1:
       self.MV.FUJINET_LIB_PLATFORM = rxm.group(1)
-    if len(rxm.groups()) >= 2:
-      self.MV.FUJINET_LIB_VERSION = rxm.group(2)
+    if len(rxm.groups()) >= 3:
+      self.MV.FUJINET_LIB_VERSION = rxm.group(3)
     return
 
   def getVersion(self):
@@ -283,13 +283,13 @@ def gitClone(self, url):
       cmd = ["git", "clone", url]
       if branch:
         cmd.extend(["-b", branch])
-      subprocess.run(cmd, cwd=FUJINET_CACHE_DIR, check=True)
+      subprocess.run(cmd, cwd=FUJINET_CACHE_DIR, check=True, stdout=sys.stderr)
 
     possibleOutput = ["build", *[f"r2r/{p}" for p in self.possiblePlatforms]]
     self.findLibraryDir(repoDir, possibleOutput)
     if not self.MV.FUJINET_LIB_FILE:
       cmd = ["make", ]
-      subprocess.run(cmd, cwd=repoDir, check=True)
+      subprocess.run(cmd, cwd=repoDir, check=True, stdout=sys.stderr)
       self.findLibraryDir(repoDir, possibleOutput)
 
     return