Fix version number finding regex, don't try to download zip if we already have it

Author: FozzTexx

Makefile

@@ -30,6 +30,7 @@ SRC_DIRS = src src/%PLATFORM%
 # - empty which will use whatever is the latest
 # - undefined, no fujinet-lib will be used
 FUJINET_LIB =
+$(info FUJUNET_LIB=$(FUJINET_LIB))
 
 # Some platforms don’t use FUJINET_LIB; set this to allow builds to continue
 # even if the library isn’t present.

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$",
       ])
@@ -114,7 +114,8 @@ def __init__(self, FUJINET_LIB, PLATFORM, COMBOS, skipIfMissing=False):
     if not self.MV.FUJINET_LIB_DIR:
       self.getDirectory()
 
-    if not self.MV.FUJINET_LIB_FILE:
+    if not self.MV.FUJINET_LIB_FILE \
+       and (not self.MV.FUJINET_LIB_ZIP or not os.path.exists(self.MV.FUJINET_LIB_ZIP)):
       self.downloadZip()
 
     if not self.MV.FUJINET_LIB_INCLUDE: